Update to 5.13.0

1 files changed, 0 insertions, 66 deletions

diff --git a/0005-Make-sure-.pc-files-are-installed-correctly.patch b/0005-Make-sure-.pc-files-are-installed-correctly.patch
deleted file mode 100644
index f6e3ee031b56..000000000000
--- a/0005-Make-sure-.pc-files-are-installed-correctly.patch
+++ /dev/null
@@ -1,66 +0,0 @@
-From 70435bc3ad5e60f9330a833094635e73eb9bc6a8 Mon Sep 17 00:00:00 2001
-From: Martchus <martchus@gmx.net>
-Date: Sun, 18 Sep 2016 13:54:12 +0200
-Subject: [PATCH 05/34] Make sure *.pc files are installed correctly
-
----
- qmake/generators/makefile.cpp          | 8 ++++++--
- qmake/generators/makefile.h            | 2 +-
- qmake/generators/win32/winmakefile.cpp | 2 +-
- 3 files changed, 8 insertions(+), 4 deletions(-)
-
-diff --git a/qmake/generators/makefile.cpp b/qmake/generators/makefile.cpp
-index ab261d02f1..aa4c96be49 100644
---- a/qmake/generators/makefile.cpp
-+++ b/qmake/generators/makefile.cpp
-@@ -3230,7 +3230,7 @@ MakefileGenerator::openOutput(QFile &file, const QString &build) const
- }
- 
- QString
--MakefileGenerator::pkgConfigFileName(bool fixify)
-+MakefileGenerator::pkgConfigFileName(bool fixify, bool onlyPrependDestdir)
- {
-     QString ret = project->first("QMAKE_PKGCONFIG_FILE").toQString();
-     if (ret.isEmpty()) {
-@@ -3255,7 +3255,11 @@ MakefileGenerator::pkgConfigFileName(bool fixify)
-     if(fixify) {
-         if(QDir::isRelativePath(ret) && !project->isEmpty("DESTDIR"))
-             ret.prepend(project->first("DESTDIR").toQString());
--        ret = fileFixify(ret, FileFixifyBackwards);
-+        if (onlyPrependDestdir) {
-+            ret = Option::fixPathToLocalOS(ret);
-+        } else {
-+            ret = fileFixify(ret, FileFixifyBackwards);
-+        }
-     }
-     return ret;
- }
-diff --git a/qmake/generators/makefile.h b/qmake/generators/makefile.h
-index 350ebd377a..d0c234b864 100644
---- a/qmake/generators/makefile.h
-+++ b/qmake/generators/makefile.h
-@@ -92,7 +92,7 @@ protected:
-     virtual void writeDefaultVariables(QTextStream &t);
- 
-     QString pkgConfigPrefix() const;
--    QString pkgConfigFileName(bool fixify=true);
-+    QString pkgConfigFileName(bool fixify=true, bool onlyPrependDestdir = false);
-     QString pkgConfigFixPath(QString) const;
-     void writePkgConfigFile();   // for pkg-config
- 
-diff --git a/qmake/generators/win32/winmakefile.cpp b/qmake/generators/win32/winmakefile.cpp
-index 208af1327f..5a37b218de 100644
---- a/qmake/generators/win32/winmakefile.cpp
-+++ b/qmake/generators/win32/winmakefile.cpp
-@@ -753,7 +753,7 @@ QString Win32MakefileGenerator::defaultInstall(const QString &t)
-                 }
-                 if(!ret.isEmpty())
-                     ret += "\n\t";
--                ret += installMetaFile(ProKey("QMAKE_PKGCONFIG_INSTALL_REPLACE"), pkgConfigFileName(true), dst_pc);
-+                ret += installMetaFile(ProKey("QMAKE_PKGCONFIG_INSTALL_REPLACE"), pkgConfigFileName(true, true), dst_pc);
-                 if(!uninst.isEmpty())
-                     uninst.append("\n\t");
-                 uninst.append("-$(DEL_FILE) " + escapeFilePath(dst_pc));
--- 
-2.21.0
-