diff options
| author | Martchus | 2020-09-13 13:30:58 +0200 |
|---|---|---|
| committer | Martchus | 2020-09-13 13:30:58 +0200 |
| commit | 7cbc301c2d2412229aa37d034a84a3177805e4f0 (patch) | |
| tree | 788077d957250ce3d3d28f551688883e349933e2 /0028-Prevent-qmake-from-messing-static-lib-dependencies.patch | |
| parent | 35c9dd66afe78b4f69d2356296d3057c61ea7dd3 (diff) | |
| download | aur-7cbc301c2d2412229aa37d034a84a3177805e4f0.tar.gz | |
Update to 5.15.1
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 57997469f14e..819fb97a7b25 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 fe0da13a33630cc1684b16c040f2f7c1eb11d775 Mon Sep 17 00:00:00 2001 +From c5a084e56a5c766909c6513e673ec5fbb2fde4c6 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 ad5086aadd..a238a6ea33 100644 +index 03732df4a8..602f7609f5 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 ad5086aadd..a238a6ea33 100644 int libidx = 0; for (const ProString &dlib : project->values("QMAKE_DEFAULT_LIBDIRS")) -- -2.26.2 +2.28.0 |