summaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'master' into 4.6Janne Anttila2009-08-2814-183/+355
|\
| * Minor fix to space usage in makefile.Janne Anttila2009-08-281-1/+1
| * Changed createpackage parameters to be more consistent with make targets.Janne Anttila2009-08-284-23/+32
| * Minor fix to MAKEFILE variable in SBSv2 generated makefiles.Janne Anttila2009-08-281-4/+1
| * Various small fixes and cleanups for symbian qmake generator.Janne Anttila2009-08-287-43/+48
| * Bug fix for store_build target when using subdirs project template.Janne Anttila2009-08-271-2/+4
| * Fixed createpackage.bat params to be more consistent with make targets.Janne Anttila2009-08-272-5/+12
| * Added support for 'make sisx' target in Symbian OS.Janne Anttila2009-08-277-4/+118
| * Support for template PKG file.Janne Anttila2009-08-275-123/+165
| * Make fluidlauncher sis generation work with -no-script configurationMiikka Heikkinen2009-08-261-13/+9
* | doc: Fixed several qdoc errors.Martin Smith2009-08-285-17/+35
* | Merge branch '4.6' of scm.dev.nokia.troll.no:qt/qt into 4.6Prasanth Ullattil2009-08-28575-1200/+21834
|\ \
| * | QScriptContextInfo: fix the line numbers with JITOlivier Goffart2009-08-282-5/+19
| * | QScriptEngine: Remove one superflous stackframe for native call made by JITOlivier Goffart2009-08-281-1/+7
| * | Fix QtOpenGL autotestTom Cooksey2009-08-281-5/+5
| * | Runtime warning about non existing "zRotation" property in examples/states.Gabriel de Dietrich2009-08-281-30/+30
| * | Merge branch '4.6' of git:qt/qt into 4.6Thiago Macieira2009-08-2814-50/+380
| |\ \
| | * | Q_ASSERT failure in QStateMachinePrivate::handleTransitionSignal.Gabriel de Dietrich2009-08-286-1/+72
| | * | Documentation of QAbstractProxyModel::resetOlivier Goffart2009-08-281-3/+2
| | * | Fix the API for resetting QAbstractItemModels.Stephen Kelly2009-08-287-37/+290
| | * | QAbstractAnimation: replacing QPointer usage for QWeakPointerLeonardo Sobral Cunha2009-08-281-12/+19
| * | | Merge branch '4.5' into 4.6Thiago Macieira2009-08-28556-1109/+21393
| |\ \ \ | | |/ / | |/| |
| | * | Fix parsing of Subject Alternate Names in Qt.Thiago Macieira2009-08-283-1/+105
| | * | Add missing license headers.Jason McDonald2009-08-28433-13/+17758
| | * | Add missing license headers.Jason McDonald2009-08-2812-55/+516
| | * | Add missing license headers.Jason McDonald2009-08-2869-2/+2831
| | * | Add missing license headers.Jason McDonald2009-08-2822-71/+812
| | * | Fix more duplicated license headers.Jason McDonald2009-08-2845-1804/+41
* | | | Do not set window tile from IOleInPlaceUIWindow::SetActiveObject()Prasanth Ullattil2009-08-281-3/+4
|/ / /
* | | Fix crash in backingstore when QWidget::paintEngine() returns 0Prasanth Ullattil2009-08-281-2/+2
* | | QNAM HTTP Code: Do not cache Date headerMarkus Goetz2009-08-281-0/+6
* | | QNAM HTTP Code: HTTP/1.0 has implicit connection closeMarkus Goetz2009-08-281-2/+5
* | | doc: Change some uses of \reimp to \internal.Martin Smith2009-08-282-10/+6
* | | doc: Fixed a qdoc missing link error.Martin Smith2009-08-281-1/+1
* | | Merge branch 'inputPanelExample' into 4.6axis2009-08-2813-8/+1227
|\ \ \
| * | | Corrected a few spelling mistakes and a misplaced code section.axis2009-08-281-3/+3
| * | | Doc: Updated project files and Qt Demo XML to include the example.David Boddie2009-08-283-0/+10
| * | | Doc: First review of the input panel example.David Boddie2009-08-283-50/+87
| * | | Added an example documenting how to make a software input panel.axis2009-08-2810-0/+1172
* | | | Compile with Qt-in-a-namepsace.Morten Sørvig2009-08-284-12/+21
* | | | Doc: 10.6 Snow Leopard does not support ppc-64.Morten Sørvig2009-08-281-3/+5
* | | | Remove unnecessary static_cast in QDirectFBScreenAnders Bakken2009-08-281-1/+1
* | | | Make lockSurface take a real enumAnders Bakken2009-08-282-3/+3
* | | | Add an autotest for qmake's include functionKeith Isdale2009-08-288-0/+61
* | | | Define highp to mediump on OpenGL/ES systems that don't have highpRhys Weatherley2009-08-271-0/+15
* | | | Remove extraneous semi-colonsRhys Weatherley2009-08-272-3/+3
* | | | Rearrange ifdefsAnders Bakken2009-08-271-3/+1
* | | | Merge branch '4.6' of git@scm.dev.nokia.troll.no:qt/qt into 4.6David Boddie2009-08-27125-511/+3640
|\ \ \ \
| * | | | QAbstractAnimation: fixes segfault when deleting animation inside updateCurre...Leonardo Sobral Cunha2009-08-273-13/+68
| * | | | work around a compiler bug (gcc <= 4.0.x) that renders the drop-in versionhjk2009-08-271-0/+6