summaryrefslogtreecommitdiffstats
path: root/src/src.pro
diff options
context:
space:
mode:
authorQt Continuous Integration System <qt-info@nokia.com>2010-07-03 00:31:19 (GMT)
committerQt Continuous Integration System <qt-info@nokia.com>2010-07-03 00:31:19 (GMT)
commit80de59a2f0289d3f7bbef405ed2175a64faabc96 (patch)
tree0b47e64e30a277ffe40698405776e591280e9087 /src/src.pro
parent8c01157a9056f91d40d3579bfc0eb9b81a5f99d8 (diff)
parentac52dee57e4417ebd6f6049cfb7998fe9d62e8db (diff)
downloadQt-80de59a2f0289d3f7bbef405ed2175a64faabc96.zip
Qt-80de59a2f0289d3f7bbef405ed2175a64faabc96.tar.gz
Qt-80de59a2f0289d3f7bbef405ed2175a64faabc96.tar.bz2
Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7-integration
* '4.7' of scm.dev.nokia.troll.no:qt/qt-qml: Don't write to the logger widget while the application is closing down. Fix exponential behavior of QTextCursor::removeSelectedText Fix test for N900 (ARM-specific SVG results). docs - fix doc links, minor improvements Fix TextEdit bitmap tests testing the wrong element Make autotests work with qreal == float (in addition to double). Fix TextInput text getting improperly clipped fix doc links Fix docs to link to the new QML Viewer page instead of the Runtime page qmlviewer: Update the proxy factory when the user changes the proxy. Don't accept *files* that exist when *directory* is required.
Diffstat (limited to 'src/src.pro')
0 files changed, 0 insertions, 0 deletions