summaryrefslogtreecommitdiffstats
path: root/qmake
diff options
context:
space:
mode:
authorJ-P Nurmi <jpnurmi@digia.com>2012-10-09 12:47:46 (GMT)
committerThe Qt Project <gerrit-noreply@qt-project.org>2012-10-22 01:54:15 (GMT)
commit1ca713f5d33fe52e3ae4c1f85c6e044ae9901f89 (patch)
tree5fb3a29cabc787d1f1b34c91b30d1dbfc241516a /qmake
parent87e362b1824dab2a2fca238f6283deb9566fdf24 (diff)
downloadQt-1ca713f5d33fe52e3ae4c1f85c6e044ae9901f89.zip
Qt-1ca713f5d33fe52e3ae4c1f85c6e044ae9901f89.tar.gz
Qt-1ca713f5d33fe52e3ae4c1f85c6e044ae9901f89.tar.bz2
qmake: fix .pc install target dir separators on windows
Task-number: QTBUG-26455 Change-Id: I578345b1676d0d2e812e0ab2e48468b4a8013ee9 Reviewed-by: Miikka Heikkinen <miikka.heikkinen@digia.com> Reviewed-by: Joerg Bornemann <joerg.bornemann@digia.com> (cherry picked from commit 3c05a0f3e7cad3ef4738eb11df4d427c8dbc13e8)
Diffstat (limited to 'qmake')
-rw-r--r--qmake/generators/win32/winmakefile.cpp2
1 files changed, 1 insertions, 1 deletions
diff --git a/qmake/generators/win32/winmakefile.cpp b/qmake/generators/win32/winmakefile.cpp
index bdfb47e..0d855a3 100644
--- a/qmake/generators/win32/winmakefile.cpp
+++ b/qmake/generators/win32/winmakefile.cpp
@@ -856,7 +856,7 @@ QString Win32MakefileGenerator::defaultInstall(const QString &t)
QString dst_pc = pkgConfigFileName(false);
if (!dst_pc.isEmpty()) {
dst_pc = filePrefixRoot(root, targetdir + dst_pc);
- const QString dst_pc_dir = fileInfo(dst_pc).path();
+ const QString dst_pc_dir = Option::fixPathToTargetOS(fileInfo(dst_pc).path(), false);
if (!dst_pc_dir.isEmpty()) {
if (!ret.isEmpty())
ret += "\n\t";