summaryrefslogtreecommitdiffstats
path: root/src/scripttools/debugging/qscriptdebuggerstackwidgetinterface.cpp
diff options
context:
space:
mode:
authorQt Continuous Integration System <qt-info@nokia.com>2011-11-23 10:06:53 (GMT)
committerQt Continuous Integration System <qt-info@nokia.com>2011-11-23 10:06:53 (GMT)
commit05ba0b4d0d32ea2a823aee0b5d196008d95a021d (patch)
treed02bf5f2552db299f2a906549f9c51d0f4de8b9d /src/scripttools/debugging/qscriptdebuggerstackwidgetinterface.cpp
parent8960973e97713205d1aeb209806daca456c55111 (diff)
parent787a9ce07accfcaddada8235ae204a5aa2025309 (diff)
downloadQt-05ba0b4d0d32ea2a823aee0b5d196008d95a021d.zip
Qt-05ba0b4d0d32ea2a823aee0b5d196008d95a021d.tar.gz
Qt-05ba0b4d0d32ea2a823aee0b5d196008d95a021d.tar.bz2
Merge branch 'master' of scm.dev.nokia.troll.no:qt/qt-qml-staging into master-integration
* 'master' of scm.dev.nokia.troll.no:qt/qt-qml-staging: Sequential reading not supported. DeclarativeDebugServer: Instantiate QPluginLoader on heap Fix failing unit tests. qmlplugindump: Fix dumping empty names for generated QMetaObjects. Fix compile with -qtnamespace Properly protect access to pixmap reader thread with mutex Move tga support from Qt3d to Qt. Move tga support from Qt3d to Qt. Properly protect access to pixmap reader thread with mutex qmlplugindump: Add flush to fix output redirection on windows.
Diffstat (limited to 'src/scripttools/debugging/qscriptdebuggerstackwidgetinterface.cpp')
0 files changed, 0 insertions, 0 deletions