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 | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/0028-Prevent-qmake-from-messing-static-lib-dependencies.patch b/0028-Prevent-qmake-from-messing-static-lib-dependencies.patch index 4b5cec1ca299..7103fb1229b7 100644 --- a/0028-Prevent-qmake-from-messing-static-lib-dependencies.patch +++ b/0028-Prevent-qmake-from-messing-static-lib-dependencies.patch @@ -1,4 +1,4 @@ -From 0c03c5c9926209c162c75e14713863be8d3da08a Mon Sep 17 00:00:00 2001 +From 22a94d0575482106bd10c562f35b04f13781cc09 Mon Sep 17 00:00:00 2001 From: Martchus <martchus@gmx.net> Date: Tue, 7 Feb 2017 18:25:28 +0100 Subject: [PATCH 28/33] Prevent qmake from messing static lib dependencies @@ -11,7 +11,7 @@ static freetype2 and harfbuzz 2 files changed, 6 insertions(+) diff --git a/qmake/generators/unix/unixmake.cpp b/qmake/generators/unix/unixmake.cpp -index 7f42fbe09e..e27428c0f2 100644 +index d7c9413290..3026318a70 100644 --- a/qmake/generators/unix/unixmake.cpp +++ b/qmake/generators/unix/unixmake.cpp @@ -393,6 +393,9 @@ UnixMakefileGenerator::fixLibFlag(const ProString &lib) @@ -25,7 +25,7 @@ index 7f42fbe09e..e27428c0f2 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 4f1a4344df..32a1ccbbf9 100644 +index 17592c2492..26f3f5cd82 100644 --- a/qmake/generators/win32/winmakefile.cpp +++ b/qmake/generators/win32/winmakefile.cpp @@ -87,6 +87,9 @@ Win32MakefileGenerator::findLibraries(bool linkPrl, bool mergeLflags) @@ -39,5 +39,5 @@ index 4f1a4344df..32a1ccbbf9 100644 int libidx = 0; for (const ProString &dlib : project->values("QMAKE_DEFAULT_LIBDIRS")) -- -2.22.0 +2.23.0 |