From fae2cb49821170581be5d8ea3967bc8a0cc861f8 Mon Sep 17 00:00:00 2001
From: Friedemann Kleint <qtc-committer@nokia.com>
Date: Wed, 18 Mar 2009 10:36:10 +0100
Subject: [PATCH] Fixed: Compile without WebKit RevBy: con
---
src/plugins/help/helpfindsupport.cpp | 12 ++++++++----
1 file changed, 8 insertions(+), 4 deletions(-)
diff --git a/src/plugins/help/helpfindsupport.cpp b/src/plugins/help/helpfindsupport.cpp
index 0f28634ad39..0f2b9cf887f 100644
--- a/src/plugins/help/helpfindsupport.cpp
+++ b/src/plugins/help/helpfindsupport.cpp
@@ -87,7 +87,11 @@ HelpViewerFindSupport::HelpViewerFindSupport(HelpViewer *viewer)
QString HelpViewerFindSupport::currentFindString() const
{
QTC_ASSERT(m_viewer, return QString());
+#if !defined(QT_NO_WEBKIT)
return m_viewer->selectedText();
+#else
+ return QString();
+#endif
}
bool HelpViewerFindSupport::findIncremental(const QString &txt, QTextDocument::FindFlags findFlags)
@@ -116,9 +120,9 @@ bool HelpViewerFindSupport::find(const QString &txt, QTextDocument::FindFlags fi
return m_viewer->findText(txt, options);
#else
- QTextCursor cursor = viewer->textCursor();
- QTextDocument *doc = viewer->document();
- QTextBrowser *browser = qobject_cast<QTextBrowser*>(viewer);
+ QTextCursor cursor = m_viewer->textCursor();
+ QTextDocument *doc = m_viewer->document();
+ QTextBrowser *browser = qobject_cast<QTextBrowser*>(m_viewer);
if (!browser || !doc || cursor.isNull())
return false;
@@ -137,7 +141,7 @@ bool HelpViewerFindSupport::find(const QString &txt, QTextDocument::FindFlags fi
}
}
if (!found.isNull()) {
- viewer->setTextCursor(found);
+ m_viewer->setTextCursor(found);
}
return true;
#endif
--
GitLab