summaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* Add eglnullws QScreen driverJames Perrett2010-07-089-0/+332
* Merge branch 'master' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into master...Qt Continuous Integration System2010-07-0829-288/+604
|\
| * Fixes the double spinbox not updating geometry when suffix is changedThierry Bastian2010-07-071-0/+3
| * Made QGL2GradientCache thread safe.Trond Kjernåsen2010-07-072-7/+26
| * Add QItemSelectionRange::operator<()Stephen Kelly2010-07-072-0/+183
| * Don't call GetDC() nedlessly.Trond Kjernåsen2010-07-061-1/+1
| * Make QScriptAnalysis fit in two bytes againEskil Abrahamsen Blomfeldt2010-07-061-1/+1
| * Merge branch 'master' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into master...Qt Continuous Integration System2010-07-0624-283/+394
| |\
| | * QGLPixelBuffer should not rely on temporary QGLWidgets.Trond Kjernåsen2010-07-053-19/+24
| | * Initialize pex.Trond Kjernåsen2010-07-021-0/+1
| | * Remove warning.Trond Kjernåsen2010-07-021-1/+1
| | * Fix the tests for the internal GL resource system.Trond Kjernåsen2010-07-022-19/+11
| | * Rework how QGLTextureGlyphCache makes use of the resource system.Trond Kjernåsen2010-07-024-56/+77
| | * The group pointer should no longer be a part of the 64 bit int.Trond Kjernåsen2010-07-021-2/+2
| | * Enable glyph uploads from a thread in the X11 font engine.Trond Kjernåsen2010-07-021-1/+1
| | * Make qt_pixmap_serial thread-safe.Trond Kjernåsen2010-07-021-6/+6
| | * Clean up debug output.Trond Kjernåsen2010-07-024-13/+33
| | * Clarification regarding the WA_X11InitThreads flag.Trond Kjernåsen2010-07-021-1/+2
| | * Rework the internal GL resource system yet again.Trond Kjernåsen2010-07-028-108/+161
| | * Check Qt::AA_X11InitThreads to determine pixmap usage in threads.Trond Kjernåsen2010-07-021-6/+7
| | * Add an application attribute to control XInitThreads().Trond Kjernåsen2010-07-024-2/+9
| | * Unnecessary alloc + remove unused headers.Trond Kjernåsen2010-07-021-6/+2
| | * QGLPixelBuffer should manage its own paint engines.Trond Kjernåsen2010-07-022-3/+0
| | * Remove the DDS texture cache.Trond Kjernåsen2010-07-022-29/+0
| | * Make the GL texture cache share textures between shared contexts.Trond Kjernåsen2010-07-021-2/+3
| | * Redesigned how GL resource management works.Trond Kjernåsen2010-07-0211-185/+116
| | * Don't use the QGLSignalProxy to clean up the thread-local shaders.Trond Kjernåsen2010-07-023-17/+43
| | * Simplify how the QGLEngineSharedShaders object is cleaned up.Trond Kjernåsen2010-07-021-35/+32
| | * Make it possible to call QWidget::metric() from a different thread.Trond Kjernåsen2010-07-021-3/+2
| | * Only use the texture_from_pixmap extension in the main thread.Trond Kjernåsen2010-07-021-1/+2
| | * More work on GL threading.Trond Kjernåsen2010-07-026-36/+98
| | * Make qt_gl_paint_engine() thread-safe.Trond Kjernåsen2010-07-021-7/+36
* | | Merge branch 'master' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into master...Qt Continuous Integration System2010-07-081-1/+2
|\ \ \ | |/ / |/| |
| * | fix qtconfig builds with drag and drop disabledJeremy Katz2010-07-061-1/+2
|/ /
* | Merge branch 'qt-master-from-4.7' of scm.dev.nokia.troll.no:qt/qt-integration...Qt Continuous Integration System2010-07-062422-55035/+53134
|\ \
| * \ Merge remote branch 'origin/4.7' into qt-master-from-4.7Thiago Macieira2010-07-012422-55035/+53134
| |\ \ |/ / /
| * | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-webkit into 4.7-integrationQt Continuous Integration System2010-07-0114-35/+298
| |\ \
| | * | Updated WebKit to 0eee8df53d1873669a9dda8f9c0340543258a316Simon Hausmann2010-07-0114-35/+298
| |/ /
| * | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.7-integ...Qt Continuous Integration System2010-06-308-678/+701
| |\ \
| | * | Reformat whitespace according to coding styleMark Brand2010-06-306-676/+676
| | * | QGraphicsView: Handle wheelEvents correctly with Qt::Popup widgets.Jocelyn Turcotte2010-06-301-0/+19
| | * | QGraphicsProxyWidget: Fixes QComboBox popup closing issue.Jocelyn Turcotte2010-06-302-2/+6
| * | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-s60-public into 4.7-integr...Qt Continuous Integration System2010-06-303-2/+15
| |\ \ \
| | * | | Fix invalid bookmark in anomaly demoMiikka Heikkinen2010-06-302-2/+1
| | * | | Fixed pre-built resources deployment in SymbianMiikka Heikkinen2010-06-301-0/+14
| * | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.7-integ...Qt Continuous Integration System2010-06-303-6/+20
| |\ \ \ \ | | |/ / / | |/| / / | | |/ /
| | * | Crash while changing the windows flags from a Qt::Drawer window on CocoaPrasanth Ullattil2010-06-301-3/+5
| | * | Fix regression in popup behavior on WindowsJens Bache-Wiig2010-06-091-1/+1
| | * | SSL backend: correct ordering of root CA certificates in the storePeter Hartmann2010-06-301-2/+14
| * | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.7-integ...Qt Continuous Integration System2010-06-301-2/+3
| |\ \ \ | | |/ /