921cb6c860
* Fix patch applicability * Combine patches for missing qt3 headers and remove krell variant The variant should have always been applied. * Restrict QT patches to actual applicable versions/situations - I researched the associated patches so now their `when=` should more closely match when they're actually needed. - I sorted the patch order so they're grouped by version requirement - I renamed the patches so they're listed by version requirements
18 lines
556 B
Diff
18 lines
556 B
Diff
diff --git a/mkspecs/features/qt_module.prf b/mkspecs/features/qt_module.prf
|
|
index f6cbf99..ec31e45 100644
|
|
--- a/qtbase/mkspecs/features/qt_module.prf
|
|
+++ b/qtbase/mkspecs/features/qt_module.prf
|
|
@@ -68,9 +68,9 @@ load(qt_build_paths)
|
|
|
|
header_module {
|
|
TEMPLATE = aux
|
|
- CONFIG += \
|
|
- force_qt \ # Needed for the headers_clean tests.
|
|
- qt_no_install_library
|
|
+ CONFIG += force_qt # Needed for the headers_clean tests.
|
|
+ !lib_bundle: \
|
|
+ CONFIG += qt_no_install_library
|
|
} else {
|
|
TEMPLATE = lib
|
|
}
|