From b2e6ded26156fbae75c0953d55fb71b09c0e38c9 Mon Sep 17 00:00:00 2001
From: Daniel Teske <daniel.teske@digia.com>
Date: Thu, 27 Mar 2014 18:20:34 +0100
Subject: [PATCH] DesignerIntegration: Fix listing of resources
Task-number: QTCREATORBUG-11878
Change-Id: I01649e2a9063ce569a39c08bf92d733c890db20d
Reviewed-by: Friedemann Kleint <Friedemann.Kleint@digia.com>
---
src/plugins/designer/designer_dependencies.pri | 1 +
src/plugins/designer/resourcehandler.cpp | 3 +++
2 files changed, 4 insertions(+)
diff --git a/src/plugins/designer/designer_dependencies.pri b/src/plugins/designer/designer_dependencies.pri
index fb76a7eb50b..b4bb0d46b47 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 7c331f61925..e131fc88a78 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
--
GitLab