diff options
| author | Liang Qi <liang.qi@theqtcompany.com> | 2016-01-21 08:17:21 +0100 |
|---|---|---|
| committer | Liang Qi <liang.qi@theqtcompany.com> | 2016-01-21 08:17:21 +0100 |
| commit | 158a3a4159bdc5a49caecd63e021dacbc06cf23c (patch) | |
| tree | c3ed9aee6cabd46e5e8615b3815b92d32857c4da /mkspecs/features/qt_functions.prf | |
| parent | 26ece94a68fb5ae680c5639716b06c4e1ae979a8 (diff) | |
| parent | 7b2fb038ae4b8b9231ae989ad309b6eca107a858 (diff) | |
Merge remote-tracking branch 'origin/5.6' into dev
Conflicts:
src/corelib/io/qiodevice_p.h
src/corelib/kernel/qvariant_p.h
src/corelib/tools/qsimd.cpp
src/gui/kernel/qguiapplication.cpp
tests/auto/network/socket/qtcpsocket/tst_qtcpsocket.cpp
Change-Id: I742a093cbb231b282b43e463ec67173e0d29f57a
Diffstat (limited to 'mkspecs/features/qt_functions.prf')
| -rw-r--r-- | mkspecs/features/qt_functions.prf | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/mkspecs/features/qt_functions.prf b/mkspecs/features/qt_functions.prf index c23d006d82..f1982d6e4e 100644 --- a/mkspecs/features/qt_functions.prf +++ b/mkspecs/features/qt_functions.prf @@ -196,7 +196,7 @@ defineTest(qtAddTargetEnv) { pluginpath.value = ppaths = $$[QT_INSTALL_PLUGINS/get] for(qplug, QT_PLUGINS): \ - contains(ptypes, QT_PLUGIN.$${qplug}.TYPE): \ + contains(ptypes, $$eval(QT_PLUGIN.$${qplug}.TYPE)): \ ppaths += $$eval(QT_PLUGIN.$${qplug}.PATH) ppaths = $$unique(ppaths) for(qplug, ppaths) { @@ -206,6 +206,7 @@ defineTest(qtAddTargetEnv) { pluginpath.value += $$system_path($$qplug) } pluginpath.name = QT_PLUGIN_PATH + pluginpath.CONFIG = prepend QT_TOOL_ENV += deppath pluginpath } |