summaryrefslogtreecommitdiff
path: root/src/assistant
diff options
context:
space:
mode:
authorSergio Ahumada <sergio.ahumada@digia.com>2013-09-18 21:50:01 +0200
committerSergio Ahumada <sergio.ahumada@digia.com>2013-09-18 21:50:01 +0200
commit5599d85de9e69a8fdfc63da8307816438acca167 (patch)
tree0d4939a3ad6d3b743bf62e8bbbbde07a5afc0ddd /src/assistant
parent92e7bca3b352c577d211810d04f943160b0529d8 (diff)
parent1ebfb744fedf0f9168290da05932079adcc2c536 (diff)
downloadqttools-5599d85de9e69a8fdfc63da8307816438acca167.tar.gz
Merge remote-tracking branch 'origin/stable' into dev
Change-Id: I8f0a0ffd5e83828d3d0910ece4ec0485c85f2d14
Diffstat (limited to 'src/assistant')
-rw-r--r--src/assistant/assistant/centralwidget.cpp4
1 files changed, 4 insertions, 0 deletions
diff --git a/src/assistant/assistant/centralwidget.cpp b/src/assistant/assistant/centralwidget.cpp
index c3541af0f..19a388bd3 100644
--- a/src/assistant/assistant/centralwidget.cpp
+++ b/src/assistant/assistant/centralwidget.cpp
@@ -615,6 +615,7 @@ void CentralWidget::initPrinter()
void CentralWidget::connectSignals(HelpViewer *page)
{
TRACE_OBJ
+#if !defined(QT_NO_WEBKIT)
connect(page, SIGNAL(copyAvailable(bool)), this,
SIGNAL(copyAvailable(bool)));
connect(page, SIGNAL(forwardAvailable(bool)), this,
@@ -625,6 +626,9 @@ void CentralWidget::connectSignals(HelpViewer *page)
SLOT(handleSourceChanged(QUrl)));
connect(page, SIGNAL(printRequested()), this, SLOT(print()));
connect(page, SIGNAL(highlighted(QString)), this, SLOT(slotHighlighted(QString)));
+#else
+ Q_UNUSED(page)
+#endif
}
bool CentralWidget::eventFilter(QObject *object, QEvent *e)