Commit 20a4df27 authored by Mathieu Faverge's avatar Mathieu Faverge

Restore QT5 as default

parent f9f42cab
...@@ -83,7 +83,7 @@ include (CMakeDependentOption) ...@@ -83,7 +83,7 @@ include (CMakeDependentOption)
### Required Packages ### Required Packages
# Try to find Qt5 : http://forum.openscenegraph.org/viewtopic.php?t=11431 # Try to find Qt5 : http://forum.openscenegraph.org/viewtopic.php?t=11431
option(USE_QT5 option(USE_QT5
"Use QT5 instead of QT4" OFF) "Use QT5 instead of QT4" ON)
if (USE_QT5) if (USE_QT5)
# QUIET option disables messages if the package cannot be found. # QUIET option disables messages if the package cannot be found.
......
...@@ -203,6 +203,9 @@ Core::Core(int &argc, char ** argv) ...@@ -203,6 +203,9 @@ Core::Core(int &argc, char ** argv)
console_app = new QCoreApplication(argc, 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 */ /* Start to launch actions */
launch_action(_state, NULL); launch_action(_state, NULL);
} }
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment