diff --git a/share/qtcreator/qml-type-descriptions/qmlproject-types.xml b/share/qtcreator/qml-type-descriptions/qmlproject-types.xml index c042b164d053310e0a6fc6fa5b992ff55d787c5a..1b3e35fc9ccb4496cf994d9af8b204fbe228dee1 100644 --- a/share/qtcreator/qml-type-descriptions/qmlproject-types.xml +++ b/share/qtcreator/qml-type-descriptions/qmlproject-types.xml @@ -2,7 +2,7 @@ <module> <type name="QmlProject.Project"> <property name="sourceDirectory" type="string"/> - <property name="libraryPaths" type="string" isList="true"/> + <property name="importPaths" type="string" isList="true"/> <property name="content" type="QmlProjectItem" isList="true"/> </type> <type name="QmlProjectItem"> diff --git a/src/plugins/qmlprojectmanager/fileformat/qmlprojectitem.cpp b/src/plugins/qmlprojectmanager/fileformat/qmlprojectitem.cpp index f79d4c51ca089d616a8d1eb2e513df2d2d626bf8..0be5f30f98cd3d477e5ea050086d653aa6cc6e51 100644 --- a/src/plugins/qmlprojectmanager/fileformat/qmlprojectitem.cpp +++ b/src/plugins/qmlprojectmanager/fileformat/qmlprojectitem.cpp @@ -85,14 +85,14 @@ QStringList QmlProjectItem::importPaths() const return d->importPaths; } -void QmlProjectItem::setImportPaths(const QStringList &libraryPaths) +void QmlProjectItem::setImportPaths(const QStringList &importPaths) { Q_D(QmlProjectItem); - if (d->importPaths == libraryPaths) + if (d->importPaths == importPaths) return; - d->importPaths = libraryPaths; + d->importPaths = importPaths; emit importPathsChanged(); } diff --git a/src/plugins/qmlprojectmanager/qmlproject.cpp b/src/plugins/qmlprojectmanager/qmlproject.cpp index 5c512db9a5a6a856bd6c67cd70021c7ccb646c37..89aeba3d6ca1d2f955bb76216131ad29508a199b 100644 --- a/src/plugins/qmlprojectmanager/qmlproject.cpp +++ b/src/plugins/qmlprojectmanager/qmlproject.cpp @@ -95,7 +95,7 @@ void QmlProject::parseProject(RefreshOptions options) && qobject_cast<QmlProjectItem*>(component->create())) { m_projectItem = qobject_cast<QmlProjectItem*>(component->create()); connect(m_projectItem.data(), SIGNAL(qmlFilesChanged()), this, SLOT(refreshFiles())); - connect(m_projectItem.data(), SIGNAL(libraryPathsChanged()), this, SLOT(refreshImportPaths())); + connect(m_projectItem.data(), SIGNAL(importPathsChanged()), this, SLOT(refreshImportPaths())); refreshImportPaths(); } else { Core::MessageManager *messageManager = Core::ICore::instance()->messageManager(); @@ -165,12 +165,12 @@ bool QmlProject::validProjectFile() const return !m_projectItem.isNull(); } -QStringList QmlProject::libraryPaths() const +QStringList QmlProject::importPaths() const { - QStringList libraryPaths; + QStringList importPaths; if (m_projectItem) - libraryPaths = m_projectItem.data()->importPaths(); - return libraryPaths; + importPaths = m_projectItem.data()->importPaths(); + return importPaths; } bool QmlProject::addFiles(const QStringList &filePaths) @@ -195,7 +195,7 @@ void QmlProject::refreshFiles() void QmlProject::refreshImportPaths() { - m_modelManager->setProjectImportPaths(libraryPaths()); + m_modelManager->setProjectImportPaths(importPaths()); } QString QmlProject::displayName() const diff --git a/src/plugins/qmlprojectmanager/qmlproject.h b/src/plugins/qmlprojectmanager/qmlproject.h index 6639a109c1197a5dd39169e256337698f09f3e2f..2df755c46a8dd098f99a12627142466994d10326 100644 --- a/src/plugins/qmlprojectmanager/qmlproject.h +++ b/src/plugins/qmlprojectmanager/qmlproject.h @@ -99,7 +99,7 @@ public: QDir projectDir() const; QStringList files() const; - QStringList libraryPaths() const; + QStringList importPaths() const; bool addFiles(const QStringList &filePaths); diff --git a/src/plugins/qmlprojectmanager/qmlprojectrunconfiguration.cpp b/src/plugins/qmlprojectmanager/qmlprojectrunconfiguration.cpp index 1093eb1546824f260fc5b6ba174a722be3cdcc57..4d24791a5360cc3557e5f343a7acab85cbf7af21 100644 --- a/src/plugins/qmlprojectmanager/qmlprojectrunconfiguration.cpp +++ b/src/plugins/qmlprojectmanager/qmlprojectrunconfiguration.cpp @@ -129,9 +129,9 @@ QStringList QmlProjectRunConfiguration::viewerArguments() const args.append(m_qmlViewerArgs); // arguments from .qmlproject file - foreach (const QString &libraryPath, qmlTarget()->qmlProject()->libraryPaths()) { + foreach (const QString &importPath, qmlTarget()->qmlProject()->importPaths()) { args.append(QLatin1String("-L")); - args.append(libraryPath); + args.append(importPath); } const QString s = mainScript();