* Update patch for static freetype2 in qt5 for brotli library renaming * Update patches for Qt 5 SQL drivers to include crypt32 * This library is required by OpenSSL's crypto library. Not sure why there were no linker errors before.
67 lines
2.7 KiB
Diff
67 lines
2.7 KiB
Diff
From e92060e9f2082620f5e2a90f5caf962e5ddf6cc8 Mon Sep 17 00:00:00 2001
|
|
From: Martchus <martchus@gmx.net>
|
|
Date: Sun, 18 Sep 2016 13:54:12 +0200
|
|
Subject: [PATCH 04/32] 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 7ff921549d..fc996663d8 100644
|
|
--- a/qmake/generators/makefile.cpp
|
|
+++ b/qmake/generators/makefile.cpp
|
|
@@ -3242,7 +3242,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()) {
|
|
@@ -3267,7 +3267,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 106069c454..5252a7eaa1 100644
|
|
--- a/qmake/generators/makefile.h
|
|
+++ b/qmake/generators/makefile.h
|
|
@@ -96,7 +96,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 5e446bd7e2..183cef2908 100644
|
|
--- a/qmake/generators/win32/winmakefile.cpp
|
|
+++ b/qmake/generators/win32/winmakefile.cpp
|
|
@@ -775,7 +775,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.43.0
|
|
|