summaryrefslogtreecommitdiffstats
path: root/src
Commit message (Collapse)AuthorAgeFilesLines
* Re-enabled the QPixmap cleanup hooks in QPixmap destructor.Trond Kjernåsen2009-08-281-0/+2
| | | | Reviewed-by: Gunnar
* Fixed QGLWidget::renderText() when using the GL 2 paint engine.Trond Kjernåsen2009-08-284-23/+108
| | | | | | | | | QGLWidget::renderText() needs to respect the current depth and scissor tests that the user has set. Therefore we needs some special casing in the GL 2 paint engine to handle the custom depth testing. The private setRenderTextActive() has been added for this purpose. Reviewed-by: Samuel
* Fixed a problem where the InvertedYBindOption was always removed.Trond Kjernåsen2009-08-281-1/+1
| | | | Reviewed-by: Samuel
* Enable Q_OBJECT usage across DLL boundary on Symbian OSShane Kearns2009-08-284-7/+44
| | | | | | | | | | | | | | | | Symbian loader does not allow DLL import relocations in the data section. To workaround this, added an accessor function which can be used to get the class static metadata from the base class even if it is in another DLL. Changing the implementation for all platforms would cause a binary break, so it is only used for Symbian. The Q_NO_DATA_RELOCATION macro is used to configure this feature instead of Q_OS_SYMBIAN, because it is possible another platform may need the same fix and Symbian may eventually fix their DLL loader to support this feature. Task-number: 258893 Reviewed-by: Kent Hansen
* doc: Fixed several qdoc errors.Martin Smith2009-08-281-2/+2
|
* Whitespaces & indentation cleanup in qobjectLeonardo Sobral Cunha2009-08-282-26/+27
| | | | Reviewed-by: trustme
* Fixed runtime warning in tst_QGraphicsProxyWidget::childPos.Gabriel de Dietrich2009-08-281-2/+2
| | | | | | | ungrabKeyboard was called on an item without checking whether it was a keyboard grabber. Reviewed-by: bnilsen
* Added some information to QGLFramebufferObject documentationSamuel Rødal2009-08-281-4/+4
| | | | Reviewed-by: Trond
* Merge branch '4.6' of git@scm.dev.nokia.troll.no:qt/qt into 4.6David Boddie2009-08-2847-154/+344
|\
| * Merge branch '4.6' of git@scm.dev.troll.no:qt/qt into 4.6Janne Anttila2009-08-287-48/+97
| |\
| | * doc: Fixed several qdoc errors.Martin Smith2009-08-281-31/+45
| | |
| | * QTabBar: Add ability to change the position of the close button in the ↵Olivier Goffart2009-08-281-0/+12
| | | | | | | | | | | | | | | | | | | | | stylesheet Task-number: 241383 Reviewed-by: jbache
| | * QTabBar: Being able to change the close button appearence in the stylesheetOlivier Goffart2009-08-281-3/+11
| | | | | | | | | | | | | | | Reviewed-by: jbache Task-number: 241383
| | * doc: Fixed several qdoc errors.Martin Smith2009-08-281-9/+9
| | |
| | * Merge branch '4.6' of git@scm.dev.nokia.troll.no:qt/qt into 4.6mread2009-08-2826-68/+185
| | |\
| | * | 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
| * | | Merge branch '4.6' of git@scm.dev.troll.no:qt/qt into 4.6Janne Anttila2009-08-286-21/+16
| |\ \ \ | | | |/ | | |/|
| | * | doc: Fixed several qdoc errors.Martin Smith2009-08-286-21/+16
| | | |
| * | | Merge branch 'master' into 4.6Janne Anttila2009-08-282-3/+5
| |\ \ \ | | |/ / | |/| |
| | * | Various small fixes and cleanups for symbian qmake generator.Janne Anttila2009-08-282-3/+5
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The included fixes / cleanups: - QtLibs PKG filename changed - Component name in Qt libs pkg changed to "Qt for S60" * Done in order to make SISX upgrade possible after pre-release. - Removed passing of 'fixedTarget' member variable as an argument - Removed whitespaces from generated file names - Fixed 'make sisx' calling syntax when custom makefile name used - Fixed MAKEFILE variable content in generated makefiles - Changed names of environment variables used by 'make sisx' * Nee variables have 'QT_SISX_' prefix Reviewed-By: Miikka Heikkinen
| * | | 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-2812-25/+122
| |\ \ \
| | * | | QScriptContextInfo: fix the line numbers with JITOlivier Goffart2009-08-281-3/+11
| | | | | | | | | | | | | | | | | | | | 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
| | * | | Q_ASSERT failure in QStateMachinePrivate::handleTransitionSignal.Gabriel de Dietrich2009-08-285-1/+30
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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-284-8/+56
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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
| * | | | 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
| * | 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-281-4/+0
| | |
| * | Merge branch 'inputPanelExample' into 4.6axis2009-08-281-8/+9
| |\ \
| | * | Doc: First review of the input panel example.David Boddie2009-08-281-8/+9
| | | |
| * | | Compile with Qt-in-a-namepsace.Morten Sørvig2009-08-284-12/+21
| | | |
| * | | 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
| * | | 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>
* | | | Doc: Added some information about the clipping applied in paint events.David Boddie2009-08-281-1/+10
|/ / / | | | | | | | | | | | | Task-number: 203483 Reviewed-by: Trust Me
* | | Merge branch '4.6' of git@scm.dev.nokia.troll.no:qt/qt into 4.6David Boddie2009-08-2733-283/+636
|\ \ \
| * | | QAbstractAnimation: fixes segfault when deleting animation inside ↵Leonardo Sobral Cunha2009-08-272-9/+19
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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-27151-4593/+5774
| |\ \ \ | | | | | | | | | | | | | | | | | | | | Conflicts: src/opengl/gl2paintengineex/qpaintengineex_opengl2.cpp
| | * \ \ Merge branch '4.5' into 4.6Thiago Macieira2009-08-273-8/+22
| | |\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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
| | | * | | QImageReader via JPEG image load plugin fails to load correctly a CMYKKeith Isdale2009-08-271-1/+10
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | encoded JPEG CMKY encoded JPEG code missing from scaled image JPEG loading Task-number: 260192 Reviewed-by: Stian Sandvik Thomassen
generated by cgit v0.12 at 2025-03-24 07:41:05 (GMT)