qmake|Unix: Enable C++11

C++11 is now enabled for all g++/clang++ builds.
skyjake · Aug 5, 2014 · 2ed0f01 · 2ed0f01
1 parent be4b7f1
commit 2ed0f01
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 3 deletions.
diff --git a/doomsday/config.pri b/doomsday/config.pri
@@ -86,9 +86,12 @@ deng_fakememoryzone: DEFINES += LIBDENG_FAKE_MEMORY_ZONE
 
 # Check for Qt 5.
 greaterThan(QT_MAJOR_VERSION, 4) {
-    CONFIG += deng_qt5 c++11
+    CONFIG += deng_qt5
 }
 
+# Enable C++11 everywhere.
+CONFIG += c++11
+
 # Check for a 64-bit compiler.
 contains(QMAKE_HOST.arch, x86_64) {
     echo(64-bit architecture detected.)

diff --git a/doomsday/config_unix_any.pri b/doomsday/config_unix_any.pri
@@ -25,7 +25,7 @@ deng_debuginfo {
     QMAKE_CFLAGS_WARN_ON += -Wno-tautological-compare
 }
 
-deng_qt5 {
+c++11 {
     QMAKE_CXXFLAGS += -std=c++11
 }
 

diff --git a/doomsday/libcore/include/de/libcore.h b/doomsday/libcore/include/de/libcore.h
@@ -73,7 +73,7 @@
 #if defined(__cplusplus) && !defined(DENG2_C_API_ONLY)
 #  define DENG2_USE_QT
 #  include <typeinfo>
-#  include <memory>  // auto_ptr
+#  include <memory>  // unique_ptr, shared_ptr
 #  include <cstring> // memset
 #endif