feedc0de/qt-creator
1
0
Fork 0
forked from qt-creator/qt-creator
Code Pull Requests Activity

Merge remote-tracking branch 'origin/4.1'

Browse Source 
Change-Id: I5cdc704c827a6f5abf4dc39e2a131d53df328bd2
This commit is contained in:
Eike Ziller
2016-06-22 11:29:07 +02:00
parent 23cd42557d 4f9016e03f
commit 0e923c2a75
34 changed files with 272 additions and 96 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/libs/qmljs/qmljsqrcparser.cpp
View File

@@ -407,8 +407,6 @@ void QrcParserPrivate::collectResourceFilesForSourceFile(const QString &sourceFi
const QLocale *locale) const
{
// TODO: use FileName from fileutils for file pathes
QTC_CHECK(QFileInfo(sourceFile).isFile());
QTC_CHECK(QFileInfo(sourceFile).isAbsolute());
QStringList langs = allUiLanguages(locale);
SMap::const_iterator file = m_files.find(sourceFile);