diff options
Diffstat (limited to '0028-Prevent-qmake-from-messing-static-lib-dependencies.patch')
| -rw-r--r-- | 0028-Prevent-qmake-from-messing-static-lib-dependencies.patch | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/0028-Prevent-qmake-from-messing-static-lib-dependencies.patch b/0028-Prevent-qmake-from-messing-static-lib-dependencies.patch index 3bb514e1d30d..9776e1a11cbc 100644 --- a/0028-Prevent-qmake-from-messing-static-lib-dependencies.patch +++ b/0028-Prevent-qmake-from-messing-static-lib-dependencies.patch @@ -1,7 +1,7 @@ -From 818b881fa3b76f914565d61c77845bdf4607aa18 Mon Sep 17 00:00:00 2001 +From 2095dda5640e16c678173355a2d39910701d8fc3 Mon Sep 17 00:00:00 2001 From: Martchus <martchus@gmx.net> Date: Tue, 7 Feb 2017 18:25:28 +0100 -Subject: [PATCH 28/31] Prevent qmake from messing static lib dependencies +Subject: [PATCH 28/32] Prevent qmake from messing static lib dependencies In particular, it messes resolving cyclic dependency between static freetype2 and harfbuzz @@ -13,7 +13,7 @@ Change-Id: Ie5a4e2ad96bd613ae4c26486edb30c74929459b0 2 files changed, 6 insertions(+) diff --git a/qmake/generators/unix/unixmake.cpp b/qmake/generators/unix/unixmake.cpp -index f7bd6dc663..b76c444012 100644 +index f7bd6dc6634..b76c444012c 100644 --- a/qmake/generators/unix/unixmake.cpp +++ b/qmake/generators/unix/unixmake.cpp @@ -391,6 +391,9 @@ UnixMakefileGenerator::fixLibFlag(const ProString &lib) @@ -27,7 +27,7 @@ index f7bd6dc663..b76c444012 100644 int libidx = 0, fwidx = 0; for (const ProString &dlib : project->values("QMAKE_DEFAULT_LIBDIRS")) diff --git a/qmake/generators/win32/winmakefile.cpp b/qmake/generators/win32/winmakefile.cpp -index 3b4372ad05..cd10225e99 100644 +index 03732df4a84..602f7609f58 100644 --- a/qmake/generators/win32/winmakefile.cpp +++ b/qmake/generators/win32/winmakefile.cpp @@ -106,6 +106,9 @@ Win32MakefileGenerator::findLibraries(bool linkPrl, bool mergeLflags) @@ -41,5 +41,5 @@ index 3b4372ad05..cd10225e99 100644 int libidx = 0; for (const ProString &dlib : project->values("QMAKE_DEFAULT_LIBDIRS")) -- -2.25.0 +2.44.0 |