summaryrefslogtreecommitdiffstats
path: root/tests/auto/qscriptjstestsuite/qscriptjstestsuite.pro
diff options
context:
space:
mode:
authorQt Continuous Integration System <qt-info@nokia.com>2011-03-08 21:41:58 (GMT)
committerQt Continuous Integration System <qt-info@nokia.com>2011-03-08 21:41:58 (GMT)
commit5ddf54654044df30bf4febada6cbdc46fcdbde62 (patch)
tree6fa945056c0deb3d5d303e8f5c4e996d66a9608a /tests/auto/qscriptjstestsuite/qscriptjstestsuite.pro
parent3fde625831df6970ff2ad1e58b374541d46dfa97 (diff)
parent1e9b107b082282d4aadcffedcd67cb7e5e56aef8 (diff)
downloadQt-5ddf54654044df30bf4febada6cbdc46fcdbde62.zip
Qt-5ddf54654044df30bf4febada6cbdc46fcdbde62.tar.gz
Qt-5ddf54654044df30bf4febada6cbdc46fcdbde62.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: Invalidate the EGL surface of QMeeGoLivePixmapData when switching to Raster PinchArea example produced incorrect scaling. Added image conversion flag to prevent conversions. Fix TextInput auto test failure on mac. Fix word selection locking on string boundaries. Fix potential crash in QTextControl. QDeclarativePropertyMap::keys() cannot be called from qml Compensate for horizontal scroll in TextInput micro focus.
Diffstat (limited to 'tests/auto/qscriptjstestsuite/qscriptjstestsuite.pro')
0 files changed, 0 insertions, 0 deletions