diff options
| author | Qt Continuous Integration System <qt-info@nokia.com> | 2011-02-05 13:44:04 (GMT) | 
|---|---|---|
| committer | Qt Continuous Integration System <qt-info@nokia.com> | 2011-02-05 13:44:04 (GMT) | 
| commit | 51872de548e1840431ef37f9172cb06f77875462 (patch) | |
| tree | 6538eb40a46048ce57a0ce7b67ebd62e0a89a504 /doc/src/snippets/code/doc_src_layout.cpp | |
| parent | f8e66ae44308bdf66cb7147768cb63454a900386 (diff) | |
| parent | 31ac30b5a36a34dbd69b4156cc22bbea491d8b09 (diff) | |
| download | Qt-51872de548e1840431ef37f9172cb06f77875462.zip Qt-51872de548e1840431ef37f9172cb06f77875462.tar.gz Qt-51872de548e1840431ef37f9172cb06f77875462.tar.bz2 | |
Merge branch 'master' of git://scm.dev.nokia.troll.no/qt/qt-releng-team
* 'master' of git://scm.dev.nokia.troll.no/qt/qt-releng-team: (40 commits)
  Fix warning about deprecated conversions of string literals to char *
  Add QScriptClass/ByteArray benchmark
  Add Context2D QtScript benchmark
  Revert "Delay creation of the process manager"
  QtDBus: add support for QVariantHash out of the box
  Split QScriptQObject test into smaller functions
  Split QScriptEngine test into smaller functions
  Split QScriptContext autotest into smaller functions
  Improve QScriptClass test coverage
  Bring back "classic" iteration order of QScriptClass properties
  Split QScriptClass autotest into smaller functions
  Fix for QTBUG-17035
  Fix QMutex can deadlock when calling tryLock
  Carefull free the data from XGetWindowProperty on X11.
  Fixes memory leaks in QX11Embed
  Fixed missing text when using static text items in GL 2 engine.
  Prevent recursion when creating window surface.
  Fixed es2 configure when both EGL/egl.h and GLES/egl.h are present.
  document that QThread::exit will exit future event loops
  Revert "Restore Qt 4.6 behaviour: exec() always enters the event loop."
  ...
Diffstat (limited to 'doc/src/snippets/code/doc_src_layout.cpp')
0 files changed, 0 insertions, 0 deletions
