diff options
| author | luigi1111 <luigi1111w@gmail.com> | 2021-04-22 01:53:03 -0400 |
|---|---|---|
| committer | luigi1111 <luigi1111w@gmail.com> | 2021-04-22 01:53:03 -0400 |
| commit | beb566f11e97895339f687aed8a6c9a4a80ab4ab (patch) | |
| tree | 584eab67aab2d8630cd0292aa30c36c59f9a0590 /src/main/main.cpp | |
| parent | 02ae14fd6bcd705ed838fba627775e4d8d52b5f3 (diff) | |
| parent | 9fc617956dd4399891c21ae5adbd46499b08f62b (diff) | |
| download | monzero-gui-beb566f11e97895339f687aed8a6c9a4a80ab4ab.tar.gz monzero-gui-beb566f11e97895339f687aed8a6c9a4a80ab4ab.tar.xz monzero-gui-beb566f11e97895339f687aed8a6c9a4a80ab4ab.zip | |
Merge pull request #2242
9fc6179 macOS: add basic menubar support (selsta)
Diffstat (limited to 'src/main/main.cpp')
| -rw-r--r-- | src/main/main.cpp | 8 |
1 files changed, 8 insertions, 0 deletions
diff --git a/src/main/main.cpp b/src/main/main.cpp index e3aca5e9..208ede89 100644 --- a/src/main/main.cpp +++ b/src/main/main.cpp @@ -72,6 +72,9 @@ #include "qt/KeysFiles.h" #include "qt/MoneroSettings.h" #include "qt/NetworkAccessBlockingFactory.h" +#ifdef Q_OS_MAC +#include "qt/macoshelper.h" +#endif // IOS exclusions #ifndef Q_OS_IOS @@ -133,6 +136,7 @@ Q_IMPORT_PLUGIN(QtQuickControls1Plugin) Q_IMPORT_PLUGIN(QtQuick2DialogsPlugin) Q_IMPORT_PLUGIN(QmlFolderListModelPlugin) Q_IMPORT_PLUGIN(QmlSettingsPlugin) +Q_IMPORT_PLUGIN(QtLabsPlatformPlugin) Q_IMPORT_PLUGIN(QtQuick2DialogsPrivatePlugin) Q_IMPORT_PLUGIN(QtQuick2PrivateWidgetsPlugin) Q_IMPORT_PLUGIN(QtQuickControls2Plugin) @@ -178,6 +182,10 @@ int main(int argc, char *argv[]) if(qgetenv("QMLSCENE_DEVICE") == "softwarecontext") isOpenGL = false; +#ifdef Q_OS_MAC + // macOS window tabbing is not supported + MacOSHelper::disableWindowTabbing(); +#endif // disable "QApplication: invalid style override passed" warning if (isDesktop) qputenv("QT_STYLE_OVERRIDE", "fusion"); #ifdef Q_OS_LINUX |