diff options
| author | Markus Goetz <Markus.Goetz@nokia.com> | 2009-08-05 08:57:13 (GMT) |
|---|---|---|
| committer | Markus Goetz <Markus.Goetz@nokia.com> | 2009-08-05 10:20:23 (GMT) |
| commit | 5f52d473eec0f1b46200b06dd7f5e16cb5c57c05 (patch) | |
| tree | 457d8aac9da14afe76f9f3bf0d5dc186aeb62259 /tools | |
| parent | 118c82b0988c671045de448ffabc7ba95f015a69 (diff) | |
| download | Qt-5f52d473eec0f1b46200b06dd7f5e16cb5c57c05.zip Qt-5f52d473eec0f1b46200b06dd7f5e16cb5c57c05.tar.gz Qt-5f52d473eec0f1b46200b06dd7f5e16cb5c57c05.tar.bz2 | |
Fix compilation when QT_NO_HTTP is defined
Note however you still need to -nomake examples -nomake demos
when configuring Qt.
Reviewed-by: Thiago
Task: 259179
Diffstat (limited to 'tools')
| -rw-r--r-- | tools/assistant/tools/assistant/installdialog.cpp | 2 | ||||
| -rw-r--r-- | tools/assistant/tools/assistant/installdialog.h | 4 |
2 files changed, 6 insertions, 0 deletions
diff --git a/tools/assistant/tools/assistant/installdialog.cpp b/tools/assistant/tools/assistant/installdialog.cpp index 5a8dfea..2574f1f 100644 --- a/tools/assistant/tools/assistant/installdialog.cpp +++ b/tools/assistant/tools/assistant/installdialog.cpp @@ -56,6 +56,7 @@ #include <QtNetwork/QHttp> QT_BEGIN_NAMESPACE +#ifndef QT_NO_HTTP #define QCH_FILENAME 92943 #define QCH_NAMESPACE 92944 @@ -335,4 +336,5 @@ void InstallDialog::browseDirectories() m_ui.pathLineEdit->setText(dir); } +#endif QT_END_NAMESPACE diff --git a/tools/assistant/tools/assistant/installdialog.h b/tools/assistant/tools/assistant/installdialog.h index 62759ec..9e18a22b9 100644 --- a/tools/assistant/tools/assistant/installdialog.h +++ b/tools/assistant/tools/assistant/installdialog.h @@ -47,6 +47,8 @@ #include <QtNetwork/QHttpResponseHeader> #include "ui_installdialog.h" +#ifndef QT_NO_HTTP + QT_BEGIN_NAMESPACE class QHttp; @@ -98,4 +100,6 @@ private: QT_END_NAMESPACE +#endif + #endif // INSTALLDIALOG_H |