diff options
| author | Tobias Hunger <tobias.hunger@qt.io> | 2016-11-09 13:39:59 +0100 |
|---|---|---|
| committer | Tobias Hunger <tobias.hunger@qt.io> | 2016-11-10 15:24:14 +0000 |
| commit | ad003363b7e27d2d55b7c29dacaa3fca10b07045 (patch) | |
| tree | b13dc6bc82aac97771c179ee641f30826021755d /src/plugins/qmldesigner/documentmanager.cpp | |
| parent | c7b0163fcbe1019bca4efb57d1e298c8c206f47e (diff) | |
| download | qt-creator-ad003363b7e27d2d55b7c29dacaa3fca10b07045.tar.gz | |
ProjectExplorer: Rename Node::projectNode to Node::parentProjectNode
Change-Id: I47fa794a0bd8456ae23271934a957d9667d2d7bb
Reviewed-by: Tim Jenssen <tim.jenssen@qt.io>
Diffstat (limited to 'src/plugins/qmldesigner/documentmanager.cpp')
| -rw-r--r-- | src/plugins/qmldesigner/documentmanager.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/plugins/qmldesigner/documentmanager.cpp b/src/plugins/qmldesigner/documentmanager.cpp index af48686126..1caa8c433d 100644 --- a/src/plugins/qmldesigner/documentmanager.cpp +++ b/src/plugins/qmldesigner/documentmanager.cpp @@ -399,7 +399,7 @@ void DocumentManager::findPathToIsoProFile(bool *iconResourceFileAlreadyExists, qCDebug(documentManagerLog) << "Found" << isoIconsQrcFile << "in" << virtualFolderNode->filePath(); iconQrcFileNode = subFolderNode; - *resourceFileProPath = iconQrcFileNode->projectNode()->filePath().toString(); + *resourceFileProPath = iconQrcFileNode->parentProjectNode()->filePath().toString(); } } } @@ -416,7 +416,7 @@ void DocumentManager::findPathToIsoProFile(bool *iconResourceFileAlreadyExists, *resourceFilePath = project->projectDirectory().toString() + "/" + isoIconsQrcFile; // We assume that the .pro containing the QML file is an acceptable place to add the .qrc file. - ProjectExplorer::ProjectNode *projectNode = ProjectExplorer::SessionManager::nodeForFile(qmlFileName)->projectNode(); + ProjectExplorer::ProjectNode *projectNode = ProjectExplorer::SessionManager::nodeForFile(qmlFileName)->parentProjectNode(); *resourceFileProPath = projectNode->filePath().toString(); } else { // We found the QRC file that we want. |