diff options
| author | Rhys Weatherley <rhys.weatherley@nokia.com> | 2010-02-17 23:04:53 (GMT) |
|---|---|---|
| committer | Rhys Weatherley <rhys.weatherley@nokia.com> | 2010-02-17 23:04:53 (GMT) |
| commit | 6661bde48360816df052bb179e11c87ad1d99f90 (patch) | |
| tree | 902a963dd777790b9fbd9b7384bb790e4e503f25 /tools/assistant | |
| parent | 60f3e3abbb9bfd61448a761701159cf880e66c19 (diff) | |
| download | Qt-6661bde48360816df052bb179e11c87ad1d99f90.zip Qt-6661bde48360816df052bb179e11c87ad1d99f90.tar.gz Qt-6661bde48360816df052bb179e11c87ad1d99f90.tar.bz2 | |
Fix no-webkit compiler helpviewer
QT_NO_WEBKIT is not defined until qglobal.h has been included.
Reviewed-by: Daniel Pope
Diffstat (limited to 'tools/assistant')
4 files changed, 16 insertions, 10 deletions
diff --git a/tools/assistant/tools/assistant/helpviewer_qtb.cpp b/tools/assistant/tools/assistant/helpviewer_qtb.cpp index 3aafe67..1e439dc 100644 --- a/tools/assistant/tools/assistant/helpviewer_qtb.cpp +++ b/tools/assistant/tools/assistant/helpviewer_qtb.cpp @@ -38,11 +38,11 @@ ** $QT_END_LICENSE$ ** ****************************************************************************/ -#if defined(QT_NO_WEBKIT) - #include "helpviewer_qtb.h" #include "helpviewer_qwv.h" +#if defined(QT_NO_WEBKIT) + #include "centralwidget.h" #include "helpenginewrapper.h" #include "tracer.h" diff --git a/tools/assistant/tools/assistant/helpviewer_qtb.h b/tools/assistant/tools/assistant/helpviewer_qtb.h index e927b34..2d29774 100644 --- a/tools/assistant/tools/assistant/helpviewer_qtb.h +++ b/tools/assistant/tools/assistant/helpviewer_qtb.h @@ -38,11 +38,13 @@ ** $QT_END_LICENSE$ ** ****************************************************************************/ -#if defined(QT_NO_WEBKIT) - #ifndef HELPVIEWERQTB_H #define HELPVIEWERQTB_H +#include <QtCore/qglobal.h> + +#if defined(QT_NO_WEBKIT) + #include "helpviewer.h" #include <QtCore/QUrl> @@ -111,6 +113,6 @@ private: QT_END_NAMESPACE -#endif // HELPVIEWERQTB_H - #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 4857e00..e302b5e 100644 --- a/tools/assistant/tools/assistant/helpviewer_qwv.cpp +++ b/tools/assistant/tools/assistant/helpviewer_qwv.cpp @@ -38,10 +38,11 @@ ** $QT_END_LICENSE$ ** ****************************************************************************/ -#if !defined(QT_NO_WEBKIT) #include "helpviewer_qwv.h" +#if !defined(QT_NO_WEBKIT) + #include "centralwidget.h" #include "helpenginewrapper.h" #include "tracer.h" diff --git a/tools/assistant/tools/assistant/helpviewer_qwv.h b/tools/assistant/tools/assistant/helpviewer_qwv.h index 3f2e537..fbfbaac 100644 --- a/tools/assistant/tools/assistant/helpviewer_qwv.h +++ b/tools/assistant/tools/assistant/helpviewer_qwv.h @@ -38,11 +38,14 @@ ** $QT_END_LICENSE$ ** ****************************************************************************/ -#if !defined(QT_NO_WEBKIT) #ifndef HELPVIEWERQWV_H #define HELPVIEWERQWV_H +#include <QtCore/qglobal.h> + +#if !defined(QT_NO_WEBKIT) + #include "helpviewer.h" #include <QtGui/QAction> @@ -117,6 +120,6 @@ private: QT_END_NAMESPACE -#endif // HELPVIEWERQWV_H - #endif // !QT_NO_WEBKIT + +#endif // HELPVIEWERQWV_H |