diff options
Diffstat (limited to '0018-Merge-shared-and-static-library-trees.patch')
| -rw-r--r-- | 0018-Merge-shared-and-static-library-trees.patch | 38 |
1 files changed, 20 insertions, 18 deletions
diff --git a/0018-Merge-shared-and-static-library-trees.patch b/0018-Merge-shared-and-static-library-trees.patch index 1f2db1e84177..7e35a741d883 100644 --- a/0018-Merge-shared-and-static-library-trees.patch +++ b/0018-Merge-shared-and-static-library-trees.patch @@ -1,9 +1,11 @@ -From fbda1fcb3f3bd84852a594f2bf8805db93e27294 Mon Sep 17 00:00:00 2001 +From 2029f79155af8b3fdff3b9a66ee25b7ff274c327 Mon Sep 17 00:00:00 2001 From: Martchus <martchus@gmx.net> Date: Sun, 18 Sep 2016 18:45:08 +0200 Subject: [PATCH 18/32] Merge shared and static library trees Allow installation of shared and static build in the same prefix + +Change-Id: I1de08df42d83d411aae519691cd3cde1fd6f3d1d --- configure.pri | 16 +++++++++++++++- mkspecs/features/default_post.prf | 11 +++++++++++ @@ -15,10 +17,10 @@ Allow installation of shared and static build in the same prefix 7 files changed, 74 insertions(+), 11 deletions(-) diff --git a/configure.pri b/configure.pri -index 3778ece180..c108b2843c 100644 +index 365a16403eb..85acb3757aa 100644 --- a/configure.pri +++ b/configure.pri -@@ -652,7 +652,12 @@ defineTest(qtConfOutput_machineTuple) { +@@ -668,7 +668,12 @@ defineTest(qtConfOutput_machineTuple) { defineTest(qtConfOutput_commitOptions) { # qdevice.pri needs to be written early, because the compile tests require it. @@ -31,8 +33,8 @@ index 3778ece180..c108b2843c 100644 + write_file($$QT_BUILD_TREE/mkspecs/qdevice$$DEVICE_PRI_SUFFIX, $${currentConfig}.output.devicePro)|error() } - # type (empty or 'host'), option name, default value -@@ -1342,3 +1347,12 @@ defineTest(createConfigStatus) { + # Output is written after configuring each Qt module, +@@ -1430,3 +1435,12 @@ defineTest(createConfigStatus) { QMAKE_POST_CONFIGURE += \ "createConfigStatus()" @@ -46,7 +48,7 @@ index 3778ece180..c108b2843c 100644 + CONFIG += no_smart_library_merge +} diff --git a/mkspecs/features/default_post.prf b/mkspecs/features/default_post.prf -index 0e41b825ec..4c4b6dd12a 100644 +index ac799047ab8..60b63922670 100644 --- a/mkspecs/features/default_post.prf +++ b/mkspecs/features/default_post.prf @@ -1,5 +1,16 @@ @@ -67,7 +69,7 @@ index 0e41b825ec..4c4b6dd12a 100644 !have_target:!force_qt: CONFIG -= qt diff --git a/mkspecs/features/device_config.prf b/mkspecs/features/device_config.prf -index c15559e174..dd09ac749d 100644 +index c15559e1740..dd09ac749d8 100644 --- a/mkspecs/features/device_config.prf +++ b/mkspecs/features/device_config.prf @@ -4,7 +4,14 @@ @@ -87,10 +89,10 @@ index c15559e174..dd09ac749d 100644 unset(DEVICE_PRI) diff --git a/mkspecs/features/qt.prf b/mkspecs/features/qt.prf -index 3a71376029..bbada46c29 100644 +index da1f44a88a1..8096d01c341 100644 --- a/mkspecs/features/qt.prf +++ b/mkspecs/features/qt.prf -@@ -232,6 +232,23 @@ for(ever) { +@@ -254,6 +254,23 @@ for(ever) { !isEmpty(MODULE_WINRT_CAPABILITIES_DEVICE): \ WINRT_MANIFEST.capabilities_device_default += $$MODULE_WINRT_CAPABILITIES_DEVICE } @@ -115,7 +117,7 @@ index 3a71376029..bbada46c29 100644 !isEmpty(BAD_QT):error("Unknown module(s) in QT$$var_sfx: $$replace(BAD_QT, _private$, -private)") diff --git a/mkspecs/features/spec_pre.prf b/mkspecs/features/spec_pre.prf -index 51ea3a8321..275e080ae4 100644 +index 51ea3a8321a..275e080ae4e 100644 --- a/mkspecs/features/spec_pre.prf +++ b/mkspecs/features/spec_pre.prf @@ -14,9 +14,14 @@ QMAKE_EXT_H = .h .hpp .hh .hxx @@ -137,10 +139,10 @@ index 51ea3a8321..275e080ae4 100644 QMAKE_EXT_YACC = .y diff --git a/qmake/generators/makefile.cpp b/qmake/generators/makefile.cpp -index 5c6e7e1281..0eeeb5fb5e 100644 +index 23ac736fc06..16531d556e0 100644 --- a/qmake/generators/makefile.cpp +++ b/qmake/generators/makefile.cpp -@@ -3262,6 +3262,9 @@ MakefileGenerator::pkgConfigFileName(bool fixify, bool onlyPrependDestdir) +@@ -3259,6 +3259,9 @@ MakefileGenerator::pkgConfigFileName(bool fixify, bool onlyPrependDestdir) if (project->isActiveConfig("debug")) { ret += "d"; } @@ -150,24 +152,24 @@ index 5c6e7e1281..0eeeb5fb5e 100644 ret += Option::pkgcfg_ext; QString subdir = project->first("QMAKE_PKGCONFIG_DESTDIR").toQString(); if(!subdir.isEmpty()) { -@@ -3438,11 +3441,11 @@ MakefileGenerator::writePkgConfigFile() - t << endl; +@@ -3435,11 +3438,11 @@ MakefileGenerator::writePkgConfigFile() + t << Qt::endl; // requires - const QString requiresString = project->values("QMAKE_PKGCONFIG_REQUIRES").join(' '); - if (!requiresString.isEmpty()) { -- t << "Requires: " << requiresString << endl; +- t << "Requires: " << requiresString << Qt::endl; + t << "Requires:"; + const auto pkgconfigRequires = project->values("QMAKE_PKGCONFIG_REQUIRES"); + for (const auto &required : pkgconfigRequires) { + t << (project->isActiveConfig("staticlib") ? QStringLiteral(" Static") : QStringLiteral(" ")) << required.toQString(); } - - t << endl; + t << Qt::endl; } diff --git a/qtbase.pro b/qtbase.pro -index c0ce0972ef..5a2deaf31d 100644 +index c0ce0972ef4..5a2deaf31d2 100644 --- a/qtbase.pro +++ b/qtbase.pro @@ -20,6 +20,12 @@ CLEAN_DEPS += qmake-clean @@ -202,5 +204,5 @@ index c0ce0972ef..5a2deaf31d 100644 mkspecs.files -= $$PWD/mkspecs/modules $$PWD/mkspecs/modules-inst INSTALLS += mkspecs -- -2.24.0 +2.44.0 |