summaryrefslogtreecommitdiffstats
path: root/tools/assistant/tools/assistant/installdialog.cpp
diff options
context:
space:
mode:
authorWarwick Allison <warwick.allison@nokia.com>2009-08-11 08:45:54 +1000
committerWarwick Allison <warwick.allison@nokia.com>2009-08-11 08:45:54 +1000
commit6bb93ab2fd79ae0a04c826d9027503b644b6e374 (patch)
tree060d9765cf3f009c86fe6e421dac4ea8930d076e /tools/assistant/tools/assistant/installdialog.cpp
parent40db84c97769141f3f2351de1b2d5c64904fe5c2 (diff)
parent6c3c9d812a730d5bc1bcd6261befe077a65be594 (diff)
Merge branch 'master' of git@scm.dev.nokia.troll.no:qt/qt
Diffstat (limited to 'tools/assistant/tools/assistant/installdialog.cpp')
-rw-r--r--tools/assistant/tools/assistant/installdialog.cpp2
1 files changed, 2 insertions, 0 deletions
diff --git a/tools/assistant/tools/assistant/installdialog.cpp b/tools/assistant/tools/assistant/installdialog.cpp
index 5a8dfeaf8..2574f1f8b 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