1berry/qtbase
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

consider qt resource paths absolute

Browse Source 
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>
This commit is contained in:
Oswald Buddenhagen 2014-06-26 12:37:39 +02:00 committed by Oswald Buddenhagen
parent 193c6d2ebb
commit 7b1a8e047c
1 changed files with 4 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
qmake/library/ioutils.cpp
View File

@ -68,6 +68,10 @@ bool IoUtils::isRelativePath(const QString &path)
{ {
if (path.startsWith(QLatin1Char('/'))) if (path.startsWith(QLatin1Char('/')))
return false; return false;
#ifdef QMAKE_BUILTIN_PRFS
if (path.startsWith(QLatin1String(":/")))
return false;
#endif
#ifdef Q_OS_WIN #ifdef Q_OS_WIN
if (path.startsWith(QLatin1Char('\\'))) if (path.startsWith(QLatin1Char('\\')))
return false; return false;