diff options
author | Eike Ziller <eike.ziller@qt.io> | 2017-10-25 16:07:21 +0200 |
---|---|---|
committer | Eike Ziller <eike.ziller@qt.io> | 2017-10-25 16:07:21 +0200 |
commit | 7f626b1182cae5407fa5495b264aa3d9170aa09d (patch) | |
tree | 9a87c924c34adf333a2bd33200a31afb29af511a /qtcreator.pri | |
parent | 81f5c1c8ec19bb58fc4cfb607e2c2f8ebf5cc6d8 (diff) | |
parent | dd6092371374212b407ff248ba1fa5ba8fde795d (diff) | |
download | qt-creator-7f626b1182cae5407fa5495b264aa3d9170aa09d.tar.gz |
Merge remote-tracking branch 'origin/4.5'
Change-Id: Iceaa4ca40b5318744bde8a76c6d3ccca08df71bb
Diffstat (limited to 'qtcreator.pri')
-rw-r--r-- | qtcreator.pri | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/qtcreator.pri b/qtcreator.pri index c533151e10..39e1c8d0e3 100644 --- a/qtcreator.pri +++ b/qtcreator.pri @@ -157,6 +157,8 @@ osx { INSTALL_APP_PATH = $$QTC_PREFIX/bin } +gcc:!clang: QMAKE_CXXFLAGS += -Wno-noexcept-type + RELATIVE_PLUGIN_PATH = $$relative_path($$IDE_PLUGIN_PATH, $$IDE_BIN_PATH) RELATIVE_LIBEXEC_PATH = $$relative_path($$IDE_LIBEXEC_PATH, $$IDE_BIN_PATH) RELATIVE_DATA_PATH = $$relative_path($$IDE_DATA_PATH, $$IDE_BIN_PATH) |