summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Remove unused codeEskil Abrahamsen Blomfeldt2010-02-041-7/+0
| | | | | Removed an commented-out, empty functions which was previously there for testing purposes.
* Merge branch '4.6' of git@scm.dev.nokia.troll.no:qt/oslo-staging-2 into ↵Eskil Abrahamsen Blomfeldt2010-02-04173-738/+31174
|\ | | | | | | qstatictext-4.6
| * Merge remote branch 'staging/4.6' into 4.6Samuel Rødal2010-02-0442-273/+970
| |\ | | | | | | | | | | | | | | | | | | Manual resolve of conflict in changes-4.6.2 in staging-2. Conflicts: dist/changes-4.6.2
| | * Fix the QAbstractSlider autotest.Olivier Goffart2010-02-041-2/+0
| | | | | | | | | | | | This reverts part of commit d53315d30b38352db11063096ee3867a40bdc234.
| | * Merge commit 'origin/4.6' into 4.6-oslo2Rohan McGovern2010-02-0410-37/+112
| | |\ | | | | | | | | | | | | | | | | Conflicts: dist/changes-4.6.2
| | * | Use OpenVG scissor on 90/180/270 rotations and simple clips.Rhys Weatherley2010-02-041-7/+23
| | | | | | | | | | | | | | | | | | | | Task-number: QTBUG-7864 Reviewed-by: Sarah Smith
| | * | Optimize single-rect IntersectClip in OpenVG using the scissorRhys Weatherley2010-02-041-4/+42
| | | | | | | | | | | | | | | | | | | | Task-number: QTBUG-7791 Reviewed-by: Sarah Smith
| | * | QGraphicsWidget is painted twice on the first show.Bjørn Erik Nilsen2010-02-032-1/+33
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | We want to discard all update requests when we there's a full update pending. The problem was that 'updateAll' was reset too early causing update requests to fall through. To prevent this from happening we reset 'updateAll' right before the items are actually painted. Auto-test included. Task-number: QTBUG-6956
| | * | Merge branch '4.6' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into ↵Qt Continuous Integration System2010-02-0340-261/+870
| | |\ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 4.6-integration * '4.6' of scm.dev.nokia.troll.no:qt/oslo-staging-2: (29 commits) Compiler warning in QAbstractSlider. Optimize QPathClipper::pathToRect. QGraphicsScene: Use QPainter::setClipRect instead of setClipPath if possible. QStyleSheetStyle: Fix combinaison of border-image and border-radius Revert "QAbstractScrollArea: Wheel over a scrollarea that has only one horizontal scrollbar" Proper Fav icon is not shown, for all the links default fav icon shown Update changes-4.6.2. Make DSFLIP_ONSYNC part of the default flip flags. Fixed a failure in tst_qgl. 4.6.2 changes Avoids a possible crash when saving the state of a main window Implemented QGifHandler::imageCount(). Fixed compilation of the GL2 engine for OpenGL ES 2. fix whitespace Document that QModelIndex::child does not work for the root item Fixed missing textures in the boxes demo. Fix QTBUG_7714_fullUpdateDiscardingOpacityUpdate2 autotest in qws-linux Assert failure when setting a widget focus proxy as its successor in tab order Fixed garbled 3D Qt logo in the overpainting example. fix crash in Phonon::DS9 backend ...
| | | * | Compiler warning in QAbstractSlider.Bjørn Erik Nilsen2010-02-031-2/+2
| | | | |
| | | * | Merge branch '4.6' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into 4.6Jan-Arve Sæther2010-02-039-109/+80
| | | |\ \
| | | | * | Optimize QPathClipper::pathToRect.Bjørn Erik Nilsen2010-02-031-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Patch speaks for itself :-) Reviewed-by: samuel
| | | | * | QGraphicsScene: Use QPainter::setClipRect instead of setClipPath if possible.Bjørn Erik Nilsen2010-02-033-6/+18
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Using QPainter::setClipPath results in complex (and slow) alphamasking so this must be avoided if possible. Task-number: QTBUG-7790 Reviewed-by: samuel
| | | | * | QStyleSheetStyle: Fix combinaison of border-image and border-radiusOlivier Goffart2010-02-032-0/+46
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Regression since b4d642e639eabde5d72a4 Task-number: QTBUG-7737 Reviewed-by: Gabriel
| | | | * | Revert "QAbstractScrollArea: Wheel over a scrollarea that has only one ↵Olivier Goffart2010-02-034-102/+11
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | horizontal scrollbar" This reverts commit 46a3e518b3070cf7cb4cbbb2cb58254454cf169d. This shown to cause more problem than it solved Also update the changelog Reviewed-by: Thierry
| | | | * | Update changes-4.6.2.Samuel Rødal2010-02-031-0/+4
| | | | | |
| | | * | | Proper Fav icon is not shown, for all the links default fav icon shownSakari Peltomäki2010-02-032-0/+27
| | | |/ / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Added two functions on QtIcoHandler(inherited from QImageIOHandler): bool supports Option(ImageOption option) const QVariant option(ImageOption option) const implementation of these functions make possible to open fav.ico eg. via web browser. (if using fav.ico icons via webkit, browser should initialize webcore::icondatabase using QWebSettings::enablePersistentStorage() ) Merge-request: 2150 Reviewed-by: Jan-Arve Sæther <jan-arve.saether@nokia.com>
| | | * | Merge branch '4.6' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into ↵Qt Continuous Integration System2010-02-0331-150/+761
| | | |\ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 4.6-integration * '4.6' of scm.dev.nokia.troll.no:qt/oslo-staging-2: (22 commits) Make DSFLIP_ONSYNC part of the default flip flags. Fixed a failure in tst_qgl. 4.6.2 changes Avoids a possible crash when saving the state of a main window Implemented QGifHandler::imageCount(). Fixed compilation of the GL2 engine for OpenGL ES 2. fix whitespace Document that QModelIndex::child does not work for the root item Fixed missing textures in the boxes demo. Fix QTBUG_7714_fullUpdateDiscardingOpacityUpdate2 autotest in qws-linux Assert failure when setting a widget focus proxy as its successor in tab order Fixed garbled 3D Qt logo in the overpainting example. fix crash in Phonon::DS9 backend Don't crash when running Qt on KDE with Oxygen style. Fixes missing update when setting opacity on an item that had opacity 0.0 Avoids missing opacity updates by not propagating the ignoreOpacity flag Cleanup in graphicsitem autotest Adds convenience functions QGraphicsItemPrivate::isOpacityNull Fixed a crash when QPixmaps are destroyed after the ~QApplication. Fix GL texture leaks when pixmaps are deleted ...
| | | | * | Make DSFLIP_ONSYNC part of the default flip flags.Anders Bakken2010-02-021-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | Reviewed-by: Jervey Kong <jervey.kong@nokia.com>
| | | | * | Merge branch '4.6' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into ↵Qt Continuous Integration System2010-02-0230-149/+760
| | | | |\ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 4.6-integration * '4.6' of scm.dev.nokia.troll.no:qt/oslo-staging-2: (21 commits) Fixed a failure in tst_qgl. 4.6.2 changes Avoids a possible crash when saving the state of a main window Implemented QGifHandler::imageCount(). Fixed compilation of the GL2 engine for OpenGL ES 2. fix whitespace Document that QModelIndex::child does not work for the root item Fixed missing textures in the boxes demo. Fix QTBUG_7714_fullUpdateDiscardingOpacityUpdate2 autotest in qws-linux Assert failure when setting a widget focus proxy as its successor in tab order Fixed garbled 3D Qt logo in the overpainting example. fix crash in Phonon::DS9 backend Don't crash when running Qt on KDE with Oxygen style. Fixes missing update when setting opacity on an item that had opacity 0.0 Avoids missing opacity updates by not propagating the ignoreOpacity flag Cleanup in graphicsitem autotest Adds convenience functions QGraphicsItemPrivate::isOpacityNull Fixed a crash when QPixmaps are destroyed after the ~QApplication. Fix GL texture leaks when pixmaps are deleted Doc fix. No need to put something deprecated if it's not. ...
| | | | | * | Fixed a failure in tst_qgl.Trond Kjernåsen2010-02-021-1/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The assert wrong, it may be that the texture isn't removed from the cache if it doesn't have the MemoryManaged bind option set. Reviewed-by: Samuel
| | | | | * | 4.6.2 changesTrond Kjernåsen2010-02-021-5/+18
| | | | | | |
| | | | | * | Avoids a possible crash when saving the state of a main windowThierry Bastian2010-02-021-7/+7
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The crash could appear when saving the state of the main window in response to the visibilityChanged of the dock widgets. Task-number: QTBUG-7838 Reviewed-by: ogoffart
| | | | | * | Implemented QGifHandler::imageCount().Trond Kjernåsen2010-02-023-1/+241
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Task-number: QTBUG-7514 Reviewed-by: Kim
| | | | | * | Fixed compilation of the GL2 engine for OpenGL ES 2.Kim Motoyoshi Kalland2010-02-021-0/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | glColor4f is not defined in OpenGL ES 2. Reviewed-by: Trond
| | | | | * | fix whitespaceThomas Zander2010-02-021-4/+4
| | | | | | |
| | | | | * | Document that QModelIndex::child does not work for the root itemOlivier Goffart2010-02-021-0/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Reviewed-by: Thierry
| | | | | * | Fixed missing textures in the boxes demo.Kim Motoyoshi Kalland2010-02-021-0/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The boxes demo assumed that the current GL colour was the default white, but the GL2 paint engine set it to black. Fixed by resetting the colour to white in resetGLState(). Task-number: QTBUG-7779 Reviewed-by: Trond
| | | | | * | Merge branch '4.6' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into ↵Qt Continuous Integration System2010-02-0224-132/+485
| | | | | |\ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 4.6-integration * '4.6' of scm.dev.nokia.troll.no:qt/oslo-staging-2: Fix QTBUG_7714_fullUpdateDiscardingOpacityUpdate2 autotest in qws-linux Assert failure when setting a widget focus proxy as its successor in tab order Fixed garbled 3D Qt logo in the overpainting example. fix crash in Phonon::DS9 backend Don't crash when running Qt on KDE with Oxygen style. Fixes missing update when setting opacity on an item that had opacity 0.0 Avoids missing opacity updates by not propagating the ignoreOpacity flag Cleanup in graphicsitem autotest Adds convenience functions QGraphicsItemPrivate::isOpacityNull Fixed a crash when QPixmaps are destroyed after the ~QApplication. Fix GL texture leaks when pixmaps are deleted Doc fix. No need to put something deprecated if it's not. Warn if the plugin seems to not exist instead of simply passing.
| | | | | | * | Fix QTBUG_7714_fullUpdateDiscardingOpacityUpdate2 autotest in qws-linuxLeonardo Sobral Cunha2010-02-011-0/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The two views were displayed on top of each other, so some repaints were not triggered.
| | | | | | * | Assert failure when setting a widget focus proxy as its successor in tab orderGabriel de Dietrich2010-02-012-0/+16
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Now we check that and skip it from the tab list. Auto-test included. Reviewed-by: leo Task-number: QTBUG-7532
| * | | | | | | Merge branch '4.6' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into ↵Qt Continuous Integration System2010-02-041-2/+7
| |\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 4.6-integration * '4.6' of scm.dev.nokia.troll.no:qt/oslo-staging-1: Rhys Weatherley's changes for 4.6.2
| | * | | | | | | Rhys Weatherley's changes for 4.6.2Rhys Weatherley2010-02-041-2/+7
| | | | | | | | |
| * | | | | | | | Merge branch '4.6' of scm.dev.nokia.troll.no:qt/qt-s60-public into ↵Qt Continuous Integration System2010-02-0420-216/+805
| |\ \ \ \ \ \ \ \ | | |_|_|_|_|_|_|/ | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 4.6-integration * '4.6' of scm.dev.nokia.troll.no:qt/qt-s60-public: Adjust rw base address for gui built with GCCE for Symbian OS Added descriptions of translatable strings for Phonon MMF reverb effect Corrected namespace for Phonon::MMF translatable error strings Compile fix for non-Symbian compilers S60 softkey refactoring (support for merging, priorities and menus) Daylight savings time for Symbian take 2
| | * | | | | | | Merge branch '4.6' of scm.dev.nokia.troll.no:qt/qt-s60-public into ↵Qt Continuous Integration System2010-02-0320-216/+805
| | |\ \ \ \ \ \ \ | | | |_|/ / / / / | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 4.6-integration * '4.6' of scm.dev.nokia.troll.no:qt/qt-s60-public: Adjust rw base address for gui built with GCCE for Symbian OS Added descriptions of translatable strings for Phonon MMF reverb effect Corrected namespace for Phonon::MMF translatable error strings Compile fix for non-Symbian compilers S60 softkey refactoring (support for merging, priorities and menus) Daylight savings time for Symbian take 2
| | | * | | | | | Merge branch '4.6' of scm.dev.nokia.troll.no:qt/qt-s60-public into 4.6Janne Koskinen2010-02-033-9/+30
| | | |\ \ \ \ \ \
| | | | * | | | | | Added descriptions of translatable strings for Phonon MMF reverb effectGareth Stockwell2010-02-031-1/+21
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Reviewed-by: trustme
| | | | * | | | | | Corrected namespace for Phonon::MMF translatable error stringsGareth Stockwell2010-02-031-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Error strings are now part of the Phonon::MMF namespace. Reviewed-by: trustme
| | | | * | | | | | Compile fix for non-Symbian compilersAlessandro Portale2010-02-031-7/+8
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Putting the code for "case CT_ComboBox:" into {}
| | | * | | | | | | Adjust rw base address for gui built with GCCE for Symbian OSIain2010-02-031-1/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | fixed during merge to match new style flag setting. Reviewed-by: Janne Koskinen
| | | * | | | | | | Merge branch '4.6' of scm.dev.nokia.troll.no:qt/qt-s60-public into 4.6Janne Koskinen2010-02-03153-576/+9778
| | | |\ \ \ \ \ \ \ | | | | |/ / / / / /
| | | | * | | | | | Merge branch '4.6' of git@scm.dev.troll.no:qt/qt-s60-public into 4.6Janne Anttila2010-02-03331-1814/+13474
| | | | |\ \ \ \ \ \
| | | | * | | | | | | S60 softkey refactoring (support for merging, priorities and menus)Janne Anttila2010-02-0313-183/+727
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Implemented features: Softkey Merging: Widget can set only one softkey and set flag that rest of the softkeys shall be taken from parent. Priority Handling: If multiple sokftkeys with same role are set, the highest priority action gets displayed. Custom Softkey Menu: By setting QMenu to QAction and assigning a softkey role for that action, the native menubar will be displayed when sofkey is clicked. Softkey Image: Initial code for implementing sofkey image support, the final implementation is still pending legal acceptance to use eiksoftkeyimage.h header file which is under EPL license. Task-number: QTBUG-7315 Review-By: Sami Merila Review-By: Jason Barron
| | | * | | | | | | | Merge branch '4.6' of scm.dev.nokia.troll.no:qt/qt-s60-public into 4.6Janne Koskinen2010-01-29177-1189/+3466
| | | |\ \ \ \ \ \ \ \
| | | * \ \ \ \ \ \ \ \ Merge branch '4.6' of scm.dev.nokia.troll.no:qt/qt-s60-public into 4.6Janne Koskinen2010-01-2613-188/+365
| | | |\ \ \ \ \ \ \ \ \
| | | * \ \ \ \ \ \ \ \ \ Merge branch '4.6' of scm.dev.nokia.troll.no:qt/qt-s60-public into 4.6Janne Koskinen2010-01-259105-15150/+24796
| | | |\ \ \ \ \ \ \ \ \ \
| | | * | | | | | | | | | | Daylight savings time for Symbian take 2Janne Koskinen2009-12-283-23/+46
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Second try to make this work for all S60 platforms
| * | | | | | | | | | | | | Merge branch '4.6' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into ↵Qt Continuous Integration System2010-02-0310-37/+111
| |\ \ \ \ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / / / / / | |/| | | | | | | / / / / / | | | |_|_|_|_|_|/ / / / / | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 4.6-integration * '4.6' of scm.dev.nokia.troll.no:qt/oslo-staging-1: Autotest: to be sure, generate .cpp files with the proper headers too Fix regression in clipped icon text on Windows Fixed QFileInfo::absolutePath() warning when running "qmake -project" QTcpServer: Clarify thread affinity of incoming QTcpSocket Cleared up QEvent documentation for QGraphicsSceneDragDropEvent events. Updated my changelog entry QNAM HTTP: Fix bug related to re-sending a request Adding my changes. Remove erroneous warning in QFileInfo::absolutePath()
| | * | | | | | | | | | | Autotest: to be sure, generate .cpp files with the proper headers tooThiago Macieira2010-02-031-17/+40
| | | | | | | | | | | | |
| | * | | | | | | | | | | Fix regression in clipped icon text on WindowsJens Bache-Wiig2010-01-132-1/+18
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This was really caused by a change done to the font engine in 4.6. We now return a pixel less for the font height in multiple widgets. Some of these should be addressed in a separate patch. This patch simply ensures that the text rect is not clipped, but will not alter the height of the widget. Task-number: QTBUG-7662 Reviewed-by: prasanth
generated by cgit v0.12 at 2025-08-19 15:37:18 (GMT)