summaryrefslogtreecommitdiffstats
path: root/src/scripttools/debugging/qscriptdebuggerstackmodel.cpp
diff options
context:
space:
mode:
authorQt Continuous Integration System <qt-info@nokia.com>2010-02-08 16:48:53 (GMT)
committerQt Continuous Integration System <qt-info@nokia.com>2010-02-08 16:48:53 (GMT)
commitfb84fc866825f1f9f6d520cdcc2dcace7e7d77ea (patch)
tree93549525d732f879a779b6276bdf33fb7e0267c9 /src/scripttools/debugging/qscriptdebuggerstackmodel.cpp
parentd80c2837a41903f66159617fbd0b8b69e4a8da75 (diff)
parent43b61d3a9fd8eaf5cbca046d376ea82b2311c967 (diff)
downloadQt-fb84fc866825f1f9f6d520cdcc2dcace7e7d77ea.zip
Qt-fb84fc866825f1f9f6d520cdcc2dcace7e7d77ea.tar.gz
Qt-fb84fc866825f1f9f6d520cdcc2dcace7e7d77ea.tar.bz2
Merge branch 'master' of scm.dev.nokia.troll.no:qt/qt-qml into master-integration
* 'master' of scm.dev.nokia.troll.no:qt/qt-qml: (3342 commits) Add getter functions to QAbstractDynamicMetaObject and QmlOpenMetaObjectType Changed define name to reflect change in Creator. re-enable QT_USE_FAST_CONCATENATION XMLHttpRequest collection bug The virtual keyboard is now working for TextEdit and TextInput components. Fix viewport size update. Make transformOrigin Center by default Better documentation of "model" and "modelData" in delegates. clip if tile mode is 'PreserveAspectCrop' and 'clip' property is true. Fix test. Allow objects to be shared between QmlEngines Use QUrl::fromLocalFile() instead of "file://" (i.e. only 2 slashes). Fix item removal. Fixes: make qt-creator compile Make atBeginning/viewArea calculations account for min extent. Fix private header include. Fix autotest. Fix test. Fix test. Remove hacky fix (breaks autotest). ...
Diffstat (limited to 'src/scripttools/debugging/qscriptdebuggerstackmodel.cpp')
0 files changed, 0 insertions, 0 deletions