diff options
author | Martchus | 2020-04-04 13:35:50 +0200 |
---|---|---|
committer | Martchus | 2020-04-04 13:35:50 +0200 |
commit | 1f090a0ac13d6b54b7a8f46d740ca58d65ece4a9 (patch) | |
tree | a340e8b741a65d6a70764ff1bbbc7cdcdb50b829 /0028-Prevent-qmake-from-messing-static-lib-dependencies.patch | |
parent | 9338171ab5df2cfa016f829757ee65985b45a8bb (diff) | |
download | aur-1f090a0ac13d6b54b7a8f46d740ca58d65ece4a9.tar.gz |
Update to 5.14.2
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 3bb514e1d30d..4729b820f644 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 818b881fa3b76f914565d61c77845bdf4607aa18 Mon Sep 17 00:00:00 2001 +From 90787e1baa580ced40a79a20c8624ecdeee3aad4 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 3b4372ad05..cd10225e99 100644 +index 3a75986257..34e7776e44 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.26.0 |