summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Merge branch '4.6' of git@scm.dev.nokia.troll.no:qt/qt into 4.6mread2009-08-28589-1243/+21897
|\
| * doc: Fixed several qdoc errors.Martin Smith2009-08-286-21/+16
| |
| * 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
| | | | | | | | | | | | It even works better than with the interpreter
| | * QScriptEngine: Remove one superflous stackframe for native call made by JITOlivier Goffart2009-08-281-1/+7
| | | | | | | | | | | | | | | | | | | | | JIT does create stackframe while the interperer doesn't. So we would end up with one superflous stackframe Reviewed-by: Kent Hansen
| | * Fix QtOpenGL autotestTom Cooksey2009-08-281-5/+5
| | | | | | | | | | | | | | | | | | | | | The GL2 paint engine now has it's own class ID. This patch also reduces the excessive 2000ms delays to 200ms. :-) Reviewed-by: Trustme
| | * Runtime warning about non existing "zRotation" property in examples/states.Gabriel de Dietrich2009-08-281-30/+30
| | | | | | | | | | | | | | | | | | | | | Fixed by using the "rotation" property instead. Task-number: 260403 Reviewed-by: ogoffart
| | * 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
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The signal index actually emitted was different from the signal index registered. This was due to recent changes in the meta-object protocol, where new indexes are being created (cloned) for signals with default parameters. When registering the transition signal, we now look for the original (non cloned) signal index. The transition keeps track of the user-specified signal index, and sets it when calling onTransition. Reviewed-by: Kent Hansen Reviewed-by: Olivier Goffart Task-number: 260403
| | | * Documentation of QAbstractProxyModel::resetOlivier Goffart2009-08-281-3/+2
| | | | | | | | | | | | | | | | | | | | | | | | Rectification after the last merge request integration Reviewed-by: Thierry
| | | * Fix the API for resetting QAbstractItemModels.Stephen Kelly2009-08-287-37/+290
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This commit deprecates the QAIM::reset() method, and adds beginResetModel() and endResetModel() methods, addressing Qt issue 247023. http://www.qtsoftware.com/developer/task-tracker/index_html?method=entry&id=247023 If models and proxies use QAIM::reset() alone, then proxies will emit modelAboutToBeReset after its source model is reset. This means that mapToSource will not behave as expected (Will always return an invalid index) in a slot connected to modelAboutToBeReset. The usecase for this is maintaining viewstate (which items are selected, expanded) when the model is reset. See BrowserWidget::modelChanged here: http://websvn.kde.org/trunk/KDE/kdepim/akonadi/akonadiconsole/browserwidget.cpp?view=markup Task-number: 247023 Reviewed-by: Olivier Goffart <ogoffart@trolltech.com> Merge-request: 1072
| | | * QAbstractAnimation: replacing QPointer usage for QWeakPointerLeonardo Sobral Cunha2009-08-281-12/+19
| | | | | | | | | | | | | | | | | | | | | | | | Added guard checks after the virtual method calls. Reviewed-by: thierry
| | * | Merge branch '4.5' into 4.6Thiago Macieira2009-08-28556-1109/+21393
| | |\ \ | | | |/ | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: config.tests/unix/opengles2/opengles2.cpp tests/auto/linguist/lupdate/testdata/recursivescan/bar.ts.result tests/auto/linguist/lupdate/testdata/recursivescan/foo.ts.result tests/auto/linguist/lupdate/testdata/recursivescan/project.ui tests/auto/linguist/lupdate/testdata/recursivescan/sub/finddialog.cpp tests/auto/windowsmobile/test/ddhelper.cpp tests/auto/windowsmobile/testQMenuBar/main.cpp tests/auto/xmlpatternsxqts/lib/ASTItem.cpp tests/auto/xmlpatternsxqts/lib/DebugExpressionFactory.cpp tests/auto/xmlpatternsxqts/lib/ErrorHandler.cpp tests/auto/xmlpatternsxqts/lib/ErrorItem.cpp tests/auto/xmlpatternsxqts/lib/ExpressionInfo.cpp tests/auto/xmlpatternsxqts/lib/ExpressionNamer.cpp tests/auto/xmlpatternsxqts/lib/ExternalSourceLoader.cpp tests/auto/xmlpatternsxqts/lib/Global.cpp tests/auto/xmlpatternsxqts/lib/ResultThreader.cpp tests/auto/xmlpatternsxqts/lib/TestBaseLine.cpp tests/auto/xmlpatternsxqts/lib/TestCase.cpp tests/auto/xmlpatternsxqts/lib/TestContainer.cpp tests/auto/xmlpatternsxqts/lib/TestGroup.cpp tests/auto/xmlpatternsxqts/lib/TestResult.cpp tests/auto/xmlpatternsxqts/lib/TestResultHandler.cpp tests/auto/xmlpatternsxqts/lib/TestSuite.cpp tests/auto/xmlpatternsxqts/lib/TestSuiteHandler.cpp tests/auto/xmlpatternsxqts/lib/TestSuiteResult.cpp tests/auto/xmlpatternsxqts/lib/TreeItem.cpp tests/auto/xmlpatternsxqts/lib/TreeModel.cpp tests/auto/xmlpatternsxqts/lib/Worker.cpp tests/auto/xmlpatternsxqts/lib/XMLWriter.cpp tests/auto/xmlpatternsxqts/lib/XQTSTestCase.cpp tests/auto/xmlpatternsxqts/lib/XSLTTestSuiteHandler.cpp tests/benchmarks/qgraphicswidget/tst_qgraphicswidget.cpp tools/linguist/tests/data/main.cpp tools/linguist/tests/tst_linguist.cpp tools/linguist/tests/tst_lupdate.cpp tools/linguist/tests/tst_simtexth.cpp util/qlalr/examples/dummy-xml/ll/dummy-xml-ll.cpp util/qlalr/examples/lambda/main.cpp util/qlalr/examples/qparser/qparser.cpp
| | | * Fix parsing of Subject Alternate Names in Qt.Thiago Macieira2009-08-283-1/+105
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Simple misuse of QLatin1String. Use QString::fromLatin1 instead and avoid the QByteArray temporary. Reviewed-by: Andreas Aardal Hanssen Tracking: CVE-2009-2700
| | | * Add missing license headers.Jason McDonald2009-08-28433-13/+17758
| | | | | | | | | | | | | | | | Reviewed-by: Trust Me
| | | * Add missing license headers.Jason McDonald2009-08-2812-55/+516
| | | | | | | | | | | | | | | | Reviewed-by: Trust Me
| | | * Add missing license headers.Jason McDonald2009-08-2869-2/+2831
| | | | | | | | | | | | | | | | Reviewed-by: Trust Me
| | | * Add missing license headers.Jason McDonald2009-08-2822-71/+812
| | | | | | | | | | | | | | | | Reviewed-by: Trust Me
| | | * Fix more duplicated license headers.Jason McDonald2009-08-2845-1804/+41
| | | | | | | | | | | | | | | | Reviewed-by: Trust Me
| * | | Do not set window tile from IOleInPlaceUIWindow::SetActiveObject()Prasanth Ullattil2009-08-281-3/+4
| |/ / | | | | | | | | | | | | | | | | | | | | | | | | MSDN docs suggest that all containers ignore the object name parameter passed in this function. The tiltebar should always be set by the container application. Task-number: 204674 Reviewed-by: Trust Me
| * | Fix crash in backingstore when QWidget::paintEngine() returns 0Prasanth Ullattil2009-08-281-2/+2
| | | | | | | | | | | | Reviewed-by: Samuel
| * | QNAM HTTP Code: Do not cache Date headerMarkus Goetz2009-08-281-0/+6
| | | | | | | | | | | | | | | | | | | | | | | | The caching of this ever-changing header caused disk re-writes even if not necessary because the actual HTTP entity did not change. Task-number: 259961 Rev-By: Peter Hartmann
* | | Deleting the CFontStore without a crashmread2009-08-283-5/+19
| | | | | | | | | | | | | | | | | | | | | CFontStore deletion crashes if there are any open fonts in it. These are now all deleted before the store is deleted. Reviewed-by: aportale
* | | Fix for "Undefined symbol typeinfo for std::exception" in armv5 buildmread2009-08-281-0/+1
|/ / | | | | | | | | | | | | | | | | | | It seems that the use of QT_TRYCATCH_LEAVING, which expands to ...catch(const std::exception&)... requires access to the typeinfo for std::exception. This cannot be found in any import library (probably an OpenC defect). But this workaround creates the necessary info for the link. Otherwise this change has no effect. Reviewed-by: jbarron
* | QNAM HTTP Code: HTTP/1.0 has implicit connection closeMarkus Goetz2009-08-281-2/+5
| | | | | | | | Reviewed-by: TrustMe
* | 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
| | | | | | | | | | | | RevBy: Trust me
| * | 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
| | | | | | | | | | | | | | | | | | RevBy: David Boddie David's fixes are in the next two commits.
* | | 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
| | | | | | | | | | | | Reviewed-by: TrustMe
* | | Make lockSurface take a real enumAnders Bakken2009-08-282-3/+3
| | | | | | | | | | | | Reviewed-by: TrustMe
* | | Add an autotest for qmake's include functionKeith Isdale2009-08-288-0/+61
| | | | | | | | | | | | | | | | | | | | | | | | qmake's include function has been changed in 4.6.x and later to warn,by default, if the specified file does not exist. It is possible to ignore missing .pri files, eg include(SomeOptionalFile.pri, "", true); Reviewed-by: Rohan McGovern
* | | Define highp to mediump on OpenGL/ES systems that don't have highpRhys Weatherley2009-08-271-0/+15
| | | | | | | | | | | | Reviewed-by: Tom Cooksey
* | | Remove extraneous semi-colonsRhys Weatherley2009-08-272-3/+3
| | | | | | | | | | | | Reviewed-by: trustme
* | | Rearrange ifdefsAnders Bakken2009-08-271-3/+1
| | | | | | | | | | | | Reviewed-by: Donald Carr <donald.carr@nokia.com>
* | | 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 ↵Leonardo Sobral Cunha2009-08-273-13/+68
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | updateCurrentTime That deletion removed the respective animation from the list of running animations being processed, but not from the copy of the list introduced in 48489988521b818bda8d76e60cb272508e91b490, thus we had a dangling pointer. Reviewed-by: thierry
| * | | work around a compiler bug (gcc <= 4.0.x) that renders the drop-in versionhjk2009-08-271-0/+6
| | | | | | | | | | | | | | | | | | | | | | | | of QStringBuilder incompilable Reviewed-by: Roberto Raggi
| * | | Merge branch '4.6'Thiago Macieira2009-08-27327-6040/+11275
| |\ \ \ | | | | | | | | | | | | | | | | | | | | Conflicts: src/opengl/gl2paintengineex/qpaintengineex_opengl2.cpp
| | * \ \ Merge branch '4.6' of git:qt/qt into 4.6Thiago Macieira2009-08-271-0/+114
| | |\ \ \
| | | * | | Add an autotest to check reparenting a QGLWidget worksTom Cooksey2009-08-271-0/+68
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | If this is broken it will usually seg-fault, but there's a few checks in there just to make sure. Reviewed-by: Samuel
| | | * | | Add an autotest to check rendering to a QGLWidget worksTom Cooksey2009-08-271-0/+46
| | | | | | | | | | | | | | | | | | | | | | | | Reviewed-by: Samuel
| | * | | | Merge branch '4.5' into 4.6Thiago Macieira2009-08-2786-206/+2643
| | |\ \ \ \ | | | |/ / / | | |/| | / | | | | |/ | | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: tests/auto/linguist/lupdate/testdata/good/backslashes/project.ts.result tests/auto/linguist/lupdate/testdata/good/lacksqobject/expectedoutput.txt tests/auto/linguist/lupdate/testdata/good/mergecpp_noobsolete/finddialog.cpp tests/auto/linguist/lupdate/testdata/good/mergecpp_noobsolete/project.ts.result tests/auto/linguist/lupdate/testdata/good/mergecpp_obsolete/finddialog.cpp tests/auto/linguist/lupdate/testdata/good/mergecpp_obsolete/project.ts.result tests/auto/linguist/lupdate/testdata/good/parsecpp/finddialog.cpp tests/auto/qcombobox/tst_qcombobox.cpp tests/auto/xmlpatternsview/view/FunctionSignaturesView.cpp tests/auto/xmlpatternsview/view/MainWindow.cpp tests/auto/xmlpatternsview/view/TestCaseView.cpp tests/auto/xmlpatternsview/view/TestResultView.cpp tests/auto/xmlpatternsview/view/TreeSortFilter.cpp tests/auto/xmlpatternsview/view/UserTestCase.cpp tests/auto/xmlpatternsview/view/XDTItemItem.cpp tests/auto/xmlpatternsview/view/main.cpp tests/auto/xmlpatternsxqts/lib/ASTItem.h tests/auto/xmlpatternsxqts/lib/DebugExpressionFactory.h tests/auto/xmlpatternsxqts/lib/ExpressionNamer.h tests/auto/xmlpatternsxqts/lib/ExternalSourceLoader.h tests/auto/xmlpatternsxqts/lib/Global.h tests/auto/xmlpatternsxqts/lib/ResultThreader.h tests/auto/xmlpatternsxqts/lib/TestBaseLine.h tests/auto/xmlpatternsxqts/lib/TestCase.h tests/auto/xmlpatternsxqts/lib/TestResult.h tests/auto/xmlpatternsxqts/lib/TestResultHandler.h tests/auto/xmlpatternsxqts/lib/TestSuiteHandler.h tests/auto/xmlpatternsxqts/lib/Worker.h tests/auto/xmlpatternsxqts/lib/XMLWriter.h tests/auto/xmlpatternsxqts/lib/XQTSTestCase.h
| | | * | QSslSocket: Clarified doc about QSslSocket::systemCaCertificatesMarkus Goetz2009-08-271-4/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This function only returns the certificates bundled with Qt. Reviewed-by: TrustMe
generated by cgit v0.12 at 2025-08-25 17:29:37 (GMT)