summaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* Merge branch '4.6' of git@scm.dev.nokia.troll.no:qt/qt into 4.6Gunnar Sletta2009-11-04556-6515/+16435
|\
| * Merge branch '4.6' of git@scm.dev.nokia.troll.no:qt/qt into 4.6Warwick Allison2009-11-045-9/+20
| |\
| | * Merge branch '4.6' of git@scm.dev.nokia.troll.no:qt/qt into 4.6Jason McDonald2009-11-041-5/+16
| | |\
| | | * Fixed lastError() for QTDS driver. Previously, no lastError was available on ...Mark Brand2009-11-041-5/+16
| | * | Fix trivial qdoc errorJason McDonald2009-11-041-1/+1
| | |/
| | * Merge branch '4.6' of git@scm.dev.nokia.troll.no:qt/qt into 4.6Jason McDonald2009-11-04532-6477/+16264
| | |\
| | * | Attempt to fix qdoc error caused by renaming of ftp example to qftp.Jason McDonald2009-11-043-3/+3
| * | | Declarative building infrastructure.Warwick Allison2009-11-048-3/+74
| * | | qdoc updates for QMLWarwick Allison2009-11-0410-23/+75
| | |/ | |/|
| * | Implement internal support for property interceptors (used by declarative).Michael Brasser2009-11-041-1/+4
| * | QGtkStyle refactoringRobert Griebl2009-11-0313-1350/+1455
| * | Changes for DirectFBAnders Bakken2009-11-031-5/+62
| * | Re-apply change fa1856bcb2eff41dadf0900202dd43f44ddb2343 by Joerg BornemannJoerg Bornemann2009-11-031-0/+11
| * | Re-apply change 71913d435213188959441a89454de6308fd76484 by Jocelyn TurcotteJocelyn Turcotte2009-11-031-23/+0
| * | Re-apply change 6bc9ef388590b4bfb281d2e1510dc7c3d1837349 by Shane KearnsShane Kearns2009-11-031-0/+15
| * | Re-apply change 6f36d0aafaccbb9affe8ac1b82c225d985aa7491 by David BoddieDavid Boddie2009-11-031-0/+17
| * | Re-apply change e2ef97128c006ac2a5c99c67bb54eebaa3b45720 by Thiago MacieiraThiago Macieira2009-11-031-0/+37
| * | Re-apply change 3f7a99565de7ed17d7ac4c0a25b02997b094b1a9 by Thiago MacieiraThiago Macieira2009-11-031-1/+2
| * | Re-apply change 0e917ae9587aa0727e6b26ba3eb0157362748fb7 by Jocelyn TurcotteJocelyn Turcotte2009-11-032-107/+107
| * | Re-apply change 37dc859e7e2e0f135e4c40bc7f6f824fcdb21e86 by David BoddieDavid Boddie2009-11-032-7/+91
| * | Re-apply change 4ce556b952545494a8adb96f628c219a38406562 by Oswald BuddenhagenOswald Buddenhagen2009-11-031-1/+1
| * | Re-apply change cef1901dbd96be81fc4139b50b094dfae5223e6f by Martin SmithMartin Smith2009-11-031-1/+1
| * | Re-apply change 6125aabeccb01a07c706fe4227279eb827e8e890 by Jocelyn TurcotteJocelyn Turcotte2009-11-031-2/+6
| * | Updated WebKit from /home/jturcott/dev/webkit/ to qtwebkit-4.6-snapshot-20091...Jocelyn Turcotte2009-11-03492-4844/+14466
| * | Update mkdist-webkit script:Jocelyn Turcotte2009-11-031-2/+2
| * | fix test for real - if the reference stream contains doubles, we must read do...Harald Fernengel2009-11-031-32/+31
| * | Make the QDataStream autotest much more robustHarald Fernengel2009-11-031-10/+20
| * | Merge branch '4.6' of git@scm.dev.nokia.troll.no:qt/qt-doc-team into 4.6David Boddie2009-11-0326-527/+372
| |\ \ | | |/ | |/|
| | * Doc/i18n: Fixed source strings for translation.David Boddie2009-11-0311-23/+23
| | * Doc: Fixed license information.David Boddie2009-11-031-1/+1
| | * Doc: Added links to the SQL documentation and corrected license info.David Boddie2009-11-032-2/+7
| | * Doc: Added a note about QApplication::installTranslator().David Boddie2009-11-021-3/+7
| | * Fixed main window closing when subwindows cancel their close events.David Boddie2009-11-021-1/+1
| | * Doc: Fixed qdoc warnings.David Boddie2009-11-022-3/+3
| | * Doc: i18n overhaul for QObject::tr() and the Qt Linguist manual.David Boddie2009-11-026-478/+310
| | * Merge branch '4.6' of git@scm.dev.nokia.troll.no:qt/qt-doc-team into 4.6Peter Yard2009-11-022-16/+14
| | |\
| | | * qdoc3: Fixed a linking error for qml properties.Martin Smith2009-10-292-16/+14
| | * | Added documentation of RPATH defines.Peter Yard2009-11-021-0/+6
| | |/
| * | Revert "Compile fix until configure.exe is rebuilt for Windows"Daniel Molkentin2009-11-031-2/+1
| * | Prepend qt_instdate when using configure.exe as well. Rebuilt configure.exeDaniel Molkentin2009-11-032-1/+1
* | | Merge branch '4.6' of git@scm.dev.nokia.troll.no:qt/qt-graphics-team into 4.6Gunnar Sletta2009-11-0433-527/+452
|\ \ \
| * | | Remove QMatrix4x4& return values in response to API review feedbackRhys Weatherley2009-11-043-80/+65
| * | | Incorporate API review feedback for math3d classes.Rhys Weatherley2009-11-0411-285/+197
| * | | Fixed QPainterPath::addRoundedRect() for paths with Qt::WindingFill.Kim Motoyoshi Kalland2009-11-031-10/+10
| * | | Merge branch 'statemachine-api-changes' into 4.6Eskil Abrahamsen Blomfeldt2009-11-0319-151/+171
| |\ \ \
| | * | | Rename QState::polished() signal to "propertiesAssigned"Eskil Abrahamsen Blomfeldt2009-11-039-40/+47
| | * | | Change name of QMouseEventTransition::path() to hitTestPath().Eskil Abrahamsen Blomfeldt2009-11-034-14/+14
| | * | | Change name of modifiersMask property to "modifierMask"Eskil Abrahamsen Blomfeldt2009-11-038-49/+49
| | * | | Remove return type of QState::addTransition(QAbstractTransition*)Eskil Abrahamsen Blomfeldt2009-11-033-23/+36
| | * | | Change name of DoNotRestoreProperties enum to DontRestorePropertiesEskil Abrahamsen Blomfeldt2009-11-033-9/+9