diff options
Diffstat (limited to '0030-Prevent-qmake-from-messing-static-lib-dependencies.patch')
-rw-r--r-- | 0030-Prevent-qmake-from-messing-static-lib-dependencies.patch | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/0030-Prevent-qmake-from-messing-static-lib-dependencies.patch b/0030-Prevent-qmake-from-messing-static-lib-dependencies.patch index cb4dc10dbc7c..1bf91a24aa35 100644 --- a/0030-Prevent-qmake-from-messing-static-lib-dependencies.patch +++ b/0030-Prevent-qmake-from-messing-static-lib-dependencies.patch @@ -1,4 +1,4 @@ -From e917a88d58047cdb3fb46c1b07fb78648bf74358 Mon Sep 17 00:00:00 2001 +From f41ba61108dd735410e4feac87fa23b321d0a20f Mon Sep 17 00:00:00 2001 From: Martchus <martchus@gmx.net> Date: Tue, 7 Feb 2017 18:25:28 +0100 Subject: [PATCH 30/34] 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 4cbe06d9dc..47535f60d5 100644 +index 7f42fbe09e..e27428c0f2 100644 --- a/qmake/generators/unix/unixmake.cpp +++ b/qmake/generators/unix/unixmake.cpp @@ -393,6 +393,9 @@ UnixMakefileGenerator::fixLibFlag(const ProString &lib) @@ -39,5 +39,5 @@ index 4592fed7b2..b93d0df473 100644 for (const ProString &dlib : project->values("QMAKE_DEFAULT_LIBDIRS")) dirs.append(QMakeLocalFileName(dlib.toQString())); -- -2.20.1 +2.21.0 |