Fixed|qmake|Unix: Build options for Qt 5.2 / X11

Enable C++11 and don't assume x11extras is available unless Qt 5.3+ is in use.
skyjake · Aug 22, 2014 · cfebdbe · cfebdbe
1 parent c32cecc
commit cfebdbe
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 3 deletions.
diff --git a/doomsday/config_unix_any.pri b/doomsday/config_unix_any.pri
@@ -25,8 +25,8 @@ deng_debuginfo {
     QMAKE_CFLAGS_WARN_ON += -Wno-tautological-compare
 }
 
-deng_qt5 {
-    QMAKE_CXXFLAGS += -std=c++11
+deng_c++11 {
+    QMAKE_CXXFLAGS *= -std=c++11
 }
 
 # Print include directories and other info.

diff --git a/doomsday/libgui/libgui.pro b/doomsday/libgui/libgui.pro
@@ -13,7 +13,9 @@ VERSION  = $$DENG_VERSION
 
 CONFIG += deng_qtgui deng_qtopengl
 
-unix:!macx: QT += x11extras
+deng_qt5:greaterThan(QT_MINOR_VERSION, 2) {
+    unix:!macx: QT += x11extras
+}
 
 include(../dep_core.pri)
 include(../dep_opengl.pri)