From 1866cb339a53893792e4c3b894510feb7744324f Mon Sep 17 00:00:00 2001
From: ck <qt-info@nokia.com>
Date: Mon, 8 Mar 2010 18:01:19 +0100
Subject: Assistant: Fix compile warning for empty header.

Reviewed-by: kh1
---
 tools/assistant/tools/assistant/assistant.pro      | 16 +++++++++++-----
 tools/assistant/tools/assistant/centralwidget.cpp  |  8 ++++++--
 tools/assistant/tools/assistant/helpviewer_qtb.cpp |  6 ------
 tools/assistant/tools/assistant/helpviewer_qtb.h   |  6 ------
 tools/assistant/tools/assistant/helpviewer_qwv.cpp |  4 ----
 tools/assistant/tools/assistant/helpviewer_qwv.h   |  6 ------
 6 files changed, 17 insertions(+), 29 deletions(-)

diff --git a/tools/assistant/tools/assistant/assistant.pro b/tools/assistant/tools/assistant/assistant.pro
index ff0ecc5..bc4d495 100644
--- a/tools/assistant/tools/assistant/assistant.pro
+++ b/tools/assistant/tools/assistant/assistant.pro
@@ -30,8 +30,6 @@ HEADERS += aboutdialog.h \
     filternamedialog.h \
     helpenginewrapper.h \
     helpviewer.h \
-    helpviewer_qtb.h \
-    helpviewer_qwv.h \
     indexwindow.h \
     installdialog.h \
     mainwindow.h \
@@ -43,6 +41,11 @@ HEADERS += aboutdialog.h \
     tracer.h \
     xbelsupport.h \
     ../shared/collectionconfiguration.h
+contains(QT_CONFIG, webkit) {
+    HEADERS += helpviewer_qwv.h
+} else {
+   HEADERS += helpviewer_qtb.h
+ }
 win32:HEADERS += remotecontrol_win.h
 
 SOURCES += aboutdialog.cpp \
@@ -59,8 +62,6 @@ SOURCES += aboutdialog.cpp \
     filternamedialog.cpp \
     helpenginewrapper.cpp \
     helpviewer.cpp \
-    helpviewer_qtb.cpp \
-    helpviewer_qwv.cpp \
     indexwindow.cpp \
     installdialog.cpp \
     main.cpp \
@@ -71,7 +72,12 @@ SOURCES += aboutdialog.cpp \
     searchwidget.cpp \
     topicchooser.cpp \
     xbelsupport.cpp \
-    ../shared/collectionconfiguration.cpp \
+    ../shared/collectionconfiguration.cpp
+ contains(QT_CONFIG, webkit) {
+    SOURCES += helpviewer_qwv.cpp
+} else {
+    SOURCES += helpviewer_qtb.cpp
+}
 
 FORMS += bookmarkdialog.ui \
     bookmarkmanagerwidget.ui \
diff --git a/tools/assistant/tools/assistant/centralwidget.cpp b/tools/assistant/tools/assistant/centralwidget.cpp
index f56e9e3..2359479 100644
--- a/tools/assistant/tools/assistant/centralwidget.cpp
+++ b/tools/assistant/tools/assistant/centralwidget.cpp
@@ -43,12 +43,16 @@
 #include "centralwidget.h"
 #include "findwidget.h"
 #include "helpenginewrapper.h"
-#include "helpviewer_qtb.h"
-#include "helpviewer_qwv.h"
 #include "searchwidget.h"
 #include "mainwindow.h"
 #include "../shared/collectionconfiguration.h"
 
+#if defined(QT_NO_WEBKIT)
+#include "helpviewer_qtb.h"
+#else
+#include "helpviewer_qwv.h"
+#endif // QT_NO_WEBKIT
+
 #include <QtCore/QTimer>
 
 #include <QtGui/QApplication>
diff --git a/tools/assistant/tools/assistant/helpviewer_qtb.cpp b/tools/assistant/tools/assistant/helpviewer_qtb.cpp
index bba2850..07b89eb 100644
--- a/tools/assistant/tools/assistant/helpviewer_qtb.cpp
+++ b/tools/assistant/tools/assistant/helpviewer_qtb.cpp
@@ -40,8 +40,6 @@
 ****************************************************************************/
 #include "helpviewer_qtb.h"
 
-#if defined(QT_NO_WEBKIT)
-
 #include "centralwidget.h"
 #include "helpenginewrapper.h"
 #include "tracer.h"
@@ -287,7 +285,3 @@ bool HelpViewer::eventFilter(QObject *obj, QEvent *event)
         return true;
     return QTextBrowser::eventFilter(obj, event);
 }
-
-QT_END_NAMESPACE
-
-#endif  // QT_NO_WEBKIT
diff --git a/tools/assistant/tools/assistant/helpviewer_qtb.h b/tools/assistant/tools/assistant/helpviewer_qtb.h
index 5b38870..a05782c 100644
--- a/tools/assistant/tools/assistant/helpviewer_qtb.h
+++ b/tools/assistant/tools/assistant/helpviewer_qtb.h
@@ -41,10 +41,6 @@
 #ifndef HELPVIEWERQTB_H
 #define HELPVIEWERQTB_H
 
-#include <QtCore/qglobal.h>
-
-#if defined(QT_NO_WEBKIT)
-
 #include "helpviewer.h"
 
 #include <QtCore/QUrl>
@@ -111,6 +107,4 @@ private:
 
 QT_END_NAMESPACE
 
-#endif  // QT_NO_WEBKIT
-
 #endif  // HELPVIEWERQTB_H
diff --git a/tools/assistant/tools/assistant/helpviewer_qwv.cpp b/tools/assistant/tools/assistant/helpviewer_qwv.cpp
index a656416..582d013 100644
--- a/tools/assistant/tools/assistant/helpviewer_qwv.cpp
+++ b/tools/assistant/tools/assistant/helpviewer_qwv.cpp
@@ -41,8 +41,6 @@
 
 #include "helpviewer_qwv.h"
 
-#if !defined(QT_NO_WEBKIT)
-
 #include "centralwidget.h"
 #include "helpenginewrapper.h"
 #include "tracer.h"
@@ -385,5 +383,3 @@ void HelpViewer::setLoadFinished(bool ok)
 }
 
 QT_END_NAMESPACE
-
-#endif  // !QT_NO_WEBKIT
diff --git a/tools/assistant/tools/assistant/helpviewer_qwv.h b/tools/assistant/tools/assistant/helpviewer_qwv.h
index fbfbaac..41ee553 100644
--- a/tools/assistant/tools/assistant/helpviewer_qwv.h
+++ b/tools/assistant/tools/assistant/helpviewer_qwv.h
@@ -42,10 +42,6 @@
 #ifndef HELPVIEWERQWV_H
 #define HELPVIEWERQWV_H
 
-#include <QtCore/qglobal.h>
-
-#if !defined(QT_NO_WEBKIT)
-
 #include "helpviewer.h"
 
 #include <QtGui/QAction>
@@ -120,6 +116,4 @@ private:
 
 QT_END_NAMESPACE
 
-#endif  // !QT_NO_WEBKIT
-
 #endif  // HELPVIEWERQWV_H
-- 
cgit v0.12