summaryrefslogtreecommitdiffstats
path: root/tools/designer
diff options
context:
space:
mode:
authorQt Continuous Integration System <qt-info@nokia.com>2011-02-10 06:17:37 (GMT)
committerQt Continuous Integration System <qt-info@nokia.com>2011-02-10 06:17:37 (GMT)
commitabb425e3db6c20c5271788cb1ec4e1fe37b9ea5b (patch)
tree86b68eb00cd024dc7e6293dcf8329f300c83af48 /tools/designer
parentfd3b8a0e008dd00e363ac173a2cfcabcab31c454 (diff)
parent27b71c5b0b432235da1931ae830e9ad52ee450e7 (diff)
downloadQt-abb425e3db6c20c5271788cb1ec4e1fe37b9ea5b.zip
Qt-abb425e3db6c20c5271788cb1ec4e1fe37b9ea5b.tar.gz
Qt-abb425e3db6c20c5271788cb1ec4e1fe37b9ea5b.tar.bz2
Merge branch 'qt-master-from-4.7' of scm.dev.nokia.troll.no:qt/qt-integration into master-integration
* 'qt-master-from-4.7' of scm.dev.nokia.troll.no:qt/qt-integration: (182 commits) Fixes XPASS Revert part of commit 7c1ab9b6a8 Fixed wrong casing of a Symbian library. Fixed wrong static library extension on Symbian. Fixed library casing. Remove dependencies to pre-Symbian3 platforms from Symbian3 packages My changes 4.7.2 Don't accept input methods when a TextEdit or TextInput is read only. Correct error message On windows xp using a higher port makes the declarativedebug* tests work Correct assert Fix qt.sis platform dependencies for Symbian^3 builds. Fix few QFileDialog static method issues in Symbian^3 Update QDeclarative DEF files for Symbian Export QDeclarativeRefCount so that symbian compiles. Make Flickable's wheel handling more like QAbstractScrollArea. Changing header or footer failed to delete the previous. Avoid index-out-of bounds related crash in Grid Move Qt.application docs into Qt global object page Add initial size to ListView in FolderListModel example ...
Diffstat (limited to 'tools/designer')
0 files changed, 0 insertions, 0 deletions