summaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'geometry-shaders-to-integrate'Gunnar Sletta2010-02-084-5/+231
|\
| * Another round of Geometry shader review.Gunnar Sletta2010-02-082-21/+13
| * Fix Geometry shaders based on reviewGunnar Sletta2010-02-042-10/+16
| * Geometry Shader support in QGLShaderProgramGunnar Sletta2010-02-014-1/+228
* | Merge branch 'master' of scm.dev.nokia.troll.no:qt/oslo-staging-2aavit2010-02-08171-957/+31224
|\ \
| * | Replace qt_vg_imageBits() with constBits() in the OpenVG codeRhys Weatherley2010-02-082-22/+11
| * | Merge branch 'master' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into master...Qt Continuous Integration System2010-02-056-45/+30
| |\ \
| | * | Revert "Prevent widgets with WA_DontShowOnScreen from keeping the app running"Tor Arne Vestbø2010-02-052-41/+9
| | * | Fix for number entry in QDateTimeEntry using Shift+KeyPad (QTBUG-7842)Thomas Sondergaard2010-02-052-1/+3
| | * | Get rid of setFirstActionActive on mouse release in QMenuPierre Rossi2010-02-052-3/+18
| * | | Merge branch 'master' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into master...Qt Continuous Integration System2010-02-054-39/+40
| |\ \ \ | | |/ / | |/| |
| | * | doc: Fixed some qdoc warnings.Martin Smith2010-02-051-2/+0
| | * | doc: Fixed some qdoc warnings.Martin Smith2010-02-051-14/+16
| | * | doc: Fixed some qdoc warnings.Martin Smith2010-02-051-23/+0
| | * | doc: Fixed some qdoc warnings.Martin Smith2010-02-051-0/+24
| * | | Merge branch 'master' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into master...Qt Continuous Integration System2010-02-052-0/+39
| |\ \ \ | | |/ / | |/| |
| | * | Add QMacCompatGLenum overrides for new QGLShaderProgram functionsRhys Weatherley2010-02-052-0/+39
| * | | Merge branch 'master' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into master...Qt Continuous Integration System2010-02-0422-273/+630
| |\ \ \ | | |/ / | |/| |
| | * | Use a shared QScriptEngine for debugger console command scriptsKent Hansen2010-02-043-229/+233
| | * | Fix QtScript debugger hang/crash issue with updating locals modelKent Hansen2010-02-042-16/+44
| | * | Merge branch 'master' of git@scm.dev.nokia.troll.no:qt/oslo-staging-1Martin Smith2010-02-042-2/+2
| | |\ \
| | | * | Always activate popup windows on showJens Bache-Wiig2010-02-042-2/+2
| | * | | doc: Fixed some qdoc warnings.Martin Smith2010-02-045-14/+36
| | |/ /
| | * | Merge branch 'master' of git@scm.dev.nokia.troll.no:qt/oslo-staging-1Martin Smith2010-02-044-9/+16
| | |\ \
| | | * | Add the QMAKE_FILE_EXT variable to extra compilers generation.Jocelyn Turcotte2010-02-041-0/+13
| | | * | Cocoa: Tool Windows steal focus from the main windowRichard Moe Gustavsen2010-02-043-9/+3
| | * | | doc: Fixed some qdoc warnings.Martin Smith2010-02-043-1/+30
| | |/ /
| | * | Merge branch 'master' of git@scm.dev.nokia.troll.no:qt/oslo-staging-1Martin Smith2010-02-042-0/+269
| | |\ \
| | | * | Update QTestLib documentation with chart use case.Fabien Freling2010-02-042-0/+269
| | * | | qdoc3: Removed a debug output.Martin Smith2010-02-041-2/+0
| | |/ /
| * | | Merge branch 'master' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into master...Qt Continuous Integration System2010-02-043-6/+74
| |\ \ \
| | * | | Fixed wrong variable nameGabriel de Dietrich2010-02-041-1/+1
| * | | | Merge branch 'qt-master-from-4.6' of scm.dev.nokia.troll.no:qt/qt-integration...Qt Continuous Integration System2010-02-04138-578/+30474
| |\ \ \ \
| | * \ \ \ Merge remote branch 'origin/4.6' into qt-master-from-4.6Olivier Goffart2010-02-04138-578/+30474
| | |\ \ \ \ | |/ / / / /
| | * | | | Merge branch '4.6' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.6-integ...Qt Continuous Integration System2010-02-041-2/+7
| | |\ \ \ \
| | | * | | | Rhys Weatherley's changes for 4.6.2Rhys Weatherley2010-02-041-2/+7
| | * | | | | Merge branch '4.6' of scm.dev.nokia.troll.no:qt/qt-s60-public into 4.6-integr...Qt Continuous Integration System2010-02-0420-216/+805
| | |\ \ \ \ \
| | | * \ \ \ \ Merge branch '4.6' of scm.dev.nokia.troll.no:qt/qt-s60-public into 4.6-integr...Qt Continuous Integration System2010-02-0320-216/+805
| | | |\ \ \ \ \
| | | | * \ \ \ \ Merge branch '4.6' of scm.dev.nokia.troll.no:qt/qt-s60-public into 4.6Janne Koskinen2010-02-033-9/+30
| | | | |\ \ \ \ \
| | | | | * | | | | Added descriptions of translatable strings for Phonon MMF reverb effectGareth Stockwell2010-02-031-1/+21
| | | | | * | | | | Corrected namespace for Phonon::MMF translatable error stringsGareth Stockwell2010-02-031-1/+1
| | | | | * | | | | Compile fix for non-Symbian compilersAlessandro Portale2010-02-031-7/+8
| | | | * | | | | | Adjust rw base address for gui built with GCCE for Symbian OSIain2010-02-031-1/+2
| | | | * | | | | | Merge branch '4.6' of scm.dev.nokia.troll.no:qt/qt-s60-public into 4.6Janne Koskinen2010-02-03153-576/+9778
| | | | |\ \ \ \ \ \ | | | | | |/ / / / /
| | | | | * | | | | Merge branch '4.6' of git@scm.dev.troll.no:qt/qt-s60-public into 4.6Janne Anttila2010-02-03331-1814/+13474
| | | | | |\ \ \ \ \
| | | | | * | | | | | S60 softkey refactoring (support for merging, priorities and menus)Janne Anttila2010-02-0313-183/+727
| | | | * | | | | | | Merge branch '4.6' of scm.dev.nokia.troll.no:qt/qt-s60-public into 4.6Janne Koskinen2010-01-29177-1189/+3466
| | | | |\ \ \ \ \ \ \
| | | | * \ \ \ \ \ \ \ Merge branch '4.6' of scm.dev.nokia.troll.no:qt/qt-s60-public into 4.6Janne Koskinen2010-01-2613-188/+365
| | | | |\ \ \ \ \ \ \ \
| | | | * \ \ \ \ \ \ \ \ Merge branch '4.6' of scm.dev.nokia.troll.no:qt/qt-s60-public into 4.6Janne Koskinen2010-01-259105-15150/+24796
| | | | |\ \ \ \ \ \ \ \ \
| | | | * | | | | | | | | | Daylight savings time for Symbian take 2Janne Koskinen2009-12-283-23/+46