diff options
| author | Kitsune Ral <Kitsune-Ral@users.sf.net> | 2017-12-25 20:45:21 +0900 |
|---|---|---|
| committer | Kitsune Ral <Kitsune-Ral@users.sf.net> | 2017-12-25 21:03:37 +0900 |
| commit | ea6ce4d4628a06f4216335b4c72b02859852ff48 (patch) | |
| tree | 2f5a328cd964c49339476257deafcde20e0b1f9a | |
| parent | 95486e555f0ab5dc78a7bdc14e22d73bff5cfd7e (diff) | |
| download | libquotient-ea6ce4d4628a06f4216335b4c72b02859852ff48.tar.gz libquotient-ea6ce4d4628a06f4216335b4c72b02859852ff48.zip | |
qmake: Use the compiler specified in the environment; revert to CONFIG += c++14
qmake doesn't follow standard CC and CXX environment variables and its CONFIG produces CXX_FLAGS added after QMAKE_CXX_FLAGS. Big thank you to The Qt Company :-|
| -rw-r--r-- | .travis.yml | 2 | ||||
| -rw-r--r-- | libqmatrixclient.pri | 4 |
2 files changed, 3 insertions, 3 deletions
diff --git a/.travis.yml b/.travis.yml index e4d66084..1b67119d 100644 --- a/.travis.yml +++ b/.travis.yml @@ -28,7 +28,7 @@ script: - cmake .. - cmake --build . --target all - cd .. -- qmake qmc-example.pro && make all +- qmake qmc-example.pro "QMAKE_CC = $CC" "QMAKE_CXX = $CXX" && make all notifications: webhooks: diff --git a/libqmatrixclient.pri b/libqmatrixclient.pri index 3394f60e..10476cc9 100644 --- a/libqmatrixclient.pri +++ b/libqmatrixclient.pri @@ -1,6 +1,6 @@ QT += network -CONFIG += warn_on rtti_off -QMAKE_CXXFLAGS += -std=c++14 -Wno-unused-parameter +CONFIG += c++14 warn_on rtti_off +QMAKE_CXXFLAGS += -Wno-unused-parameter INCLUDEPATH += $$PWD |