diff --git a/macxconf.pri b/macxconf.pri index a51b34405..554fdf38a 100644 --- a/macxconf.pri +++ b/macxconf.pri @@ -10,7 +10,9 @@ exists($$OUT_PWD/../conf.pri) { } LIBS += -framework Carbon -framework IOKit -CONFIG += c++11 + +# C++11 support +lessThan(QT_MAJOR_VERSION, 5): QMAKE_CXXFLAGS += -std=c++11 QT_LANG_PATH = ../dist/qt-translations DIST_PATH = ../dist/mac diff --git a/os2conf.pri b/os2conf.pri index c27a9e77e..469a5a3e9 100644 --- a/os2conf.pri +++ b/os2conf.pri @@ -1,3 +1,6 @@ +# C++11 support +lessThan(QT_MAJOR_VERSION, 5): QMAKE_CXXFLAGS += -std=c++11 + exists(conf.pri) { # to the conf.pri goes all system dependent stuff include(conf.pri) diff --git a/src/src.pro b/src/src.pro index 333160ad9..be82b41a7 100644 --- a/src/src.pro +++ b/src/src.pro @@ -2,6 +2,10 @@ TEMPLATE = app CONFIG += qt thread silent +# C++11 support +CONFIG += c++11 +DEFINES += BOOST_NO_CXX11_RVALUE_REFERENCES + # Windows specific configuration win32: include(../winconf.pri) diff --git a/unixconf.pri b/unixconf.pri index 2738b5952..f26fba4f7 100644 --- a/unixconf.pri +++ b/unixconf.pri @@ -9,6 +9,9 @@ exists($$OUT_PWD/../conf.pri) { include(conf.pri) } +# C++11 support +lessThan(QT_MAJOR_VERSION, 5): QMAKE_CXXFLAGS += -std=c++0x + # COMPILATION SPECIFIC !nogui:dbus { QT += dbus diff --git a/winconf-mingw.pri b/winconf-mingw.pri index 450700049..0283d23e6 100644 --- a/winconf-mingw.pri +++ b/winconf-mingw.pri @@ -1,3 +1,6 @@ +# C++11 support +lessThan(QT_MAJOR_VERSION, 5): QMAKE_CXXFLAGS += -std=gnu++11 + strace_win{ contains(QMAKE_HOST.arch, x86) { # i686 arch requires frame pointer preservation