diff options
| author | Simon Hausmann <simon.hausmann@nokia.com> | 2009-12-01 08:50:03 (GMT) | 
|---|---|---|
| committer | Simon Hausmann <simon.hausmann@nokia.com> | 2009-12-01 08:50:03 (GMT) | 
| commit | 931ede896c1b4b0250a8503980c3da5478e5adc1 (patch) | |
| tree | 1c2f6ceebdd02b0030efb947a566acaf14c86dc6 /doc/src/snippets/code/src_opengl_qglshaderprogram.cpp | |
| parent | 19d0a365dd99dc1a108e58949f7d0f49bac72623 (diff) | |
| parent | 700a069591d29733609e619c224861ca774bfb32 (diff) | |
| download | Qt-931ede896c1b4b0250a8503980c3da5478e5adc1.zip Qt-931ede896c1b4b0250a8503980c3da5478e5adc1.tar.gz Qt-931ede896c1b4b0250a8503980c3da5478e5adc1.tar.bz2 | |
Merge branch '4.6' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.6-integration
* '4.6' of scm.dev.nokia.troll.no:qt/oslo-staging-1: (83 commits)
  Fixes a crash on Mac with QFileInfo.
  Unix: Avoid stat() when opening a file
  Fix garbage collection issue with script-owned objects with connections
  Make sure that cleanupTestCase() do not stat
  Updated WebKit from /home/shausman/src/webkit/trunk to qtwebkit/qtwebkit-4.6 ( 9de63cde0ac8aa08e207d4ffce2846df1a44a364 )
  Enable YARR when YARR_JIT is enabled
  Fixed build on S60 and WinCE
  Updated WebKit from /home/shausman/src/webkit/trunk to qtwebkit/qtwebkit-4.6 ( 37d059def88f94e4296a74dc524efda154c6bde6 )
  QNetworkReply autotest: adapt to QNetworkCookieJar change
  Fix memory leak in the DNotify implementation of QFileSystemWatcher
  Fix performance regression of posted events
  Improve QFileInfo benchmark
  Fix miracously exported WTF symbols in QtScript with the Maemo 5 toolchain.
  Fixed memory leak in QImagePixmapCleanupHooks.
  Fix compilation on Windows CE
  Fixed non-compiling Q*SpinBox auto-tests
  Fixed typo in Symbian installation instructions.
  Fix infinite recursion in OpenVG scissor-only clipping
  fix crash on closing all files under certain circumstances
  On Mac OS X, QLineEdit should handle MoveToStart/EndOfBlock
  ...
Diffstat (limited to 'doc/src/snippets/code/src_opengl_qglshaderprogram.cpp')
0 files changed, 0 insertions, 0 deletions
