summaryrefslogtreecommitdiffstats
path: root/src/scripttools/debugging/qscriptdebuggercodewidgetinterface.cpp
diff options
context:
space:
mode:
authorQt Continuous Integration System <qt-info@nokia.com>2011-01-27 01:15:49 (GMT)
committerQt Continuous Integration System <qt-info@nokia.com>2011-01-27 01:15:49 (GMT)
commit4a0383f482d68d17ba1a9b63b7d81bf952849e3b (patch)
tree2614050fd4ef051f50de7e950f0f6580738a99c5 /src/scripttools/debugging/qscriptdebuggercodewidgetinterface.cpp
parent69c9b5b45393ebd2e2e50f1bb316cf4fc8ee9b73 (diff)
parent41de32155e0a862ec7f6aacbcf985f06950bfda9 (diff)
downloadQt-4a0383f482d68d17ba1a9b63b7d81bf952849e3b.zip
Qt-4a0383f482d68d17ba1a9b63b7d81bf952849e3b.tar.gz
Qt-4a0383f482d68d17ba1a9b63b7d81bf952849e3b.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: (78 commits) Add util/xkbdatagen/README Application background is incorrect if app locked to landscape. QtScript/JSC on Symbian: Enhanced memory allocator for Collector heap Revert "QtScript/JSC on Symbian: Enhanced memory allocator for Collector heap" Temporary fix for ambiguous cast from four letter char constant add autotest for digest authentication Fix cursor position adjustment when removing strings Fix QMAKE_POST_LINK in Symbian for targets with special characters. QtScript/JSC on Symbian: Enhanced memory allocator for Collector heap Improved performance of mapFromGlobal/mapToGlobal on X11 Moved the implementation of mapFromGlobal/mapToGlobal to QWidgetPrivate Avoid possible font name collisions on fbserv Update of Czech translation for Qt 4.7-stable Fix crash in QtScript/JSC stack allocator on Symbian HTTP: fix digest authentication Fix loop count in animanted gifs sometimes being incorrect Fixed UTF-8 application names in device application menu in Symbian Validate arguments to QDBusConnection::connect make the test a bit stricter ignore the warning from auto-detach in destructor ...
Diffstat (limited to 'src/scripttools/debugging/qscriptdebuggercodewidgetinterface.cpp')
0 files changed, 0 insertions, 0 deletions