summaryrefslogtreecommitdiffstats
path: root/qmake/generators/makefile.h
diff options
context:
space:
mode:
authorOswald Buddenhagen <oswald.buddenhagen@qt.io>2018-06-08 21:18:11 +0200
committerOswald Buddenhagen <oswald.buddenhagen@qt.io>2018-06-25 13:35:20 +0000
commit7c34e0a7b48572be1f9e3fb45911a13b01798e37 (patch)
treedf66f4c8e7c7c3e924c20a5582343a44e15ea105 /qmake/generators/makefile.h
parent8e075dac8f08039957fc89d48042c8810d6ae63b (diff)
qmake: escape colons and hashmarks in dependency paths
these characters can appear in file names, but are meta characters in dependency context. they have different semantics in make commands, so this required some reshuffling in the windows generator (which just treated dependencies and commands the same way). we don't actually escape colons for nmake, because it has magic treatment of drive letters anyway (and colons cannot appear elsewhere). also, if a target's filename gets quoted, batch rules will blow up. therefore, "funny" file names are really only supported as inputs - which is just enough to make resource embedding work. Task-number: QTBUG-22863 Task-number: QTBUG-68635 Change-Id: I473b0bf47d045298fd2ae481a29de603a3c1be30 Reviewed-by: MÃ¥rten Nordheim <marten.nordheim@qt.io> Reviewed-by: Joerg Bornemann <joerg.bornemann@qt.io>
Diffstat (limited to 'qmake/generators/makefile.h')
-rw-r--r--qmake/generators/makefile.h4
1 files changed, 2 insertions, 2 deletions
diff --git a/qmake/generators/makefile.h b/qmake/generators/makefile.h
index 6341a141b9..f32bec650e 100644
--- a/qmake/generators/makefile.h
+++ b/qmake/generators/makefile.h
@@ -130,11 +130,11 @@ protected:
QMakeProject *project;
//escape
- virtual QString escapeFilePath(const QString &path) const { return path; }
+ virtual QString escapeFilePath(const QString &path) const = 0;
ProString escapeFilePath(const ProString &path) const;
QStringList escapeFilePaths(const QStringList &paths) const;
ProStringList escapeFilePaths(const ProStringList &paths) const;
- virtual QString escapeDependencyPath(const QString &path) const { return escapeFilePath(path); }
+ virtual QString escapeDependencyPath(const QString &path) const;
ProString escapeDependencyPath(const ProString &path) const;
QStringList escapeDependencyPaths(const QStringList &paths) const;
ProStringList escapeDependencyPaths(const ProStringList &paths) const;