summaryrefslogtreecommitdiffstats
path: root/src/gui/kernel
diff options
context:
space:
mode:
authorQt Continuous Integration System <qt-info@nokia.com>2010-02-23 04:16:19 (GMT)
committerQt Continuous Integration System <qt-info@nokia.com>2010-02-23 04:16:19 (GMT)
commit127df63bbce367e7e2d77ae9f219feb5a4a2560e (patch)
tree54b0b449d40313b6a710f638f0867e433391e133 /src/gui/kernel
parent39d728dd76efa10ca297b76ed08a5cd1c0235b3f (diff)
parentec2860d439daec21c0d5f2746c324319291f1eef (diff)
downloadQt-127df63bbce367e7e2d77ae9f219feb5a4a2560e.zip
Qt-127df63bbce367e7e2d77ae9f219feb5a4a2560e.tar.gz
Qt-127df63bbce367e7e2d77ae9f219feb5a4a2560e.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 'src/gui/kernel')
0 files changed, 0 insertions, 0 deletions