diff options
author | Liang Qi <liang.qi@qt.io> | 2016-06-23 07:18:39 +0200 |
---|---|---|
committer | Liang Qi <liang.qi@qt.io> | 2016-06-23 10:29:37 +0200 |
commit | 5cfb80a28ef6bf6820c970a6c355e6879021e46e (patch) | |
tree | e60f1f43e9670e82923e3c2d0d19b29198b9c300 /mkspecs/features/qt_helper_lib.prf | |
parent | 930e750b7aca024b839c9856cfcc79aab8c0abbc (diff) | |
parent | f4be16e1f7828a0f6992ef2e20b9106177d7fc88 (diff) |
Merge remote-tracking branch 'origin/5.6' into 5.7
Conflicts:
src/angle/src/libGLESv2/libGLESv2.pro
src/plugins/platforms/eglfs/deviceintegration/eglfs_kms_egldevice/qeglfskmsegldeviceintegration.cpp
Change-Id: If8da4cfe8f57fea9f78e7239f378a6302c01674e
Diffstat (limited to 'mkspecs/features/qt_helper_lib.prf')
-rw-r--r-- | mkspecs/features/qt_helper_lib.prf | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/mkspecs/features/qt_helper_lib.prf b/mkspecs/features/qt_helper_lib.prf index 668dead1d3..dc7a5da30e 100644 --- a/mkspecs/features/qt_helper_lib.prf +++ b/mkspecs/features/qt_helper_lib.prf @@ -27,6 +27,6 @@ DLLDESTDIR = $$MODULE_BASE_OUTDIR/bin # In static builds of Qt, convenience libraries must be installed, # as in this case they are not linked to the final library/plugin. -installed|contains(QT_CONFIG, static): load(qt_installs) +installed|if(!not_installed:contains(QT_CONFIG, static)): load(qt_installs) TARGET = $$qt5LibraryTarget($$TARGET) |