diff options
| author | Thiago Macieira <thiago.macieira@nokia.com> | 2010-02-17 14:24:33 (GMT) |
|---|---|---|
| committer | Thiago Macieira <thiago.macieira@nokia.com> | 2010-02-17 14:38:02 (GMT) |
| commit | bcb4e290959da6e1790551f67de00ba78ac2f791 (patch) | |
| tree | d41d83f691a32985f9bc87e00fab370fdbe32c75 | |
| parent | 39534745d6c274c2588fd7ce396da2f38415bd86 (diff) | |
| download | Qt-bcb4e290959da6e1790551f67de00ba78ac2f791.zip Qt-bcb4e290959da6e1790551f67de00ba78ac2f791.tar.gz Qt-bcb4e290959da6e1790551f67de00ba78ac2f791.tar.bz2 | |
Fix compilation of Qt Assistant when WebKit isn't built.
You need to ensure qconfig.h is included before you can check if
QT_NO_WEBKIT is defined.
Reviewed-by: kh1 <qt-info@nokia.com>
4 files changed, 10 insertions, 4 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..9a9a8fd 100644 --- a/tools/assistant/tools/assistant/helpviewer_qtb.h +++ b/tools/assistant/tools/assistant/helpviewer_qtb.h @@ -38,6 +38,9 @@ ** $QT_END_LICENSE$ ** ****************************************************************************/ + +#include <QtCore/qglobal.h> + #if defined(QT_NO_WEBKIT) #ifndef HELPVIEWERQTB_H diff --git a/tools/assistant/tools/assistant/helpviewer_qwv.cpp b/tools/assistant/tools/assistant/helpviewer_qwv.cpp index 4857e00..eec5a35 100644 --- a/tools/assistant/tools/assistant/helpviewer_qwv.cpp +++ b/tools/assistant/tools/assistant/helpviewer_qwv.cpp @@ -38,10 +38,10 @@ ** $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..f326f8a 100644 --- a/tools/assistant/tools/assistant/helpviewer_qwv.h +++ b/tools/assistant/tools/assistant/helpviewer_qwv.h @@ -38,6 +38,9 @@ ** $QT_END_LICENSE$ ** ****************************************************************************/ + +#include <QtCore/qglobal.h> + #if !defined(QT_NO_WEBKIT) #ifndef HELPVIEWERQWV_H |