summaryrefslogtreecommitdiffstats
path: root/src/scripttools/debugging/qscriptdebuggercodefinderwidgetinterface.cpp
diff options
context:
space:
mode:
authorQt Continuous Integration System <qt-info@nokia.com>2011-04-14 05:36:56 (GMT)
committerQt Continuous Integration System <qt-info@nokia.com>2011-04-14 05:36:56 (GMT)
commitd58cbb0ae009d7ff295d44b8e48352ff802b2e35 (patch)
tree5d8d8e5ea0cd1c9dffc6abd3e6e40058536236c8 /src/scripttools/debugging/qscriptdebuggercodefinderwidgetinterface.cpp
parenta5d5971586d0a12e55374dae30e17454bca12600 (diff)
parentcc3bcc003048760a501debe49b6fcebffaac3cef (diff)
downloadQt-d58cbb0ae009d7ff295d44b8e48352ff802b2e35.zip
Qt-d58cbb0ae009d7ff295d44b8e48352ff802b2e35.tar.gz
Qt-d58cbb0ae009d7ff295d44b8e48352ff802b2e35.tar.bz2
Merge branch 'master' of git://scm.dev.nokia.troll.no/qt/qt-qml-team
* 'master' of git://scm.dev.nokia.troll.no/qt/qt-qml-team: (485 commits) Remove a race condition in SIGCHLD handler. Fix warnings about && inside || Update XCreateWindow in qgl_X11egl.cpp Allow enum values to be used as signal parameters ListModel::clear() should not clear roles Lancelot: support for custom keys added to protocol. API cleanup. Make sure removed QTextBlock is invalid Cocoa: Fixup wrong code in patch baaa5ae Designer: Allow promoted QWidget's to be buddies. Designer: Specify 'notr' attribute for buttongroup name. [QTBUG-15278] QWidget::windowState gets out of sync (Aero Snap) HTTP cacheing: do not store the date header with the resource Let's not write to the source buffer when blending argb32 on rgb16. Add support for -unset <prop> option to qmake. make -markuntranslated work without -idbased fix conditional on shell type Updated QtOpenGL DEF file Lancelot: bail out if rendering consistently fails Minor optimization to lance/elot Make it possible to test the new font hinting in lance[elot] ...
Diffstat (limited to 'src/scripttools/debugging/qscriptdebuggercodefinderwidgetinterface.cpp')
0 files changed, 0 insertions, 0 deletions