summaryrefslogtreecommitdiffstats
path: root/src/tools
diff options
context:
space:
mode:
authorQt Continuous Integration System <qt-info@nokia.com>2010-07-02 10:30:27 (GMT)
committerQt Continuous Integration System <qt-info@nokia.com>2010-07-02 10:30:27 (GMT)
commite720c269b5f98da6c2b430df84cd86c3aede3d81 (patch)
treeb0fd1ade00e94b7018b5cf777c555dd292f937df /src/tools
parent1636e03a2fda5108cb4389689a327e65c47dfe0e (diff)
parentdc80d7886d1fea853a6a0bdd0960d619cb6fff07 (diff)
downloadQt-e720c269b5f98da6c2b430df84cd86c3aede3d81.zip
Qt-e720c269b5f98da6c2b430df84cd86c3aede3d81.tar.gz
Qt-e720c269b5f98da6c2b430df84cd86c3aede3d81.tar.bz2
Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.7-integration
* '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1: qdoc: Fixed spacing before "default" and "read-only". Designer: Fix compiler warnings. Fix compiler warning. Abort if connection to DBus cannot be established.
Diffstat (limited to 'src/tools')
0 files changed, 0 insertions, 0 deletions