summaryrefslogtreecommitdiffstats
path: root/qmake/generators/makefile.h
diff options
context:
space:
mode:
authorFrederik Gladhorn <frederik.gladhorn@theqtcompany.com>2016-01-14 13:01:39 +0100
committerOswald Buddenhagen <oswald.buddenhagen@theqtcompany.com>2016-01-21 19:23:40 +0000
commitf33c6f37a8226c67a199181a8721f09983089448 (patch)
tree538cbb0a894aca00bc7f0b3eb559ef3f14dc8ad3 /qmake/generators/makefile.h
parent2bb473c19a6926a0691219776109dee37a1a276b (diff)
Work around MinGW-make's magic prefixing of paths.
When building QNX on MS-Windows, make magically adds the Msys root as prefix to variables whose values look like paths; this applies to both environment variables and variables given values on the command-line. When we don't actually want to install under the Msys root, this is unwelcome "help". So (for MinGW's make) support a magic prefix of our own, @msyshack@, that'll make a path value for INSTALL_ROOT not look like a path to make; we can then strip it off when we come to use it. Change-Id: I951ad3c8fe3e5cfb49e6e361d7fff779f3a9d716 Reviewed-by: Jędrzej Nowacki <jedrzej.nowacki@theqtcompany.com> Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@theqtcompany.com> Reviewed-by: Frederik Gladhorn <frederik.gladhorn@theqtcompany.com>
Diffstat (limited to 'qmake/generators/makefile.h')
-rw-r--r--qmake/generators/makefile.h4
1 files changed, 4 insertions, 0 deletions
diff --git a/qmake/generators/makefile.h b/qmake/generators/makefile.h
index 97159eaef4..19ff5d57a3 100644
--- a/qmake/generators/makefile.h
+++ b/qmake/generators/makefile.h
@@ -192,6 +192,7 @@ protected:
//for installs
virtual QString defaultInstall(const QString &);
+ virtual QString installRoot() const;
//for prl
QString prlFileName(bool fixify=true);
@@ -277,6 +278,9 @@ inline bool MakefileGenerator::noIO() const
inline QString MakefileGenerator::defaultInstall(const QString &)
{ return QString(""); }
+inline QString MakefileGenerator::installRoot() const
+{ return QStringLiteral("$(INSTALL_ROOT)"); }
+
inline bool MakefileGenerator::findLibraries(bool, bool)
{ return true; }