diff options
| author | Qt Continuous Integration System <qt-info@nokia.com> | 2010-07-22 15:47:40 (GMT) | 
|---|---|---|
| committer | Qt Continuous Integration System <qt-info@nokia.com> | 2010-07-22 15:47:40 (GMT) | 
| commit | a305eb2d69d82a28dfd8af4f70d50943474831a8 (patch) | |
| tree | 96acc47de597fb1940b1bc261b1da5c0cc886fcf /doc/src/snippets/code/src_opengl_qgl.cpp | |
| parent | 71cc2f69171f5dd6d8ae094239230362fc8db081 (diff) | |
| parent | 7f4378699182be721382555f58b518bd40e7647d (diff) | |
| download | Qt-a305eb2d69d82a28dfd8af4f70d50943474831a8.zip Qt-a305eb2d69d82a28dfd8af4f70d50943474831a8.tar.gz Qt-a305eb2d69d82a28dfd8af4f70d50943474831a8.tar.bz2 | |
Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7-integration
* '4.7' of scm.dev.nokia.troll.no:qt/qt-qml: (34 commits)
  Fix TextInput echoMode autotest on Linux
  Reuse QML lexer to simplify .pragma script logic
  Fix TextEdit text attribute and text stored in the internal QTextDocument having different contents
  Remove QDeclarativeItem::childrenChanged() signal overload
  Update QtGui and QtDeclarative def files
  Make rootContext and engine pointers in QDeclarativeView API const
  Add additional QVariant benchmarks.
  Allow MouseArea dragging to filter mouse events from descendants
  Expand QDeclarativeExtensionPlugin docs
  Add missing snippet files
  Expand QtObject doc
  Indicate default values
  Use snippets instead to avoid quoting license headers
  Rename remaining 'wantsFocus'.
  Bounding rect of text was not always calculated correctly.
  Add QML tutorials to the tutorials page
  QML focus API updates.
  Do not show copyright header in documentation.
  Ensure redirects (and indeed all reply process) is done in the right thread.
  Only ignore the same target value for a Behavior when it is running.
  ...
Diffstat (limited to 'doc/src/snippets/code/src_opengl_qgl.cpp')
0 files changed, 0 insertions, 0 deletions
