diff options
Diffstat (limited to '0018-Merge-shared-and-static-library-trees.patch')
| -rw-r--r-- | 0018-Merge-shared-and-static-library-trees.patch | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/0018-Merge-shared-and-static-library-trees.patch b/0018-Merge-shared-and-static-library-trees.patch index 80e2ad478b00..fd9999428577 100644 --- a/0018-Merge-shared-and-static-library-trees.patch +++ b/0018-Merge-shared-and-static-library-trees.patch @@ -1,4 +1,4 @@ -From b3ea7d1e0a967a4c07bfefdf65803ae3087dda1b Mon Sep 17 00:00:00 2001 +From 56291bee2a83d3a267bb1dab7625afd37a17d178 Mon Sep 17 00:00:00 2001 From: Martchus <martchus@gmx.net> Date: Sun, 18 Sep 2016 18:45:08 +0200 Subject: [PATCH 18/31] Merge shared and static library trees @@ -17,7 +17,7 @@ Change-Id: I1de08df42d83d411aae519691cd3cde1fd6f3d1d 7 files changed, 74 insertions(+), 11 deletions(-) diff --git a/configure.pri b/configure.pri -index 47882afeb6..05dc704cde 100644 +index 81c84b28ef..910e59188f 100644 --- a/configure.pri +++ b/configure.pri @@ -648,7 +648,12 @@ defineTest(qtConfOutput_machineTuple) { @@ -34,7 +34,7 @@ index 47882afeb6..05dc704cde 100644 } # type (empty or 'host'), option name, default value -@@ -1365,3 +1370,12 @@ defineTest(createConfigStatus) { +@@ -1387,3 +1392,12 @@ defineTest(createConfigStatus) { QMAKE_POST_CONFIGURE += \ "createConfigStatus()" @@ -139,10 +139,10 @@ index 51ea3a8321..275e080ae4 100644 QMAKE_EXT_YACC = .y diff --git a/qmake/generators/makefile.cpp b/qmake/generators/makefile.cpp -index 01d24418ce..914bb58f27 100644 +index 9c65f21ac0..f79512ca60 100644 --- a/qmake/generators/makefile.cpp +++ b/qmake/generators/makefile.cpp -@@ -3229,6 +3229,9 @@ MakefileGenerator::pkgConfigFileName(bool fixify, bool onlyPrependDestdir) +@@ -3232,6 +3232,9 @@ MakefileGenerator::pkgConfigFileName(bool fixify, bool onlyPrependDestdir) if (project->isActiveConfig("debug")) { ret += "d"; } @@ -152,7 +152,7 @@ index 01d24418ce..914bb58f27 100644 ret += Option::pkgcfg_ext; QString subdir = project->first("QMAKE_PKGCONFIG_DESTDIR").toQString(); if(!subdir.isEmpty()) { -@@ -3405,11 +3408,11 @@ MakefileGenerator::writePkgConfigFile() +@@ -3408,11 +3411,11 @@ MakefileGenerator::writePkgConfigFile() t << Qt::endl; // requires @@ -204,5 +204,5 @@ index c0ce0972ef..5a2deaf31d 100644 mkspecs.files -= $$PWD/mkspecs/modules $$PWD/mkspecs/modules-inst INSTALLS += mkspecs -- -2.24.1 +2.25.0 |