diff --git a/src/plugins/resourceeditor/ResourceEditor.pluginspec.in b/src/plugins/resourceeditor/ResourceEditor.pluginspec.in index 2abf009e694..cffbc161230 100644 --- a/src/plugins/resourceeditor/ResourceEditor.pluginspec.in +++ b/src/plugins/resourceeditor/ResourceEditor.pluginspec.in @@ -15,5 +15,6 @@ Alternatively, this plugin may be used under the terms of the GNU Lesser General http://qt.nokia.com + diff --git a/src/plugins/resourceeditor/resourceeditor.pro b/src/plugins/resourceeditor/resourceeditor.pro index 9ae137fb29d..e6054b137c2 100644 --- a/src/plugins/resourceeditor/resourceeditor.pro +++ b/src/plugins/resourceeditor/resourceeditor.pro @@ -6,6 +6,7 @@ DEFINES += QT_NO_CAST_FROM_ASCII include(../../qtcreatorplugin.pri) include(../../libs/utils/utils.pri) include(../../plugins/coreplugin/coreplugin.pri) +include(../../plugins/find/find.pri) include(../../shared/qrceditor/qrceditor.pri) INCLUDEPATH += $$PWD/../../tools/utils diff --git a/src/plugins/resourceeditor/resourceeditorw.cpp b/src/plugins/resourceeditor/resourceeditorw.cpp index 33ded8d76bc..8ba3a2590ea 100644 --- a/src/plugins/resourceeditor/resourceeditorw.cpp +++ b/src/plugins/resourceeditor/resourceeditorw.cpp @@ -36,9 +36,11 @@ #include +#include #include #include #include +#include #include #include @@ -85,6 +87,10 @@ ResourceEditorW::ResourceEditorW(const Core::Context &context, setContext(context); setWidget(m_resourceEditor); + Aggregation::Aggregate * agg = new Aggregation::Aggregate; + agg->add(m_resourceEditor->treeView()); + agg->add(new Find::TreeViewFind(m_resourceEditor->treeView())); + m_resourceEditor->setResourceDragEnabled(true); m_openWithMenu = m_contextMenu->addMenu(tr("Open With")); // Below we need QueuedConnection because otherwise, if this qrc file diff --git a/src/shared/qrceditor/qrceditor.h b/src/shared/qrceditor/qrceditor.h index 1804a388db1..45d02966a61 100644 --- a/src/shared/qrceditor/qrceditor.h +++ b/src/shared/qrceditor/qrceditor.h @@ -50,6 +50,7 @@ public: bool load(const QString &fileName); bool save(); + QTreeView *treeView() { return m_treeview; } QString errorMessage() const { return m_treeview->errorMessage(); } bool isDirty();