From d4da3cb6cf16b4e4dad03bb0b9859e91345f51f6 Mon Sep 17 00:00:00 2001 From: Josef Rokos Date: Fri, 13 Nov 2015 15:44:32 +0100 Subject: [PATCH] Enabled C++11 features on Linux (GCC), disabled "unknown pragma" warnings on GCC. --- accommodation/accommodation.pro | 2 ++ application/application.pro | 6 ++++++ core/core.pro | 2 ++ 3 files changed, 10 insertions(+) diff --git a/accommodation/accommodation.pro b/accommodation/accommodation.pro index 3c9fee7..5fa3c85 100644 --- a/accommodation/accommodation.pro +++ b/accommodation/accommodation.pro @@ -31,6 +31,8 @@ HEADERS += accommodation.h\ unix { target.path = /usr/lib INSTALLS += target + QMAKE_CXXFLAGS += -std=c++11 + QMAKE_CXXFLAGS += -Wno-unknown-pragmas } win32:CONFIG(release, debug|release): LIBS += -L$$OUT_PWD/../core/release/ -lcore diff --git a/application/application.pro b/application/application.pro index a1e2144..bef3e3f 100644 --- a/application/application.pro +++ b/application/application.pro @@ -25,6 +25,12 @@ HEADERS += mainwindow.h FORMS += mainwindow.ui + +unix { + QMAKE_CXXFLAGS += -std=c++11 + QMAKE_CXXFLAGS += -Wno-unknown-pragmas +} + win32:CONFIG(release, debug|release): LIBS += -L$$OUT_PWD/../core/release/ -lcore else:win32:CONFIG(debug, debug|release): LIBS += -L$$OUT_PWD/../core/debug/ -lcore else:unix: LIBS += -L$$OUT_PWD/../core/ -lcore diff --git a/core/core.pro b/core/core.pro index b4b03d4..94cfa39 100644 --- a/core/core.pro +++ b/core/core.pro @@ -41,6 +41,8 @@ HEADERS += core.h\ unix { target.path = /usr/lib INSTALLS += target + QMAKE_CXXFLAGS += -std=c++11 + QMAKE_CXXFLAGS += -Wno-unknown-pragmas } ODB_FILES = core/data/core-data.h