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

qmake: move over from QmakeProjectNodes to QmakeParserNodes

Browse Source 
Change-Id: Iab87e0c248b0f651a1774336c3bddf83baa9d057
Reviewed-by: hjk <hjk@qt.io>
Reviewed-by: Tim Jenssen <tim.jenssen@qt.io>
This commit is contained in:
Tobias Hunger
2017-02-10 11:16:18 +01:00
committed by Tim Jenssen
parent 62726c3f77
commit f9eab73dad
32 changed files with 440 additions and 2775 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
src/plugins/qmldesigner/documentmanager.cpp
View File

@@ -369,7 +369,10 @@ bool DocumentManager::setIsoIconsQmakeVariableValue(const QString &proPath, cons
}
int flags = QmakeProjectManager::Internal::ProWriter::ReplaceValues | QmakeProjectManager::Internal::ProWriter::MultiLine;
return proNode->setProVariable("ISO_ICONS", value, QString(), flags);
QmakeProjectManager::QmakeProFile *pro = proNode->proFile();
if (pro)
return pro->setProVariable("ISO_ICONS", value, QString(), flags);
return false;
}
void DocumentManager::findPathToIsoProFile(bool *iconResourceFileAlreadyExists, QString *resourceFilePath,