diff options
| author | Liang Qi <liang.qi@qt.io> | 2018-08-16 13:34:53 +0200 |
|---|---|---|
| committer | Liang Qi <liang.qi@qt.io> | 2018-08-16 18:48:59 +0200 |
| commit | 8559bf934def636ccff487464adb600d219f8778 (patch) | |
| tree | 3063152f487798c7103dbf61216e48c37586a4e1 /mkspecs | |
| parent | f1a6b97fe2d3eda9455b13bb79828f250d46b92e (diff) | |
| parent | a0ebd98f58b2d92c34fafbc620f024caa36bf0ad (diff) | |
Merge remote-tracking branch 'origin/5.11' into dev
Conflicts:
src/corelib/global/qconfig-bootstrapped.h
src/plugins/platforms/xcb/qxcbbackingstore.cpp
Done-with: Gatis Paeglis <gatis.paeglis@qt.io>
Change-Id: I4af138ffb2f5306373244523768209e8873b2798
Diffstat (limited to 'mkspecs')
| -rw-r--r-- | mkspecs/features/qt_configure.prf | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/mkspecs/features/qt_configure.prf b/mkspecs/features/qt_configure.prf index 36b016bc7e..81b820978a 100644 --- a/mkspecs/features/qt_configure.prf +++ b/mkspecs/features/qt_configure.prf @@ -996,9 +996,9 @@ defineTest(qtConfTest_compile) { # add compiler flags, these are set for the target and should not be applied to host tests !isEmpty(EXTRA_DEFINES): \ qmake_args += $$system_quote(DEFINES += $$val_escape(EXTRA_DEFINES)) - !isEmpty(EXTRA_LIBDIR) \ + !isEmpty(EXTRA_LIBDIR): \ qmake_args += $$system_quote(QMAKE_LIBDIR += $$val_escape(EXTRA_LIBDIR)) - !isEmpty(EXTRA_FRAMEWORKPATH) \ + !isEmpty(EXTRA_FRAMEWORKPATH): \ qmake_args += $$system_quote(QMAKE_FRAMEWORKPATH += $$val_escape(EXTRA_FRAMEWORKPATH)) !isEmpty(EXTRA_INCLUDEPATH): \ qmake_args += $$system_quote(INCLUDEPATH += $$val_escape(EXTRA_INCLUDEPATH)) |