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 /configure.pri | |
| 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 'configure.pri')
| -rw-r--r-- | configure.pri | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/configure.pri b/configure.pri index 27dc60a09c..754e9d7317 100644 --- a/configure.pri +++ b/configure.pri @@ -1074,6 +1074,10 @@ defineTest(qtConfOutput_gccSysroot) { "\"QMAKE_LFLAGS += --sysroot=$$config.input.sysroot\"" export(EXTRA_QMAKE_ARGS) + # This one is for qtConfToolchainSupportsFlag(). + QMAKE_CXXFLAGS += --sysroot=$$config.input.sysroot + export(QMAKE_CXXFLAGS) + output = \ "!host_build {" \ " QMAKE_CFLAGS += --sysroot=\$\$[QT_SYSROOT]" \ |