summaryrefslogtreecommitdiffstats
path: root/src
Commit message (Collapse)AuthorAgeFilesLines
* Export qt_directfb_.* functions in plugin as wellAnders Bakken2010-09-173-5/+1
| | | | | | | | | | | | | | These functions can be a big help in debugging rendering errors in an application and can even be handy to use for real functionality. While it requires the app to explicitly link to the plugin (when compiling with -plugin-gfx-directfb this is still much better than not exporting them). Since this was the only use-case for QT_DIRECTFB_PLUGIN it's probably better to take that define out. Merge-request: 2470 Reviewed-by: Donald Carr <donald.carr@nokia.com>
* Update Symbian def files.Bjørn Erik Nilsen2010-09-171-2/+2
| | | | | | | Build error reported by CI gate, commit: 9601abf3b03cfef589c092182bec3672fab6cde0 Reviewed-by: jbarron
* Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into ↵Qt Continuous Integration System2010-09-173-30/+32
|\ | | | | | | | | | | | | | | | | | | 4.7-integration * '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-2: QGraphicsItem::childrenBoundingRect behavior breaks QGraphicsEffect::sourceBoundingRect(). Wrong bounding rect returned by QGraphicsEffect::boundingRect(). Compile on Mac Ensure building of WebKit and QtConcurrent are disabled with SunCC.
| * Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into ↵Qt Continuous Integration System2010-09-173-30/+32
| |\ | | | | | | | | | | | | | | | | | | | | | | | | | | | 4.7-integration * '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-2: QGraphicsItem::childrenBoundingRect behavior breaks QGraphicsEffect::sourceBoundingRect(). Wrong bounding rect returned by QGraphicsEffect::boundingRect(). Compile on Mac Ensure building of WebKit and QtConcurrent are disabled with SunCC.
| | * Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into ↵Qt Continuous Integration System2010-09-163-30/+32
| | |\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 4.7-integration * '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-2: QGraphicsItem::childrenBoundingRect behavior breaks QGraphicsEffect::sourceBoundingRect(). Wrong bounding rect returned by QGraphicsEffect::boundingRect(). Compile on Mac Ensure building of WebKit and QtConcurrent are disabled with SunCC.
| | | * QGraphicsItem::childrenBoundingRect behavior breaks ↵Bjørn Erik Nilsen2010-09-162-12/+19
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | QGraphicsEffect::sourceBoundingRect(). Context: QGraphicsEffect::sourceBoundingRect() returns: item->boundingRect() | item->childrenBoundingRect(); Problem was that item->childrenBoundingRect() adjusted the children's bounding rect with the children's ancestor effects (child -> root item), which means the source bounding rect was bigger than needed. We should only account for effects downwards in the hierarchy. root (has effect) | item (has effect) | child | grandChild Auto test included. Task-number: QT-3633, QT-3828 Reviewed-by: samuel
| | | * Wrong bounding rect returned by QGraphicsEffect::boundingRect().Bjørn Erik Nilsen2010-09-162-20/+12
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Regression after: f5c5e20a Problem was that the cached bounding rect was never invalidated. We can also remove the cached bounding rect in QGraphicsEffectSource because QGraphicsItem::childrenBoundingRect now clips by default. This basically means partially reverting above commit and invalidate whenever ItemClipsChildrenToShape flag changes. Auto test included. Task-number: Discovered while investigating QT-3633 Reviewed-by: samuel
| | | * Compile on MacEskil Abrahamsen Blomfeldt2010-09-161-0/+3
| | | | | | | | | | | | | | | | | | | | | | | | Extern missing symbol Reviewed-by: Fabien Freling
* | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-multimedia-staging into ↵Qt Continuous Integration System2010-09-171-1/+1
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 4.7-integration * '4.7' of scm.dev.nokia.troll.no:qt/qt-multimedia-staging: Fixed compilation of qdrawhelper.cpp with XLC 10
| * | | | Fixed compilation of qdrawhelper.cpp with XLC 10Rohan McGovern2010-09-161-1/+1
| | |/ / | |/| | | | | | | | | | | | | | | | | | | | | | With XLC 10, calls to static functions within a template function need to be fully qualified. Reviewed-by: Marius Storm-Olsen
* | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into ↵Qt Continuous Integration System2010-09-171-1/+1
|\ \ \ \ | |_|/ / |/| | | | | | | | | | | | | | | | | | | 4.7-integration * '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1: Make SourceOver work properly in Qt/DirectFB
| * | | Make SourceOver work properly in Qt/DirectFBAnders Bakken2010-09-161-1/+1
| |/ / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Qt and DirectFB have different definitions of SourceOver. In DirectFB it's defined as this: /* pixel = (source * fs + destination * fd), sa = source alpha, da = destination alpha */ DSPD_SRC_OVER = 3, /* fs: 1.0 fd: 1.0-sa */ In other words, the source pixels are not multiplied by the alpha and this leads to issues with RGBA values like 255, 0, 0, 0. The composition mode that in DirectFB that maps onto Qt's CompositionMode_SourceOver is DSPD_NONE, defined like this: DSPD_NONE = 0, /* fs: sa fd: 1.0-sa (defaults) */ Merge-request: 807 Reviewed-by: Donald Carr <donald.carr@nokia.com>
* | | Removing embarrassing trialing white spaces from former commitAlessandro Portale2010-09-161-6/+6
|/ / | | | | | | Hereby, I outed myself to have used Carbide.c++
* | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-s60-public into ↵Qt Continuous Integration System2010-09-167-38/+45
|\ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 4.7-integration * '4.7' of scm.dev.nokia.troll.no:qt/qt-s60-public: Check S60_VERSION instead of existence of certain files in bearer plugin Fixed EPOCROOT references in createpackage.pl. Restore 4.7.0 behavior that non-existing paths are possible. QTBUG-4852 Turning on runtime nested exception support where available Fix warnings Fixed incorrect Symbian scoping. QS60style: itemview selection indication works incorrectly
| * | Check S60_VERSION instead of existence of certain files in bearer pluginMiikka Heikkinen2010-09-162-15/+15
| | | | | | | | | | | | | | | | | | | | | | | | | | | Checking for existence of files does not work in clean platform builds, so check the S60_VERSION instead, which can be explicitly set by those builds to correct value. Task-number: QT-3949 Reviewed-by: axis
| * | Restore 4.7.0 behavior that non-existing paths are possible.Thomas Zander2010-09-161-2/+3
| | | | | | | | | | | | | | | | | | | | | Changing a relative path to a non-existing absolute path used to work, this should work again after this patch. Reviewed-by: João Abecasis
| * | Fix warningsThomas Zander2010-09-162-2/+2
| | |
| * | Fixed incorrect Symbian scoping.axis2010-09-161-2/+2
| | | | | | | | | | | | The missing install functionality is only true for mmp based systems.
| * | Merge branch '4.7' of git@scm.dev.nokia.troll.no:qt/qt-s60-public into 4.7Sami Merila2010-09-1625-79/+1001
| |\ \
| * | | QS60style: itemview selection indication works incorrectlySami Merila2010-09-161-17/+23
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Currently QS60Style shows tick mark for listWidget with multiselection capability only after two or more items are selected. This is fixed so that selection indication is shown in multiselection itemviews (all of them and not just list widget) irregardless of number of selected items. Also, if itemview loses focus with singleitem itemview, style now still draws item highlight to it (with 50% transparency). Task-number: QTBUG-12875, QTBUG-13072 Reviewed-by: Janne Anttila
* | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7-integrationQt Continuous Integration System2010-09-164-73/+174
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | * '4.7' of scm.dev.nokia.troll.no:qt/qt-qml: Update QtDeclarative def files Optimize FontLoader for "multi-use".
| * | | | Update QtDeclarative def filesJoona Petrell2010-09-162-1/+45
| | | | | | | | | | | | | | | | | | | | | | | | | Task-number: Reviewed-by: Martin Jones
| * | | | Optimize FontLoader for "multi-use".Yann Bodson2010-09-162-72/+129
| | |/ / | |/| | | | | | | | | | | | | | Task-number: QTBUG-13419 Reviewed-by: Michael Brasser
* | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into ↵Qt Continuous Integration System2010-09-167-3272/+131
|\ \ \ \ | |_|_|/ |/| | | | | | | | | | | | | | | | | | | | | | | | | | | 4.7-integration * '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1: Update add libconninet version 0.45. Remove libconninet in preperation to updating it to version 0.45. doc: Fixed a \overload
| * | | Update add libconninet version 0.45.Aaron McCarthy2010-09-1634-0/+6836
| | | |
| * | | Remove libconninet in preperation to updating it to version 0.45.Aaron McCarthy2010-09-1636-9977/+0
| | | |
| * | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into ↵Qt Continuous Integration System2010-09-161-1/+1
| |\ \ \ | | |_|/ | |/| | | | | | | | | | | | | | | | | | 4.7-integration * '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1: doc: Fixed a \overload
| | * | doc: Fixed a \overloadThorbjørn Lindeijer2010-09-151-1/+1
| | | |
* | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into ↵Qt Continuous Integration System2010-09-1612-167/+327
|\ \ \ \ | |_|_|/ |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 4.7-integration * '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-2: Fixed regression in QPixmap::size() for null pixmaps. Make test less sensitive to platform specifics Doc: Further QML improvements. Doc: Minor improvements to QML-related documentation. The test livelock of QTimer is now expected to work Make sure mapSelectionFromSource does not return a selection with invalid ranges. QEventDispatcherUnix: do not process too many timer if other events need to be processed first Doc: Continued work on the QML documentation. Doc: More work on the QML documentation. Doc: More work on the declarative API documentation. Doc: Some editing and tidying up. Doc: Added a missing file. Doc: Fixed text in license headers.
| * | | Fixed regression in QPixmap::size() for null pixmaps.Samuel Rødal2010-09-161-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | After change 79eef278228aac21fbf QPixmap::size() started returning QSize(-1, -1) for null pixmaps. This restores the old behavior of returning QSize(0, 0), and is symmetric with QImage::size(). Task-number: QT-3934 Reviewed-by: Trond
| * | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into ↵Qt Continuous Integration System2010-09-1511-166/+326
| |\ \ \ | | |/ / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 4.7-integration * '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-2: Doc: Further QML improvements. Doc: Minor improvements to QML-related documentation. The test livelock of QTimer is now expected to work Make sure mapSelectionFromSource does not return a selection with invalid ranges. QEventDispatcherUnix: do not process too many timer if other events need to be processed first Doc: Continued work on the QML documentation. Doc: More work on the QML documentation. Doc: More work on the declarative API documentation. Doc: Some editing and tidying up. Doc: Added a missing file. Doc: Fixed text in license headers.
| | * | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into 4.7David Boddie2010-09-15185-5359/+8731
| | |\ \
| | | * \ Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into ↵Qt Continuous Integration System2010-09-152-13/+25
| | | |\ \ | | | | |/ | | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 4.7-integration * '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-2: The test livelock of QTimer is now expected to work Make sure mapSelectionFromSource does not return a selection with invalid ranges. QEventDispatcherUnix: do not process too many timer if other events need to be processed first
| | | | * Make sure mapSelectionFromSource does not return a selection with invalid ↵Stephen Kelly2010-09-151-4/+12
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | ranges. Similar for mapSelectionToSource, but that one could possibly be an assert instead. Merge-request: 2474 Reviewed-by: Olivier Goffart <olivier.goffart@nokia.com>
| | | | * QEventDispatcherUnix: do not process too many timer if other events need to ↵Olivier Goffart2010-09-151-9/+13
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | be processed first Task-number: QTBUG-13633 Reviewed-by: Brad
| | * | | Doc: Further QML improvements.David Boddie2010-09-151-22/+61
| | | | |
| | * | | Doc: Minor improvements to QML-related documentation.David Boddie2010-09-151-2/+2
| | | | |
| | * | | Doc: Continued work on the QML documentation.David Boddie2010-09-142-18/+56
| | | | |
| | * | | Doc: More work on the QML documentation.David Boddie2010-09-141-57/+59
| | | | |
| | * | | Doc: More work on the declarative API documentation.David Boddie2010-09-136-54/+123
| | | | |
* | | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7-integrationQt Continuous Integration System2010-09-1624-65/+989
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * '4.7' of scm.dev.nokia.troll.no:qt/qt-qml: Compile fix for static build using mingw. Models with a single role may not update due to "modelData" conflict. Fix test. Fix bug in 34b805d66c09fb324d1b6a7bcf259e8743ef3894 Fix Symbian def files for 6454f4db1697af1d36ad4c0ea83ccd0bb490fd39 Fix Symbian def files for 34b805d66c09fb324d1b6a7bcf259e8743ef3894 crashfix for tst_qdeclarativeanimations::badTypes() Add missing images for dynamiclist example. Compile with QT_NO_GESTURES. Give file and line error information for errors in dummydata. Restore any absolute geometry changed by AnchorChanges when returning Export QDeclarativeScriptAction Completing the interface for children/data/resources Unit tests for Bauhaus enablers This patch allows modifications on PropertyChanges on the fly
| * | | | | Compile fix for static build using mingw.Michael Brasser2010-09-161-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fix follows the pattern of commit bbf78c9b422c4c7eda7e7fce067578c75d3bc9b3. Reviewed-by: Martin Jones
| * | | | | Models with a single role may not update due to "modelData" conflict.Martin Jones2010-09-161-10/+30
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Models with a single role also have a modelData property added. These role names both ended up in a hash, resulting in only one or the other updating. Now we handle modelData specially. Task-number: QTBUG-13664 Reviewed-by: Michael Brasser
| * | | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7-integrationQt Continuous Integration System2010-09-1522-54/+958
| |\ \ \ \ \ | | |_|_|/ / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * '4.7' of scm.dev.nokia.troll.no:qt/qt-qml: Fix bug in 34b805d66c09fb324d1b6a7bcf259e8743ef3894 Fix Symbian def files for 6454f4db1697af1d36ad4c0ea83ccd0bb490fd39 Fix Symbian def files for 34b805d66c09fb324d1b6a7bcf259e8743ef3894 crashfix for tst_qdeclarativeanimations::badTypes() Add missing images for dynamiclist example. Compile with QT_NO_GESTURES. Give file and line error information for errors in dummydata. Restore any absolute geometry changed by AnchorChanges when returning Export QDeclarativeScriptAction Completing the interface for children/data/resources Unit tests for Bauhaus enablers This patch allows modifications on PropertyChanges on the fly
| | * | | | Fix bug in 34b805d66c09fb324d1b6a7bcf259e8743ef3894Thomas Hartmann2010-09-153-8/+11
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This time the implementation of clear is correct Reviewed-by: Marco Bubke
| | * | | | Fix Symbian def files for 6454f4db1697af1d36ad4c0ea83ccd0bb490fd39Thomas Hartmann2010-09-152-0/+98
| | | | | |
| | * | | | Fix Symbian def files for 34b805d66c09fb324d1b6a7bcf259e8743ef3894Thomas Hartmann2010-09-152-0/+2
| | | | | |
| | * | | | crashfix for tst_qdeclarativeanimations::badTypes()Thomas Hartmann2010-09-152-6/+7
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | We always have to check for 0 before converting a raw pointer into a smart pointer Reviewed-by: Kai Koehne
| | * | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7-integrationQt Continuous Integration System2010-09-1518-54/+854
| | |\ \ \ \ | | | |_|_|/ | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * '4.7' of scm.dev.nokia.troll.no:qt/qt-qml: Compile with QT_NO_GESTURES. Give file and line error information for errors in dummydata. Restore any absolute geometry changed by AnchorChanges when returning Export QDeclarativeScriptAction Completing the interface for children/data/resources Unit tests for Bauhaus enablers This patch allows modifications on PropertyChanges on the fly
| | | * | | Restore any absolute geometry changed by AnchorChanges when returningMichael Brasser2010-09-151-0/+54
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | to the base state. Task-number: QTBUG-11834
generated by cgit v0.12 at 2025-01-05 00:49:18 (GMT)