diff options
| author | Oswald Buddenhagen <oswald.buddenhagen@theqtcompany.com> | 2016-02-03 17:00:59 +0100 |
|---|---|---|
| committer | Simon Hausmann <simon.hausmann@theqtcompany.com> | 2016-02-19 17:08:56 +0000 |
| commit | 5260c01bbe0e59d566786157b6dae705e981bb3e (patch) | |
| tree | f834a079f004aa7b70e208bbddd9b4b6b5916166 /mkspecs/features/qt_helper_lib.prf | |
| parent | 1c87c3bdc65dfe729801bcfc90c986a70cab2d90 (diff) | |
load qt_common in qt_helper_lib
this has multiple consequences:
- we do sane DESTDIR replacement for debug_and_release builds, fixing
QTBUG-47313
- we don't create debug/release subdirectories, fixing QTBUG-47639. this
only makes sense given the complementary call of $$qt5LibraryTarget()
- we patch up the .prl files upon installation
Task-number: QTBUG-47313
Task-number: QTBUG-47639
Change-Id: Id409bbd26781a773409b94835ab6b97e71569322
Reviewed-by: Joerg Bornemann <joerg.bornemann@theqtcompany.com>
Diffstat (limited to 'mkspecs/features/qt_helper_lib.prf')
| -rw-r--r-- | mkspecs/features/qt_helper_lib.prf | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/mkspecs/features/qt_helper_lib.prf b/mkspecs/features/qt_helper_lib.prf index 70a17995cf..ebc629f57f 100644 --- a/mkspecs/features/qt_helper_lib.prf +++ b/mkspecs/features/qt_helper_lib.prf @@ -14,6 +14,9 @@ load(qt_build_paths) TEMPLATE = lib CONFIG -= qt +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 |