summaryrefslogtreecommitdiffstats
path: root/src
Commit message (Collapse)AuthorAgeFilesLines
* Fixed compile failure when running make with large -j.Rohan McGovern2009-09-281-0/+1
| | | | | | | | | | `ld: library not found for -lQtOpenGL' ... in opengl graphicssystem. Must build QtOpenGL before the GL graphicssystem plugin. Reviewed-by: brad
* Animations: updateCurrentTime now receives the currentTime as paramaterThierry Bastian2009-09-2810-18/+18
| | | | Reviewed-by: Leo
* Merge branch '4.6' of git@scm.dev.nokia.troll.no:qt/qt into 4.6Sami Merilä2009-09-281-5/+15
|\
| * Impossible to interact with the year on QCalendarWidget on GraphicsViewThierry Bastian2009-09-281-5/+15
| | | | | | | | | | | | | | | | | | The problem is that it is using mapToGlobal to translate a mouse position andthat doesn't work well when the widget is mebedded inside graphics view. Task-number: QT-2218 Reviewed-by: Bjoern Erik Nilsen
* | Triggering softkey action for disbled widget causes a crash.Sami Merilä2009-09-282-2/+6
|/ | | | | | | | | | Softkey actions need to copy enable state from action widget to prevent crash when action is triggered and action widget is disabled. OPEN: dynamically setting enable state for softkey actions. Task-number: QT-2117 Reviewed-by: Jason Barron
* Merge branch '4.6' of git@scm.dev-nokia.troll.no:qt/qt into 4.6Andreas Aardal Hanssen2009-09-282-1/+3
|\
| * Fix qdoc errorJason McDonald2009-09-281-1/+1
| | | | | | | | Reviewed-by: Trust Me
| * Merge branch '4.6' of git@scm.dev.nokia.troll.no:qt/qt into 4.6Jason McDonald2009-09-282-4/+4
| |\
| * | Fix qdoc errorsJason McDonald2009-09-281-0/+2
| | | | | | | | | | | | Reviewed-by: Trust Me
* | | Merge commit 'origin/4.5' into 4.6Andreas Aardal Hanssen2009-09-285-213/+11
|\ \ \ | |_|/ |/| | | | | | | | | | | | | | | | | | | | Reviewed-by: Joao Conflicts: src/gui/graphicsview/qgraphicsview.cpp src/gui/widgets/qspinbox.cpp tests/auto/qgraphicsview/tst_qgraphicsview.cpp
| * | QGraphicsItem with parent flag ItemClipsChildrenToShape not visibleAndreas Aardal Hanssen2009-09-281-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Regression against Qt 4.4. Children of items with ItemClipsChildrenToShape would only be discovered if the view's expose region contained the outer bounding rect of all items, _if_ there was at least one item in the scene that enabled ItemIgnoresTransformations. The reason for this bug is that the presence of an untransformable item causes the item lookups to go through a different path (QGraphicsViewPrivate::itemsInArea()). This function had the bug that it didn't correctly discover children of clip-items. Because of this, in the provided test case you could "work around" the bug by either removing the clip flag, or the transformation flag. Task-number: QTBUG-4151 Reviewed-by: Alexis
| * | Cocoa: Fix build cocoa port with namespaceRichard Moe Gustavsen2009-09-282-2/+3
| | | | | | | | | | | | | | | | | | This fix just fixes up coding bugs here and there Reviewed-by: Brad
| * | Doc: fixed typo in QTabBar::tabRect() docsStian Sandvik Thomassen2009-09-281-1/+1
| | |
| * | Fixes a crash in QDoubleSpinBoxJoão Abecasis2009-09-251-210/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Removing dubious intermediate detection code that also had a buffer overflow. The results were inconsistent and not dependable on. Processing was inefficient and end value to user experience dubious. Test cases that abused the former behaviour were changed to consider input in an Intermediate where it was previously considered Invalid. With this change, user input will mostly be considered in an intermediate state, until it is effectively validated. Task-number: 255019 Reviewed-by: Anders Bakken
| * | QHostAddress: Clarification about DNSMarkus Goetz2009-09-251-0/+3
| | | | | | | | | | | | Task-number: QT-1683
* | | Updated JavaScriptCore from /home/khansen/dev/qtwebkit to ↵Kent Hansen2009-09-282-4/+4
| |/ |/| | | | | jsc-for-qtscript-4.6-staging-28092009 ( b98dec961e9389ddd5e10d7c4086de9a297cb984 )
* | Merge branch '4.6' of git@scm.dev.nokia.troll.no:qt/qt into 4.6Jason McDonald2009-09-2828-237/+133
|\ \
| * | Deep copy QImage based on non-owned data so we can safely store themGunnar Sletta2009-09-281-2/+11
| | | | | | | | | | | | Reviewed-by: Samuel
| * | Make QSignalEvent and QWrappedEvent inner classes of QStateMachineKent Hansen2009-09-2810-213/+78
| | | | | | | | | | | | | | | | | | | | | | | | | | | Those two classes are specific to the state machine framework, but their names were so generic that we felt they were polluting the Q-namespace. They are now QStateMachine::SignalEvent and QStateMachine::WrappedEvent. Reviewed-by: Eskil Abrahamsen Blomfeldt
| * | Fixed unwanted recursion when calling openGLVersionFlags().Kim Motoyoshi Kalland2009-09-281-1/+2
| | | | | | | | | | | | Reviewed-by: Gunnar
| * | Remove doc warning about UpdateSoftKeys.Jason Barron2009-09-281-0/+1
| | | | | | | | | | | | | | | | | | | | | | | | qdoc was giving attitude about this undocumented event type so mark it as omitted in the documentation. Task-number: QTBUG-4601 Reviewed-by: TrustMe
| * | QEventLoop::ExcludeUserInputEvents should not allow the user to close the windowBradley T. Hughes2009-09-283-3/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | These types of input events are not handled by the normal mouse and key event handlers on X11 and Windows. Add special cases for them to make sure that they are not delivered while ExcludeUserInputEvents is set. Task-number: QTBUG-4242 Reviewed-by: Simon Hausmann
| * | Fixed qsharedpointer auto test build break for Symbian OS.Janne Anttila2009-09-281-1/+1
| | | | | | | | | | | | | | | | | | | | | RVCT has problems with scoping, the similar workaround has been used in qhash.h also. Reviewed-by: Janne Koskinen
| * | compile fix with namespaced qthjk2009-09-287-11/+15
| | | | | | | | | | | | Reviewed-by: Simon Hausmann
| * | compile fix with namespacehjk2009-09-282-0/+9
| | | | | | | | | | | | Reviewed-by: sroedal
| * | Make sure the correct soft key is triggered.Jason Barron2009-09-281-3/+9
| | | | | | | | | | | | | | | | | | | | | | | | | | | In cases where there are both softkey actions as well as "normal" actions, we need to be sure to skip over the none softkey actions since they should not be a part of the softkey framework and the 'index' will be out of sync. Reviewed-by: Sami Merila
| * | doc: Fixed three /sa that should be \saThorbjørn Lindeijer2009-09-283-3/+3
| | |
* | | Fix qdoc error.Jason McDonald2009-09-281-1/+1
|/ / | | | | | | Reviewed-by: Trust Me
* | Fix qdoc error.Jason McDonald2009-09-281-1/+1
| | | | | | | | Reviewed-by: Trust Me
* | Merge branch '4.6' of git@scm.dev.nokia.troll.no:qt/qt into 4.6Jason McDonald2009-09-287-11/+113
|\ \
| * | Make sure signal handlers are installed on QWSPaul Olav Tvete2009-09-281-1/+5
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | QWS already installs message handlers, and this would cause testlib not to install its own handler, causing lots of extra test failures if there is a crash. The proper way would be to make testlib invoke previous handlers, but the quick and easy fix is just to forget about the old ones. The rationale is that the worst thing that can happen is that it will cause a crash, and that was going to happen anyway. Reviewed-by: Jeremy
| * | JavaScriptCore compile fix for Windows CE on ARMJoerg Bornemann2009-09-281-1/+2
| | | | | | | | | | | | Reviewed-by: Simon Hausmann
| * | JavaScriptCore compile fix for Windows CE on ARMJoerg Bornemann2009-09-281-1/+2
| | | | | | | | | | | | Reviewed-by: Simon Hausmann
| * | Suppress some compiler warnings that occur under OpenGL/ES 2.0Rhys Weatherley2009-09-282-0/+6
| | | | | | | | | | | | Reviewed-by: trustme
| * | QGLContext::drawTexture() is not supported under OpenGL/ES 2.0Rhys Weatherley2009-09-281-2/+15
| | | | | | | | | | | | Reviewed-by: trustme
| * | ifdef out convolution filter for OpenGL/ES 2.0Rhys Weatherley2009-09-281-2/+14
| | | | | | | | | | | | | | | | | | | | | | | | Convolution filter is not compatible with OpenGL/ES 2.0 in its current form, and we probably don't need it now that we have a special-purpose blur filter. Reviewed-by: trustme
| * | Make the GL graphics system work under OpenGL/ES 2.0Rhys Weatherley2009-09-281-4/+69
| | | | | | | | | | | | | | | | | | | | | Very basic port of the graphics system - performance may not be the best just yet. Reviewed-by: Sarah Smith
* | | Fix qdoc errors.Jason McDonald2009-09-281-5/+6
|/ / | | | | | | Reviewed-by: Trust Me
* | Merge branch '4.6' of git@scm.dev.nokia.troll.no:qt/qt into 4.6Rhys Weatherley2009-09-281-4/+0
|\ \
| * | Removed stateChanged and notify signals from win32 qaudiooutput builtin.Kurt Korbatits2009-09-271-4/+0
| | | | | | | | | | | | | | | | | | stateChanged and notify signals are inherited from base class. Reviewed-by:Bill King
* | | qdoc fixes to QGLFramebufferObject::blitFramebuffer()Rhys Weatherley2009-09-281-6/+11
|/ /
* | Merge branch '4.6' of scm.dev.nokia.troll.no:qt/qt into 4.6Jeremy Katz2009-09-2518-106/+368
|\ \
| * | Doc: Added some notes to help people implement custom models.David Boddie2009-09-251-3/+9
| | | | | | | | | | | | Reviewed-by: Trust Me
| * | Doc: Added a note about Phonon.David Boddie2009-09-251-0/+4
| | | | | | | | | | | | Reviewed-by: Trust Me
| * | Fixed crash with QPixmap::fill() when pixmap is painted to using opengl1Gunnar Sletta2009-09-251-9/+17
| | | | | | | | | | | | Reviewed-by: Samuel
| * | Move selfsigned cert & key out of root directoryShane Kearns2009-09-252-0/+31
| | | | | | | | | | | | | | | | | | | | | | | | Moved the certificate/key to the src/s60installs path. Updated createpackage.pl to look in this new location. Task-number: QTBUG-4553 Reviewed-by: axis
| * | Merge branch '4.6' of git@scm.dev.troll.no:qt/qt into 4.6Janne Anttila2009-09-2510-85/+300
| |\ \
| | * | Replacing QPointer usage with QWeakPointer in statemachineLeonardo Sobral Cunha2009-09-253-7/+7
| | | | | | | | | | | | | | | | Reviewed-by: thierry
| | * | Use qDebug() instead of printf() when dumping the simplex matrix.Jan-Arve Sæther2009-09-251-12/+10
| | | | | | | | | | | | | | | | | | | | | | | | printf() does not work very well on windows, since it will not send the output to OutputDebugString(). This allows us to catch the output even if the program is configured without "CONFIG += console".
| | * | Merge branch '4.6' of git@scm.dev.troll.no:qt/qt into 4.6Miikka Heikkinen2009-09-258-51/+275
| | |\ \
generated by cgit v0.12 at 2025-02-08 21:35:34 (GMT)