diff options
| author | hjk <hjk121@nokiamail.com> | 2014-01-13 16:17:34 +0100 |
|---|---|---|
| committer | Eike Ziller <eike.ziller@digia.com> | 2014-01-14 07:43:00 +0100 |
| commit | 4d96fa7aba7be35800d61d8bed89d3f6c3ef9329 (patch) | |
| tree | c9b102981cf81023e1488224a24758af18aa064e /src/plugins/resourceeditor | |
| parent | 8b854270a6c214479b2cdf302072a3e74fa854da (diff) | |
Core: Merge Find and Locator into Core plugin
Change-Id: I7053310272235d854c9f409670ff52a10a7add8b
Reviewed-by: Christian Kandeler <christian.kandeler@digia.com>
Reviewed-by: Orgad Shaneh <orgads@gmail.com>
Reviewed-by: Eike Ziller <eike.ziller@digia.com>
Diffstat (limited to 'src/plugins/resourceeditor')
| -rw-r--r-- | src/plugins/resourceeditor/resourceeditor.qbs | 1 | ||||
| -rw-r--r-- | src/plugins/resourceeditor/resourceeditor_dependencies.pri | 1 | ||||
| -rw-r--r-- | src/plugins/resourceeditor/resourceeditorw.cpp | 4 |
3 files changed, 2 insertions, 4 deletions
diff --git a/src/plugins/resourceeditor/resourceeditor.qbs b/src/plugins/resourceeditor/resourceeditor.qbs index bac08834000..193c9b75133 100644 --- a/src/plugins/resourceeditor/resourceeditor.qbs +++ b/src/plugins/resourceeditor/resourceeditor.qbs @@ -6,7 +6,6 @@ QtcPlugin { name: "ResourceEditor" Depends { name: "Core" } - Depends { name: "Find" } Depends { name: "Qt"; submodules: ["widgets", "xml"] } Group { diff --git a/src/plugins/resourceeditor/resourceeditor_dependencies.pri b/src/plugins/resourceeditor/resourceeditor_dependencies.pri index 753971d6dbe..8a82e801cfc 100644 --- a/src/plugins/resourceeditor/resourceeditor_dependencies.pri +++ b/src/plugins/resourceeditor/resourceeditor_dependencies.pri @@ -3,4 +3,3 @@ QTC_LIB_DEPENDS += \ utils QTC_PLUGIN_DEPENDS += \ coreplugin \ - find diff --git a/src/plugins/resourceeditor/resourceeditorw.cpp b/src/plugins/resourceeditor/resourceeditorw.cpp index ada5cdc8f24..36ce8a14a1f 100644 --- a/src/plugins/resourceeditor/resourceeditorw.cpp +++ b/src/plugins/resourceeditor/resourceeditorw.cpp @@ -39,7 +39,7 @@ #include <coreplugin/actionmanager/commandbutton.h> #include <coreplugin/editormanager/editormanager.h> #include <coreplugin/documentmanager.h> -#include <find/treeviewfind.h> +#include <coreplugin/find/treeviewfind.h> #include <utils/reloadpromptutils.h> #include <utils/fileutils.h> @@ -97,7 +97,7 @@ ResourceEditorW::ResourceEditorW(const Core::Context &context, Aggregation::Aggregate * agg = new Aggregation::Aggregate; agg->add(m_resourceEditor->treeView()); - agg->add(new Find::TreeViewFind(m_resourceEditor->treeView())); + agg->add(new Core::TreeViewFind(m_resourceEditor->treeView())); m_resourceEditor->setResourceDragEnabled(true); m_contextMenu->addAction(tr("Open File"), this, SLOT(openCurrentFile())); |