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
16 lines
538 B
Diff
16 lines
538 B
Diff
Partially reverts <https://codereview.qt-project.org/#/c/140954/>.
|
|
|
|
diff --git i/qtbase/mkspecs/features/qt_module.prf w/qtbase/mkspecs/features/qt_module.prf
|
|
index bb28af97..36bb6483 100644
|
|
--- i/qtbase/mkspecs/features/qt_module.prf
|
|
+++ w/qtbase/mkspecs/features/qt_module.prf
|
|
@@ -245,7 +245,7 @@ load(qt_installs)
|
|
load(qt_targets)
|
|
|
|
# this builds on top of qt_common
|
|
-!internal_module:!lib_bundle:if(unix|mingw) {
|
|
+!internal_module:if(unix|mingw) {
|
|
CONFIG += create_pc
|
|
QMAKE_PKGCONFIG_DESTDIR = pkgconfig
|
|
host_build: \
|