From 20a4df27922745b771d10f2fe4c04b2926f2aa11 Mon Sep 17 00:00:00 2001 From: Mathieu Faverge Date: Thu, 24 Aug 2017 16:16:17 +0200 Subject: [PATCH] Restore QT5 as default --- CMakeLists.txt | 2 +- src/core/Core.cpp | 3 +++ 2 files changed, 4 insertions(+), 1 deletion(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index d4fe8c8..cb341f8 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -83,7 +83,7 @@ include (CMakeDependentOption) ### Required Packages # Try to find Qt5 : http://forum.openscenegraph.org/viewtopic.php?t=11431 option(USE_QT5 - "Use QT5 instead of QT4" OFF) + "Use QT5 instead of QT4" ON) if (USE_QT5) # QUIET option disables messages if the package cannot be found. diff --git a/src/core/Core.cpp b/src/core/Core.cpp index 96ea83b..5630845 100644 --- a/src/core/Core.cpp +++ b/src/core/Core.cpp @@ -203,6 +203,9 @@ Core::Core(int &argc, char ** argv) console_app = new QCoreApplication(argc, argv); } + /* Trick to avoid problems with menus not showing up in Qt5 */ + QCoreApplication::setAttribute(Qt::AA_DontUseNativeMenuBar); + /* Start to launch actions */ launch_action(_state, NULL); } -- 2.22.0