Move QT_X11_NO_NATIVE_MENUBAR to code (LMMS#4818)

Set Qt::AA_DontUseNativeMenuBar Remove QT_X11_NO_NATIVE_MENUBAR from desktop launcher
sdasda7777 · Feb 11, 2019 · e09ff8d · e09ff8d
1 parent 6f9c075
commit e09ff8d
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 1 deletion.
diff --git a/cmake/linux/lmms.desktop b/cmake/linux/lmms.desktop
@@ -8,7 +8,7 @@ Comment=Music sequencer and synthesizer
 Comment[ca]=Producció fàcil de música per a tothom!
 Comment[fr]=Production facile de musique pour tout le monde !
 Icon=lmms
-Exec=env QT_X11_NO_NATIVE_MENUBAR=1 lmms %f
+Exec=lmms %f
 Terminal=false
 Type=Application
 Categories=Qt;AudioVideo;Audio;Midi;

diff --git a/src/core/main.cpp b/src/core/main.cpp
@@ -252,6 +252,10 @@ int main( int argc, char * * argv )
 		return EXIT_FAILURE;
 	}	
 #endif
+#ifdef LMMS_BUILD_LINUX
+	// don't let OS steal the menu bar. FIXME: only effective on Qt4
+	QCoreApplication::setAttribute( Qt::AA_DontUseNativeMenuBar );
+#endif
 #if QT_VERSION >= QT_VERSION_CHECK(5, 6, 0)
 	QCoreApplication::setAttribute(Qt::AA_EnableHighDpiScaling);
 #endif