summaryrefslogtreecommitdiffstats
path: root/src
Commit message (Expand)AuthorAgeFilesLines
* Compile fix for embedded.Denis Dzyubenko2010-02-084-10/+0
* Merge branch 'master' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into master...Qt Continuous Integration System2010-02-0817-232/+399
|\
| * Merge branch 'master' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into master...Qt Continuous Integration System2010-02-0817-232/+399
| |\
| | * Revised fix for system tray popup activationJens Bache-Wiig2010-02-051-1/+4
| | * Added new mouse cursor types.Denis Dzyubenko2010-02-0513-231/+381
| | * Doc: more \since 4.7Volker Hilsheimer2010-02-052-0/+6
| | * Doc: add \since 4.7 to new functions.Volker Hilsheimer2010-02-051-0/+8
* | | 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-053-15/+11
|\ \ | |/ |/|
| * Revert "Prevent widgets with WA_DontShowOnScreen from keeping the app running"Tor Arne Vestbø2010-02-051-11/+9
| * Fix for number entry in QDateTimeEntry using Shift+KeyPad (QTBUG-7842)Thomas Sondergaard2010-02-051-1/+1
| * Get rid of setFirstActionActive on mouse release in QMenuPierre Rossi2010-02-051-3/+1
* | Merge branch 'master' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into master...Qt Continuous Integration System2010-02-051-14/+16
|\ \ | |/ |/|
| * doc: Fixed some qdoc warnings.Martin Smith2010-02-051-14/+16
* | 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-0418-271/+348
|\ \ | |/ |/|
| * 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-043-9/+3
| |\
| | * 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 scm.dev.nokia.troll.no:qt/oslo-staging-2 into master...Qt Continuous Integration System2010-02-042-6/+10
|\ \
| * | Fixed wrong variable nameGabriel de Dietrich2010-02-041-1/+1
| * | QHeaderView: fixes sectionClicked() emitted with wrong section indexOlivier Goffart2010-02-041-5/+9
* | | Merge remote branch 'origin/4.6' into qt-master-from-4.6Olivier Goffart2010-02-0463-350/+1150
|\ \ \ | |/ / |/| |
| * | Merge branch '4.6' of scm.dev.nokia.troll.no:qt/qt-s60-public into 4.6-integr...Qt Continuous Integration System2010-02-0419-216/+798
| |\ \
| | * \ Merge branch '4.6' of scm.dev.nokia.troll.no:qt/qt-s60-public into 4.6-integr...Qt Continuous Integration System2010-02-0319-216/+798
| | |\ \
| | | * \ 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-0365-358/+1393
| | | |\ \ \ | | | | |/ /
| | | | * | Merge branch '4.6' of git@scm.dev.troll.no:qt/qt-s60-public into 4.6Janne Anttila2010-02-03129-1162/+2858
| | | | |\ \
| | | | * | | 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-2974-790/+1376
| | | |\ \ \ \
| | | * \ \ \ \ Merge branch '4.6' of scm.dev.nokia.troll.no:qt/qt-s60-public into 4.6Janne Koskinen2010-01-268-151/+285
| | | |\ \ \ \ \
| | | * \ \ \ \ \ Merge branch '4.6' of scm.dev.nokia.troll.no:qt/qt-s60-public into 4.6Janne Koskinen2010-01-253427-6612/+10705
| | | |\ \ \ \ \ \
| | | * | | | | | | Daylight savings time for Symbian take 2Janne Koskinen2009-12-282-23/+39
| * | | | | | | | | Fix regression in clipped icon text on WindowsJens Bache-Wiig2010-01-131-1/+1
| * | | | | | | | | Merge branch '4.6' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.6-integ...Qt Continuous Integration System2010-02-035-14/+40
| |\ \ \ \ \ \ \ \ \ | | |/ / / / / / / / | |/| | | | | | | |
| | * | | | | | | | QTcpServer: Clarify thread affinity of incoming QTcpSocketMarkus Goetz2010-02-031-0/+9
| | * | | | | | | | Cleared up QEvent documentation for QGraphicsSceneDragDropEvent events.Bastian Bense2010-02-031-4/+4
| | * | | | | | | | QNAM HTTP: Fix bug related to re-sending a requestMarkus Goetz2010-02-033-10/+27
| * | | | | | | | | Merge branch '4.6' of scm.dev.nokia.troll.no:qt/berlin-staging-1 into 4.6-int...Qt Continuous Integration System2010-02-0319-31/+49
| |\ \ \ \ \ \ \ \ \ | | |_|_|_|_|_|_|/ / | |/| | | | | | | |
| | * | | | | | | | revert to fromUtf16() usage in fromWCharArray()Oswald Buddenhagen2010-02-031-1/+1