diff options
| author | Martchus | 2020-06-01 19:54:17 +0200 |
|---|---|---|
| committer | Martchus | 2020-06-01 19:54:17 +0200 |
| commit | 8598b5e1679cfdd50942e06d32dee06292b579b5 (patch) | |
| tree | 349d0c3845220a4ac514b790cc47aa5f8bdf578e /0028-Prevent-qmake-from-messing-static-lib-dependencies.patch | |
| parent | 2bc290665d6960f6f0cb4d059f0bf8e53a66351e (diff) | |
| download | aur-8598b5e1679cfdd50942e06d32dee06292b579b5.tar.gz | |
Update to 5.15.0
Diffstat (limited to '0028-Prevent-qmake-from-messing-static-lib-dependencies.patch')
| -rw-r--r-- | 0028-Prevent-qmake-from-messing-static-lib-dependencies.patch | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/0028-Prevent-qmake-from-messing-static-lib-dependencies.patch b/0028-Prevent-qmake-from-messing-static-lib-dependencies.patch index 5e66408af195..57997469f14e 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 0104780784ba1a49d5f034a95ba00743915c82b1 Mon Sep 17 00:00:00 2001 +From fe0da13a33630cc1684b16c040f2f7c1eb11d775 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 @@ -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 3a75986257..34e7776e44 100644 +index ad5086aadd..a238a6ea33 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 3a75986257..34e7776e44 100644 int libidx = 0; for (const ProString &dlib : project->values("QMAKE_DEFAULT_LIBDIRS")) -- -2.26.1 +2.26.2 |