diff options
Diffstat (limited to 'quackleio')
| -rw-r--r-- | quackleio/iotest/iotest.pro | 6 | ||||
| -rw-r--r-- | quackleio/quackleio.pro | 13 |
2 files changed, 15 insertions, 4 deletions
diff --git a/quackleio/iotest/iotest.pro b/quackleio/iotest/iotest.pro index c7e994f..9962dbc 100644 --- a/quackleio/iotest/iotest.pro +++ b/quackleio/iotest/iotest.pro @@ -5,6 +5,8 @@ INCLUDEPATH += . .. ../.. # enable/disable debug symbols #CONFIG += debug CONFIG += release +CONFIG += c++14 +CONFIG -= debug debug { OBJECTS_DIR = obj/debug @@ -30,3 +32,7 @@ SOURCES += iotest.cpp trademarkedboards.cpp macx-g++ { QMAKE_CXXFLAGS += -fpermissive } + +linux { # old unixes/Qt distribs running around...most notably on Travis-CI + QMAKE_CXXFLAGS += -std=c++1y +} diff --git a/quackleio/quackleio.pro b/quackleio/quackleio.pro index bd46a01..215e66b 100644 --- a/quackleio/quackleio.pro +++ b/quackleio/quackleio.pro @@ -17,11 +17,12 @@ MOC_DIR = moc # enable/disable debug symbols #CONFIG += debug staticlib -CONFIG += release staticlib +CONFIG += release staticlib c++14 CONFIG -= x11 -QMAKE_CXXFLAGS += -std=c++11 -#QMAKE_CXXFLAGS:!win32-msvc2013 += -Wno-unknown-warning-option -Wno-deprecated-register +!msvc { + QMAKE_CXXFLAGS += -Wno-unknown-warning-option -Wno-deprecated-register +} # Input HEADERS += *.h @@ -29,10 +30,14 @@ HEADERS += *.h SOURCES += *.cpp macx { - CONFIG += x86 + CONFIG += x86 QMAKE_MACOSX_DEPLOYMENT_TARGET = 10.8 } unix:!macx { QMAKE_CXXFLAGS += -Wno-unused-local-typedefs } + +linux { # old unixes/Qt distribs running around...most notably on Travis-CI + QMAKE_CXXFLAGS += -std=c++1y +} |