diff options
| author | Qt Forward Merge Bot <qt_forward_merge_bot@qt-project.org> | 2018-07-17 01:00:21 +0200 |
|---|---|---|
| committer | Edward Welbourne <edward.welbourne@qt.io> | 2018-07-17 10:19:22 +0200 |
| commit | 1783fca89768a9d503d886673643dc4542ec467f (patch) | |
| tree | 5055f39393017219e448ade71b3842896c4679c5 /mkspecs/features/qt_configure.prf | |
| parent | b82648bd59256abb8e7084e0424a1f8a6a034c34 (diff) | |
| parent | 435d1d53bd61491010dbb2130a27e35cd9798965 (diff) | |
Merge remote-tracking branch 'origin/5.11' into dev
Conflicts:
src/plugins/platforms/cocoa/qcocoawindow.mm
src/plugins/platforms/xcb/qxcbintegration.cpp
Conflicts git missed:
src/plugins/platforms/qnx/qqnxglcontext.cpp
Change-Id: I0582cdc9e66e43efe79038b9c43d4f9572ac88fc
Diffstat (limited to 'mkspecs/features/qt_configure.prf')
| -rw-r--r-- | mkspecs/features/qt_configure.prf | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/mkspecs/features/qt_configure.prf b/mkspecs/features/qt_configure.prf index 0f1ec7a20f..b19bb1cf75 100644 --- a/mkspecs/features/qt_configure.prf +++ b/mkspecs/features/qt_configure.prf @@ -344,7 +344,7 @@ defineReplace(qtConfToolchainSupportsFlag) { conftest = "int main() { return 0; }" write_file("$$test_out_dir/conftest.cpp", conftest)|error() - qtRunLoggedCommand("$$test_cmd_base $$QMAKE_CXX $${1} -o conftest-out conftest.cpp"): \ + qtRunLoggedCommand("$$test_cmd_base $$QMAKE_CXX $$QMAKE_CXXFLAGS $${1} -o conftest-out conftest.cpp"): \ return(true) return(false) } |