diff options
| author | Liang Qi <liang.qi@qt.io> | 2016-05-19 17:50:46 +0000 |
|---|---|---|
| committer | The Qt Project <gerrit-noreply@qt-project.org> | 2016-05-19 17:50:46 +0000 |
| commit | 1f8bc502c8d1f9b92cf13c4aefc5f76607f474ab (patch) | |
| tree | bf6d5cebae9c680d2db331c536b88c9a1e684e3d /mkspecs/features/qt_helper_lib.prf | |
| parent | b98f599948ddc0380e3392aab593fd426760d0f0 (diff) | |
| parent | 818014b449ef996099b4795a82f09651cf1c0129 (diff) | |
Merge "Merge remote-tracking branch 'origin/5.6' into 5.7" into refs/staging/5.7
Diffstat (limited to 'mkspecs/features/qt_helper_lib.prf')
| -rw-r--r-- | mkspecs/features/qt_helper_lib.prf | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/mkspecs/features/qt_helper_lib.prf b/mkspecs/features/qt_helper_lib.prf index ebc629f57f..3393154436 100644 --- a/mkspecs/features/qt_helper_lib.prf +++ b/mkspecs/features/qt_helper_lib.prf @@ -13,12 +13,12 @@ load(qt_build_paths) TEMPLATE = lib CONFIG -= qt +QT = # In case qt is re-added. CONFIG -= warning_clean # Don't presume 3rd party code to be clean load(qt_common) -contains(QT_CONFIG, debug_and_release): CONFIG += debug_and_release -contains(QT_CONFIG, build_all): CONFIG += build_all +contains(QT_CONFIG, debug_and_release): CONFIG += debug_and_release build_all DESTDIR = $$MODULE_BASE_OUTDIR/lib DLLDESTDIR = $$MODULE_BASE_OUTDIR/bin |