diff options
| author | Qt Continuous Integration System <qt-info@nokia.com> | 2010-05-13 00:50:44 (GMT) | 
|---|---|---|
| committer | Qt Continuous Integration System <qt-info@nokia.com> | 2010-05-13 00:50:44 (GMT) | 
| commit | 50711dd7aa22052eff58431d9f4e95e1a688047e (patch) | |
| tree | 748ba00ade4cb880739dd88990b5c827b312296a /doc/src/snippets/code/src_opengl_qglshaderprogram.cpp | |
| parent | 47760d59d57f548d5816ae43e456c86e01146491 (diff) | |
| parent | d45c45432ccd0a74c67e70ce5fc3a09f35923c26 (diff) | |
| download | Qt-50711dd7aa22052eff58431d9f4e95e1a688047e.zip Qt-50711dd7aa22052eff58431d9f4e95e1a688047e.tar.gz Qt-50711dd7aa22052eff58431d9f4e95e1a688047e.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 TextEdit and TextInput input panel support for mode RSIP_OnMouseClickAndAlreadyFocused
  Fix for graphics widget in the background stealing declarative item's focus
  Fix broken benchmarks.
  Possibly fix autotest
  Correctly assign bool to variant properties
  Improve Image docs. Move all fillMode image examples to fillMode
  Flickable small API changes.
  Reset the dragDropItem to 0 when the item dies while dragging on top it.
  Avoid warning (and possible future crash) upon reload.
  Don't pass sequential (QNetworkReply) to image reader, it doesn't work well enough.
  Stop GIF handler claiming it can report Size for sequential devices,
  Use raster graphicssystem for qml.app on OS X.
  Add missing test, qdeclarativelayoutitem, to declarative.pro
  Sorted the tests list in declarative.pro
  Bail out early if the same target value is reassigned to a Behavior.
  Correctly position any input method popups for TextInput.
  Correctly resize TextInput in the presence of preedit text.
  Apply signal handler changes immediately.
  Remove unused image
  Qt.widgets was removed, point to graphics layouts example
  ...
Diffstat (limited to 'doc/src/snippets/code/src_opengl_qglshaderprogram.cpp')
0 files changed, 0 insertions, 0 deletions
