summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDaniel Teske <daniel.teske@digia.com>2014-03-27 18:20:34 +0100
committerDaniel Teske <daniel.teske@digia.com>2014-03-28 10:53:14 +0100
commitb2e6ded26156fbae75c0953d55fb71b09c0e38c9 (patch)
tree2f106c60a76cb8a10935dfee1aa56d12e7c9a94f
parent05339a53e9be8ed1e44782d6b8f67bdb930e601f (diff)
downloadqt-creator-b2e6ded26156fbae75c0953d55fb71b09c0e38c9.tar.gz
DesignerIntegration: Fix listing of resources
Task-number: QTCREATORBUG-11878 Change-Id: I01649e2a9063ce569a39c08bf92d733c890db20d Reviewed-by: Friedemann Kleint <Friedemann.Kleint@digia.com>
-rw-r--r--src/plugins/designer/designer_dependencies.pri1
-rw-r--r--src/plugins/designer/resourcehandler.cpp3
2 files changed, 4 insertions, 0 deletions
diff --git a/src/plugins/designer/designer_dependencies.pri b/src/plugins/designer/designer_dependencies.pri
index fb76a7eb50..b4bb0d46b4 100644
--- a/src/plugins/designer/designer_dependencies.pri
+++ b/src/plugins/designer/designer_dependencies.pri
@@ -4,6 +4,7 @@ QTC_LIB_DEPENDS += \
extensionsystem \
utils
QTC_PLUGIN_DEPENDS += \
+ resourceeditor\
cpptools \
projectexplorer \
texteditor \
diff --git a/src/plugins/designer/resourcehandler.cpp b/src/plugins/designer/resourcehandler.cpp
index 7c331f6192..e131fc88a7 100644
--- a/src/plugins/designer/resourcehandler.cpp
+++ b/src/plugins/designer/resourcehandler.cpp
@@ -35,6 +35,7 @@
#include <projectexplorer/nodesvisitor.h>
#include <projectexplorer/project.h>
#include <projectexplorer/session.h>
+#include <resourceeditor/resourcenode.h>
#if QT_VERSION >= 0x050000
# include <QDesignerFormWindowInterface>
@@ -78,6 +79,8 @@ void QrcFilesVisitor::visitFolderNode(FolderNode *folderNode)
if (fileNode->fileType() == ProjectExplorer::ResourceType)
m_qrcFiles.append(fileNode->path());
}
+ if (qobject_cast<ResourceEditor::ResourceTopLevelNode *>(folderNode))
+ m_qrcFiles.append(folderNode->path());
}
// ------------ ResourceHandler