summaryrefslogtreecommitdiffstats
path: root/src/opengl/qglpixelbuffer.cpp
diff options
context:
space:
mode:
authorQt Continuous Integration System <qt-info@nokia.com>2010-03-31 20:59:55 (GMT)
committerQt Continuous Integration System <qt-info@nokia.com>2010-03-31 20:59:55 (GMT)
commit8ffd45cf6832b67960dbaa10654c4b84358fe3f9 (patch)
tree897daf36e29fbffdd858ae9031dfacf2cea36d8c /src/opengl/qglpixelbuffer.cpp
parent0373325dd1390682922dd07614214c453d473ce3 (diff)
parentbf04c256c8d39df1206c197821df8913f90bb43c (diff)
downloadQt-8ffd45cf6832b67960dbaa10654c4b84358fe3f9.zip
Qt-8ffd45cf6832b67960dbaa10654c4b84358fe3f9.tar.gz
Qt-8ffd45cf6832b67960dbaa10654c4b84358fe3f9.tar.bz2
Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.7-integration
* '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1: (43 commits) Fix compilation on Windows: forgot to change one toTime_tHelper handle qt-format PO flags handle encoding of PO files make variable naming politically correct :-D add Plural-Forms header in PO writer simplify arabic plural rule don't mark untranslated messages as fuzzy in PO files support gettext POT files fix writing of length variant separators in the singular case make PO header handling less of a monster hack fix updating of X-Source-Language PO header interpret source language "en" as "POSIX" (more precisely: "none specified") Fix compilation with Sun CC: no semi-colon after Q_ENUM. Remove the "Insert unicode control character" menu entry on X11. adds a timeout option to QThreadPool::waitForDone(); Remove leading whitespace from Qt header macros. Rename the xxxMsecsSinceEpoch functions to xxxMSecsSinceEpoch. Add QDateTime members that operate on 64-bit milliseconds. Fix compilation on WinCE and MinGW by memsetting the OVERLAPPED struct. qdoc: Added <div> elements to some html output for class references. ...
Diffstat (limited to 'src/opengl/qglpixelbuffer.cpp')
0 files changed, 0 insertions, 0 deletions