summaryrefslogtreecommitdiffstats
path: root/tools/assistant
diff options
context:
space:
mode:
authorQt Continuous Integration System <qt-info@nokia.com>2010-02-23 06:43:41 (GMT)
committerQt Continuous Integration System <qt-info@nokia.com>2010-02-23 06:43:41 (GMT)
commit3db40b0be40c946f547f238ed3f0af813892115e (patch)
treeced28fa59d5d99e26635776264d7dfef28c395b6 /tools/assistant
parent127df63bbce367e7e2d77ae9f219feb5a4a2560e (diff)
parent57cc5c50df4fc3673c948e8a55b4bab991e9cb7f (diff)
downloadQt-3db40b0be40c946f547f238ed3f0af813892115e.zip
Qt-3db40b0be40c946f547f238ed3f0af813892115e.tar.gz
Qt-3db40b0be40c946f547f238ed3f0af813892115e.tar.bz2
Merge branch 'master' of scm.dev.nokia.troll.no:qt/berlin-staging-1 into master-integration
* 'master' of scm.dev.nokia.troll.no:qt/berlin-staging-1: clean up x11 desktop detection avoid double reallocations in inserting operations create temporaries more intelligently do not protect against self-assignment in QList::replace() make queues to which only lists are appended not blow the memory optimize queue-like structures remove more pointless recalculations Fix compilation with namespace. Fix compilation with namespace.
Diffstat (limited to 'tools/assistant')
0 files changed, 0 insertions, 0 deletions