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 /tests | |
| parent | 8b854270a6c214479b2cdf302072a3e74fa854da (diff) | |
| download | qt-creator-4d96fa7aba7be35800d61d8bed89d3f6c3ef9329.tar.gz | |
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 'tests')
| -rw-r--r-- | tests/auto/treeviewfind/treeviewfind.pro | 2 | ||||
| -rw-r--r-- | tests/auto/treeviewfind/treeviewfind.qbs | 2 | ||||
| -rw-r--r-- | tests/auto/treeviewfind/tst_treeviewfind.cpp | 16 |
3 files changed, 10 insertions, 10 deletions
diff --git a/tests/auto/treeviewfind/treeviewfind.pro b/tests/auto/treeviewfind/treeviewfind.pro index f2f6250a15..ee516384cb 100644 --- a/tests/auto/treeviewfind/treeviewfind.pro +++ b/tests/auto/treeviewfind/treeviewfind.pro @@ -1,4 +1,4 @@ -QTC_PLUGIN_DEPENDS += find +QTC_PLUGIN_DEPENDS += core include(../qttest.pri) LIBS *= -L$$IDE_PLUGIN_PATH/QtProject diff --git a/tests/auto/treeviewfind/treeviewfind.qbs b/tests/auto/treeviewfind/treeviewfind.qbs index ec1b77de39..915e6671d0 100644 --- a/tests/auto/treeviewfind/treeviewfind.qbs +++ b/tests/auto/treeviewfind/treeviewfind.qbs @@ -3,7 +3,7 @@ import "../autotest.qbs" as Autotest Autotest { name: "TreeViewFind autotest" - Depends { name: "Find" } + Depends { name: "Core" } Depends { name: "Qt.widgets" } // For QTextDocument files: "tst_treeviewfind.cpp" } diff --git a/tests/auto/treeviewfind/tst_treeviewfind.cpp b/tests/auto/treeviewfind/tst_treeviewfind.cpp index a684e9a7ca..5a9045d14b 100644 --- a/tests/auto/treeviewfind/tst_treeviewfind.cpp +++ b/tests/auto/treeviewfind/tst_treeviewfind.cpp @@ -27,7 +27,7 @@ ** ****************************************************************************/ -#include <find/treeviewfind.h> +#include <coreplugin/find/treeviewfind.h> #include <QtTest> @@ -69,7 +69,7 @@ void tst_treeviewfind::wrapping() tree->addTopLevelItems(toplevelitems); // set up - Find::TreeViewFind *findSupport = new Find::TreeViewFind(tree); + Core::TreeViewFind *findSupport = new Core::TreeViewFind(tree); tree->setCurrentItem(toplevelitems.at(2)->child(0)); QCOMPARE(tree->currentItem()->text(0), QString::fromLatin1("FOO2")); @@ -80,7 +80,7 @@ void tst_treeviewfind::wrapping() // backward tree->setCurrentItem(toplevelitems.at(0)->child(0)); QCOMPARE(tree->currentItem()->text(0), QString::fromLatin1("FOO1")); - findSupport->findStep(QLatin1String("FOO"), Find::FindBackward); + findSupport->findStep(QLatin1String("FOO"), Core::FindBackward); QCOMPARE(tree->currentItem(), toplevelitems.at(2)->child(0)); // clean up @@ -114,7 +114,7 @@ void tst_treeviewfind::columns() tree->addTopLevelItems(toplevelitems); // set up - Find::TreeViewFind *findSupport = new Find::TreeViewFind(tree); + Core::TreeViewFind *findSupport = new Core::TreeViewFind(tree); tree->setCurrentItem(toplevelitems.at(0)); QCOMPARE(tree->currentItem()->text(0), QString::fromLatin1("HEADER1")); @@ -137,13 +137,13 @@ void tst_treeviewfind::columns() // backwards tree->setCurrentItem(toplevelitems.at(2)->child(0)); QCOMPARE(tree->currentItem()->text(0), QString::fromLatin1("A")); - findSupport->findStep(QLatin1String("FOO"), Find::FindBackward); + findSupport->findStep(QLatin1String("FOO"), Core::FindBackward); QCOMPARE(tree->currentItem(), toplevelitems.at(1)->child(0)); - findSupport->findStep(QLatin1String("FOO"), Find::FindBackward); + findSupport->findStep(QLatin1String("FOO"), Core::FindBackward); QCOMPARE(tree->currentItem(), toplevelitems.at(1)); - findSupport->findStep(QLatin1String("FOO"), Find::FindBackward); + findSupport->findStep(QLatin1String("FOO"), Core::FindBackward); QCOMPARE(tree->currentItem(), toplevelitems.at(0)->child(0)); - findSupport->findStep(QLatin1String("FOO"), Find::FindBackward); + findSupport->findStep(QLatin1String("FOO"), Core::FindBackward); QCOMPARE(tree->currentItem(), toplevelitems.at(2)->child(0)); // clean up |