summaryrefslogtreecommitdiffstats
path: root/src
Commit message (Expand)AuthorAgeFilesLines
* Track the GL DCs we use across different threads under Windows.Trond Kjernåsen2010-07-083-1/+6
* Merge branch 'master' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into master...Qt Continuous Integration System2010-07-0836-271/+1013
|\
| * Add copyright headerJames Perrett2010-07-086-0/+246
| * Avoid static local QHashJames Perrett2010-07-081-17/+16
| * Remove explicit 'virtual' specifiers to conform to Qt coding standardJames Perrett2010-07-081-11/+11
| * Use Q_ASSERT_X() rather than Q_ASSERT(!"message") idiomJames Perrett2010-07-081-1/+1
| * 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-0827-271/+436
| |\
| | * 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-071-0/+24
| | * 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-0623-266/+385
| | |\
| | | * 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-021-2/+2
| | | * 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/qt-qml into master-integra...Qt Continuous Integration System2010-07-081-2/+2
|\ \ \ \ | |/ / / |/| | |
| * | | Make the QScriptLine bit field fit in 4 bytes again.Michael Brasser2010-07-061-2/+2
| |/ /
* | | fix qtconfig builds with drag and drop disabledJeremy Katz2010-07-061-1/+2
|/ /
* | Merge remote branch 'origin/4.7' into qt-master-from-4.7Thiago Macieira2010-07-01483-13979/+10435
|\ \ | |/ |/|
| * Updated WebKit to 0eee8df53d1873669a9dda8f9c0340543258a316Simon Hausmann2010-07-0114-35/+298
| * Reformat whitespace according to coding styleMark Brand2010-06-305-80/+80
| * 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
| * 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 commit 'staging/4.7' into qt-3541Aaron McCarthy2010-06-307-3/+32
| |\