summaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* QtDBus: add support for QVariantHash out of the boxThiago Macieira2011-02-032-0/+16
* Load modules from QMAKEPATHYury G. Kudryashov2011-02-021-1/+5
* fix windows configure compilation after lighthouse mergeOswald Buddenhagen2011-02-021-0/+2
* Allow the user to select imageformats to be built as plugin vs internalBernhard Rosenkraenzer2011-02-022-1/+35
* Merge branch 'master' of scm.dev.nokia.troll.no:qt/qt-air-staging into master...Qt Continuous Integration System2011-02-012-4/+12
|\
| * Refactoring of tst_QScriptEngine::automaticSemicolonInsertion test.Jedrzej Nowacki2011-02-011-4/+4
| * Add new test to tst_QScriptContextInfo.Jedrzej Nowacki2011-02-011-0/+8
|/
* Merge branch 'master' of scm.dev.nokia.troll.no:qt/qt-earth-staging into mast...Qt Continuous Integration System2011-01-291-0/+4
|\
| * Merge branch 'master' of scm.dev.nokia.troll.no:qt/qt-earth-staging into mast...Qt Continuous Integration System2011-01-281-0/+4
| |\
| | * Incorrect comparison result in QString::localeCarlos Manuel Duclos Vergara2011-01-281-0/+4
* | | Merge branch 'master' of scm.dev.nokia.troll.no:qt/qt-fire-staging into maste...Qt Continuous Integration System2011-01-282-1/+11
|\ \ \ | |/ / |/| |
| * | Merge remote branch 'qt-fire-review/master'aavit2011-01-282-1/+11
| |\ \ | | |/ | |/|
| | * Merge branch 'master' of git://scm.dev.nokia.troll.no/qt/qt-fire-teamQt Continuous Integration System2011-01-2610813-25846/+121729
| | |\
| | | * Fixed hslHue / hslHueF returning the wrong value for achromatic QColors.Samuel Rødal2011-01-262-1/+11
* | | | Merge branch 'master' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into master...Qt Continuous Integration System2011-01-284-32582/+16
|\ \ \ \
| * \ \ \ Merge branch 'master' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into master...Qt Continuous Integration System2011-01-284-32582/+16
| |\ \ \ \ | | |/ / / | |/| | |
| | * | | Merge remote branch 'mainline/master'Oswald Buddenhagen2011-01-27115-6186/+7675
| | |\ \ \
| | * | | | reduce some symbian-specific TS files for qt to RTL markerOswald Buddenhagen2011-01-274-32582/+16
* | | | | | Merge branch 'master' of scm.dev.nokia.troll.no:qt/qt-water-staging into mast...Qt Continuous Integration System2011-01-2830-1370/+1883
|\ \ \ \ \ \ | |/ / / / / |/| | | | |
| * | | | | Cocoa/Alien: fix qgraphicseffectsource autotestRichard Moe Gustavsen2011-01-281-5/+8
| * | | | | Cocoa: fix qgraphicsview autotestRichard Moe Gustavsen2011-01-282-2/+6
| * | | | | Merge branch 'master' of scm.dev.nokia.troll.no:qt/qt-water-stagingRichard Moe Gustavsen2011-01-27211-7739/+15666
| |\ \ \ \ \
| | * \ \ \ \ Merge branch 'master' of scm.dev.nokia.troll.no:qt/qt-water-staging into mast...Qt Continuous Integration System2011-01-2728-1363/+1865
| | |\ \ \ \ \ | |/ / / / / / |/| | | | | |
| | * | | | | Merge branch 'master' of scm.dev.nokia.troll.no:qt/qt-water-staging into mast...Qt Continuous Integration System2011-01-2628-1363/+1865
| | |\ \ \ \ \ | | | |/ / / / | | |/| | | |
| | | * | | | Merge branch 'master' of scm.dev.nokia.troll.no:qt/qt-water-staging into mast...Qt Continuous Integration System2011-01-2628-1363/+1865
| | | |\ \ \ \
* | | | \ \ \ \ Merge branch 'staging-master' of scm.dev.nokia.troll.no:qt/qt-lighthouse into...Qt Continuous Integration System2011-01-2794-1549/+7908
|\ \ \ \ \ \ \ \ | |_|_|_|_|/ / / |/| | | | | | |
| * | | | | | | Merge branch 'master' into lighthouse-masterJørgen Lind2011-01-2610602-16862/+24546
| |\ \ \ \ \ \ \
| * | | | | | | | Lighthouse: License headers to new files in testliteJørgen Lind2011-01-2611-1/+411
| * | | | | | | | Make sure we blit the fbo on flush in QGLWindowSurfaceJørgen Lind2011-01-261-2/+2
| * | | | | | | | Lighthouse: Wayland. Make the wayland integration closer to LighthosueJørgen Lind2011-01-2613-39/+99
| * | | | | | | | Lighthouse: Wayland, only make one fbo for the WaylandPaintDeviceJørgen Lind2011-01-262-87/+138
| * | | | | | | | Making clearer separation between responsibility of different classesJørgen Lind2011-01-2615-327/+563
| * | | | | | | | Make it possible to vertically mirror gl paintingJørgen Lind2011-01-263-5/+23
| * | | | | | | | Lighthouse:Wayland Moving some logic into filesJørgen Lind2011-01-2618-631/+1121
| * | | | | | | | Fix Wayland plugin to work with Wayland after some interfaces changedJørgen Lind2011-01-252-10/+9
| * | | | | | | | Make QGLContext::fromPlatformGLContext show correct sharingJørgen Lind2011-01-254-18/+17
| * | | | | | | | Remove Lighthouse specific code from QGLWindowSurfaceJørgen Lind2011-01-251-7/+1
| * | | | | | | | Fix X11 clipboard bug.Jørgen Lind2011-01-251-3/+3
| * | | | | | | | Fix for uninitialized member in QWaylandCursorRolf Offermanns2011-01-251-1/+1
| * | | | | | | | wayland: use pkgconfig for libdrm in wayland.proBenjamin Franzke2011-01-251-1/+5
| * | | | | | | | wayland: remove non-public header from config.testsBenjamin Franzke2011-01-251-2/+1
| * | | | | | | | wayland: fix SOURCES to point to wayland.cpp in config.testsBenjamin Franzke2011-01-251-1/+1
| * | | | | | | | Wayland: request rbg and premultiplied argb visuals as neededJesse Barnes2011-01-253-3/+27
| * | | | | | | | Wayland: clamp window resizes to screen sizeJesse Barnes2011-01-251-3/+13
| * | | | | | | | Wayland: split GL code into separate filesJesse Barnes2011-01-256-290/+374
| * | | | | | | | Wayland: use correct viewport for swapBuffers and correct coordsJesse Barnes2011-01-251-15/+28
| * | | | | | | | Wayland: fix geometry of swapBuffersJesse Barnes2011-01-251-1/+2
| * | | | | | | | Wayland: clean up swapBuffers codeJesse Barnes2011-01-251-13/+25
| * | | | | | | | Wayland: add GL widget supportJesse Barnes2011-01-252-4/+96
| * | | | | | | | Wayland: set parent window pointer in setParent()Jesse Barnes2011-01-252-2/+3