diff options
| author | Oswald Buddenhagen <oswald.buddenhagen@digia.com> | 2014-06-26 12:37:39 +0200 |
|---|---|---|
| committer | Oswald Buddenhagen <oswald.buddenhagen@theqtcompany.com> | 2015-10-27 17:54:27 +0000 |
| commit | 7b1a8e047cd2823246568cabf9b604888b3e8bd9 (patch) | |
| tree | da8fa8c224f54542f2ef4c4b9c484a289fffe22c | |
| parent | 193c6d2ebbac453f12c24def302f08f3b85e6d2a (diff) | |
consider qt resource paths absolute
this fixes an assertion failure with qt4 mingw specs when PATH contains
a "." element.
Task-number: QTCREATORBUG-12528
Change-Id: I2b6b7e02cf38881d40bd78bb0d705f7d58d0736c
Reviewed-by: Christian Kandeler <christian.kandeler@digia.com>
(cherry picked from qtcreator/d0428a05220ed0550dd84cdb8299a1fb37b0fe72)
Reviewed-by: Christian Kandeler <christian.kandeler@theqtcompany.com>
| -rw-r--r-- | qmake/library/ioutils.cpp | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/qmake/library/ioutils.cpp b/qmake/library/ioutils.cpp index 04be215246..a2f3e8ec3d 100644 --- a/qmake/library/ioutils.cpp +++ b/qmake/library/ioutils.cpp @@ -68,6 +68,10 @@ bool IoUtils::isRelativePath(const QString &path) { if (path.startsWith(QLatin1Char('/'))) return false; +#ifdef QMAKE_BUILTIN_PRFS + if (path.startsWith(QLatin1String(":/"))) + return false; +#endif #ifdef Q_OS_WIN if (path.startsWith(QLatin1Char('\\'))) return false; |