From 7b1a8e047cd2823246568cabf9b604888b3e8bd9 Mon Sep 17 00:00:00 2001 From: Oswald Buddenhagen Date: Thu, 26 Jun 2014 12:37:39 +0200 Subject: 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 (cherry picked from qtcreator/d0428a05220ed0550dd84cdb8299a1fb37b0fe72) Reviewed-by: Christian Kandeler --- qmake/library/ioutils.cpp | 4 ++++ 1 file changed, 4 insertions(+) (limited to 'qmake/library/ioutils.cpp') 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; -- cgit v1.2.3