From f33c6f37a8226c67a199181a8721f09983089448 Mon Sep 17 00:00:00 2001 From: Frederik Gladhorn Date: Thu, 14 Jan 2016 13:01:39 +0100 Subject: Work around MinGW-make's magic prefixing of paths. MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit 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 Reviewed-by: Oswald Buddenhagen Reviewed-by: Frederik Gladhorn --- qmake/generators/win32/mingw_make.h | 1 + 1 file changed, 1 insertion(+) (limited to 'qmake/generators/win32/mingw_make.h') diff --git a/qmake/generators/win32/mingw_make.h b/qmake/generators/win32/mingw_make.h index 4e94a23ae2..1525f04955 100644 --- a/qmake/generators/win32/mingw_make.h +++ b/qmake/generators/win32/mingw_make.h @@ -50,6 +50,7 @@ protected: virtual QString getManifestFileForRcFile() const; bool writeMakefile(QTextStream &); void init(); + virtual QString installRoot() const; private: void writeMingwParts(QTextStream &); void writeIncPart(QTextStream &t); -- cgit v1.2.3