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

introduce qmakeProperty(), use instead of versionInfo() where applicable

Browse Source 
the idea is to encapsulate accesses to specific variables.

Change-Id: Icafd2c85de6178db1a492a5dd36dde7f1925ea21
Reviewed-by: Daniel Teske <daniel.teske@nokia.com>
This commit is contained in:
Oswald Buddenhagen
2012-07-06 13:29:45 +02:00
parent 7324d1f912
commit 5e596e89d0
12 changed files with 71 additions and 61 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/plugins/qmlprojectmanager/qmlproject.cpp
View File

@@ -165,7 +165,7 @@ void QmlProject::refresh(RefreshOptions options)
}
if (version) {
pinfo.tryQmlDump = true;
pinfo.qtImportsPath = version->versionInfo().value("QT_INSTALL_IMPORTS");
pinfo.qtImportsPath = version->qmakeProperty("QT_INSTALL_IMPORTS");
pinfo.qtVersionString = version->qtVersionString();
}
m_modelManager->updateProjectInfo(pinfo);
@@ -219,7 +219,7 @@ QStringList QmlProject::importPaths() const
if (runConfig) {
const QtSupport::BaseQtVersion *qtVersion = runConfig->qtVersion();
if (qtVersion && qtVersion->isValid()) {
const QString qtVersionImportPath = qtVersion->versionInfo().value("QT_INSTALL_IMPORTS");
const QString qtVersionImportPath = qtVersion->qmakeProperty("QT_INSTALL_IMPORTS");
if (!qtVersionImportPath.isEmpty())
importPaths += qtVersionImportPath;
}