Move advanced search dialog into search result pane.

And move the cancel button into the specific search result widget.

Change-Id: Ide8173e1ec5de091e1c1332a2b0c47d9a30a4c87
Reviewed-on: http://codereview.qt-project.org/4555
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Leandro T. C. Melo <leandro.melo@nokia.com>
Reviewed-by: Eike Ziller <eike.ziller@nokia.com>

src/plugins/texteditor/basefilefind.cpp

@@ -83,11 +83,6 @@ bool BaseFileFind::isEnabled() const
     return !m_isSearching;
 }
 
-bool BaseFileFind::canCancel() const
-{
-    return m_isSearching;
-}
-
 void BaseFileFind::cancel()
 {
     m_watcher.cancel();
@@ -143,6 +138,7 @@ void BaseFileFind::runNewSearch(const QString &txt, Find::FindFlags findFlags,
         m_watcher.setFuture(Utils::findInFiles(txt, files(),
             textDocumentFlagsForFindFlags(findFlags), ITextEditor::openedTextEditorsContents()));
     }
+    connect(m_currentSearch, SIGNAL(cancelled()), this, SLOT(cancel()));
     Core::FutureProgress *progress =
         Core::ICore::instance()->progressManager()->addTask(m_watcher.future(),
                                                                         tr("Search"),