Browse Source

Enable c++11 support.

adaptive-webui-19844
Vladimir Golovnev (Glassez) 9 years ago
parent
commit
12d9898b5d
  1. 4
      macxconf.pri
  2. 3
      os2conf.pri
  3. 4
      src/src.pro
  4. 3
      unixconf.pri
  5. 3
      winconf-mingw.pri

4
macxconf.pri

@ -10,7 +10,9 @@ exists($$OUT_PWD/../conf.pri) {
} }
LIBS += -framework Carbon -framework IOKit 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 QT_LANG_PATH = ../dist/qt-translations
DIST_PATH = ../dist/mac DIST_PATH = ../dist/mac

3
os2conf.pri

@ -1,3 +1,6 @@
# C++11 support
lessThan(QT_MAJOR_VERSION, 5): QMAKE_CXXFLAGS += -std=c++11
exists(conf.pri) { exists(conf.pri) {
# to the conf.pri goes all system dependent stuff # to the conf.pri goes all system dependent stuff
include(conf.pri) include(conf.pri)

4
src/src.pro

@ -2,6 +2,10 @@
TEMPLATE = app TEMPLATE = app
CONFIG += qt thread silent CONFIG += qt thread silent
# C++11 support
CONFIG += c++11
DEFINES += BOOST_NO_CXX11_RVALUE_REFERENCES
# Windows specific configuration # Windows specific configuration
win32: include(../winconf.pri) win32: include(../winconf.pri)

3
unixconf.pri

@ -9,6 +9,9 @@ exists($$OUT_PWD/../conf.pri) {
include(conf.pri) include(conf.pri)
} }
# C++11 support
lessThan(QT_MAJOR_VERSION, 5): QMAKE_CXXFLAGS += -std=c++0x
# COMPILATION SPECIFIC # COMPILATION SPECIFIC
!nogui:dbus { !nogui:dbus {
QT += dbus QT += dbus

3
winconf-mingw.pri

@ -1,3 +1,6 @@
# C++11 support
lessThan(QT_MAJOR_VERSION, 5): QMAKE_CXXFLAGS += -std=gnu++11
strace_win{ strace_win{
contains(QMAKE_HOST.arch, x86) { contains(QMAKE_HOST.arch, x86) {
# i686 arch requires frame pointer preservation # i686 arch requires frame pointer preservation

Loading…
Cancel
Save