summaryrefslogtreecommitdiffstats
path: root/tools
diff options
context:
space:
mode:
authorQt Continuous Integration System <qt-info@nokia.com>2011-09-05 23:58:29 (GMT)
committerQt Continuous Integration System <qt-info@nokia.com>2011-09-05 23:58:29 (GMT)
commit5b66d6bc87ba197cdb14804dbff5f04a26270a11 (patch)
tree722658d31418bd83b8544d25ddbcc4b9add2a3d4 /tools
parent22d8ae9214f1ca094606ef3b34289b72ae00d0d8 (diff)
parent02f55668dada4a23ab84e4d3bda1df8a4984b3ae (diff)
downloadQt-5b66d6bc87ba197cdb14804dbff5f04a26270a11.zip
Qt-5b66d6bc87ba197cdb14804dbff5f04a26270a11.tar.gz
Qt-5b66d6bc87ba197cdb14804dbff5f04a26270a11.tar.bz2
Merge branch 'master' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into master-integration
* 'master' of scm.dev.nokia.troll.no:qt/oslo-staging-1: Removed the unnecessary dependency of the QtHelp module on the QtXml one
Diffstat (limited to 'tools')
-rw-r--r--tools/assistant/lib/lib.pro1
1 files changed, 0 insertions, 1 deletions
diff --git a/tools/assistant/lib/lib.pro b/tools/assistant/lib/lib.pro
index 03821b2..d6c3fce 100644
--- a/tools/assistant/lib/lib.pro
+++ b/tools/assistant/lib/lib.pro
@@ -1,5 +1,4 @@
QT += sql \
- xml \
network
TEMPLATE = lib
TARGET = QtHelp