summaryrefslogtreecommitdiffstats
path: root/tools/qdoc3
diff options
context:
space:
mode:
authorQt Continuous Integration System <qt-info@nokia.com>2010-02-22 22:04:17 (GMT)
committerQt Continuous Integration System <qt-info@nokia.com>2010-02-22 22:04:17 (GMT)
commitec2860d439daec21c0d5f2746c324319291f1eef (patch)
tree6d0e6519d901391b27c6ea37a898fd82d86ad5f2 /tools/qdoc3
parent69b1784edb6dd82f26100d0e539bfa8a65bdd35d (diff)
parent77b8039e9ec0e6ef90e26a1e9aaa8e76018c35b5 (diff)
downloadQt-ec2860d439daec21c0d5f2746c324319291f1eef.zip
Qt-ec2860d439daec21c0d5f2746c324319291f1eef.tar.gz
Qt-ec2860d439daec21c0d5f2746c324319291f1eef.tar.bz2
Merge branch 'qt-master-from-4.6' of scm.dev.nokia.troll.no:qt/qt-integration into master-integration
* 'qt-master-from-4.6' of scm.dev.nokia.troll.no:qt/qt-integration: Don't process uic3 subdir if qt3support is disabled. Fixed failure of tst_symbols when Qt is configured with -qtnamespace
Diffstat (limited to 'tools/qdoc3')
0 files changed, 0 insertions, 0 deletions