summaryrefslogtreecommitdiffstats
path: root/src/opengl/qglpixelbuffer_p.h
diff options
context:
space:
mode:
authorQt Continuous Integration System <qt-info@nokia.com>2010-02-13 19:07:50 (GMT)
committerQt Continuous Integration System <qt-info@nokia.com>2010-02-13 19:07:50 (GMT)
commit31486a63ebc74964ad63cf3187b4476d6563b841 (patch)
tree84fc263b3d85758b569c4f2ad4a902a90d6b2e71 /src/opengl/qglpixelbuffer_p.h
parent42dda19d82ceea48f19d356cfaf2b26acb763df8 (diff)
parent060155f2819b4dbad9d91cffa8af1d6ec7e4338c (diff)
downloadQt-31486a63ebc74964ad63cf3187b4476d6563b841.zip
Qt-31486a63ebc74964ad63cf3187b4476d6563b841.tar.gz
Qt-31486a63ebc74964ad63cf3187b4476d6563b841.tar.bz2
Merge branch 'master' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into master-integration
* 'master' of scm.dev.nokia.troll.no:qt/oslo-staging-1: (28 commits) Optimized QLocale to access system locale on demand. Fix QRegion under Mac OS X. update according to Thiago's comments. Changes: add functionality for dbus auto start to qt Add license header to this file readdir64 is not available on HP-UX Fix bug in QDirPrivate::setPath, affecting QDir::cd, cdUp and setPath qdoc3: Completed handling of the new \pagekeywords command. Wrong cursor shown by the parent window after setOverrideCursor(). Fixed Mac OS X compile time error by using GLint for temp. qdoc3: Added curly braces in switch statement for braindead compiler. qdoc: Added a build rule for the documentation - disabled by default. Doc: Added the qdoc manual to the repository for future maintenance. qdoc3: Fixed bug in creation of qt.pageindex. qdoc3: Added capability to create qt.pageindex. Incorrect property setter generated by dumpcpp for Microsoft Word 2007. Cocoa: Implement our own NSApplication subclass Cocoa: Menu in menubar stays highlighted qdoc: Made a temporary fix for comment highlighting. Doc: Tidied up the class layout and removed an unnecessary image. ...
Diffstat (limited to 'src/opengl/qglpixelbuffer_p.h')
0 files changed, 0 insertions, 0 deletions