diff options
author | Martchus | 2024-03-16 19:42:15 +0100 |
---|---|---|
committer | Martchus | 2024-03-16 19:42:15 +0100 |
commit | 1e3380e1d0b5e1eca05cd2efdb555a7e7f6628ce (patch) | |
tree | 6339cd620e99d2a9f131f9d3733ef91ef72699a0 /0028-Prevent-qmake-from-messing-static-lib-dependencies.patch | |
parent | 7fc943db03693938c9f5bf647278a2e546ed6e64 (diff) | |
download | aur-1e3380e1d0b5e1eca05cd2efdb555a7e7f6628ce.tar.gz |
Update to 5.15.13
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 f5e770e0e0f4..9776e1a11cbc 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 fc455d2b8916fbfe7b0b5240822b96c6567a7e2c 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/32] Prevent qmake from messing static lib dependencies @@ -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 03732df4a8..602f7609f5 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 03732df4a8..602f7609f5 100644 int libidx = 0; for (const ProString &dlib : project->values("QMAKE_DEFAULT_LIBDIRS")) -- -2.43.0 +2.44.0 |