summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Merge branch 'master' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into ↵Qt Continuous Integration System2010-10-252-0/+4
|\ | | | | | | | | | | | | | | master-integration * 'master' of scm.dev.nokia.troll.no:qt/oslo-staging-2: Update changelog Fix for QTBUG-14497 - X11 error (X_CopyRect/BadMatch) when using a translucent widge in multi-screen environment
| * Update changelogArvid Ephraim Picciani2010-10-251-0/+2
| |
| * Fix for QTBUG-14497 - X11 error (X_CopyRect/BadMatch) when using a ↵Christian Ehrlicher2010-10-251-0/+2
| | | | | | | | | | | | | | translucent widge in multi-screen environment Merge-request: 865 Reviewed-by: Samuel Rødal <samuel.rodal@nokia.com>
* | Merge branch 'qt-master-from-4.7' of ↵Qt Continuous Integration System2010-10-25923-9706/+11745
|\ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | scm.dev.nokia.troll.no:qt/qt-integration into master-integration * 'qt-master-from-4.7' of scm.dev.nokia.troll.no:qt/qt-integration: (174 commits) Fixed spelling. Fixed many spelling errors. Fix warning introduced by last commit on hiding of the 'd' member Fix access to uninitialised memory in case of new throwing Remove accidentially committed .qmlproject.user file, ignore this filetype Corrected build fail for autotests QComboBox popup is shown in incorrect location with bottom CBA Fix Flipable docs Fall back to Qt for loading images with DICAPS_COLORKEY. Implement QWidget::metric PdmNumColors for QWS Adding ::scroll capabilities to live pixmaps. Major refactoring: creating a new QPixmapData subclass for live textures. QS60Style: The QComboBox/QSpinBox text color is not according to theme Using TLS to store QThreadData on Symbian In meego, support Format_RGB32 too for eglShared images. Remove unnecessary rounding Functions that are externally defined to QtOpenGL needs to be imported. Make sure d->ranges does not have invalid ranges before processing it. Added include for missing file for Symbian3 Support for clipboard between Qt and Symbian applications ...
| * \ Merge branch 4.7 into qt-master-from-4.7Qt Continuous Integration System2010-10-2570-93/+93
| |\ \
| | * \ Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7-integrationQt Continuous Integration System2010-10-2571-94/+94
| | |\ \ | | | | | | | | | | | | | | | | | | | | * '4.7' of scm.dev.nokia.troll.no:qt/qt-qml: Fixed many spelling errors.
| | | * | Fixed many spelling errors.Rohan McGovern2010-10-2571-94/+94
| | | | |
| * | | | Fixed spelling.Rohan McGovern2010-10-251-1/+1
| | | | | | | | | | | | | | | | | | | | trys -> tries
| * | | | Merge branch 4.7 into qt-master-from-4.7Qt Continuous Integration System2010-10-256-79/+104
| |\ \ \ \ | | |/ / /
| | * | | Merge branch 'qt-4.7-from-4.6' of scm.dev.nokia.troll.no:qt/qt-integration ↵Qt Continuous Integration System2010-10-256-79/+104
| | |\ \ \ | | | |/ / | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | into 4.7-integration * 'qt-4.7-from-4.6' of scm.dev.nokia.troll.no:qt/qt-integration: Demo Spectrum wav data size is not calculated correctly Revert "Don't define highp/mediump/lowp if desktop GL has them" Rename .pro file to match directory name. Doc: Fixed qdoc warning. Add header guards to audio example headers.
| | | * | Merge remote branch 'origin/4.6' into qt-4.7-from-4.6Olivier Goffart2010-10-256-79/+104
| | | |\ \ | | |/ / / | | | | | | | | | | | | | | | | | | | | Conflicts: src/corelib/tools/qcryptographichash.cpp src/opengl/qgl_p.h
| | | * | Merge branch '4.6' of scm.dev.nokia.troll.no:qt/qt-multimedia-staging into ↵Qt Continuous Integration System2010-10-132-79/+90
| | | |\ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 4.6-integration * '4.6' of scm.dev.nokia.troll.no:qt/qt-multimedia-staging: Demo Spectrum wav data size is not calculated correctly
| | | | * | Demo Spectrum wav data size is not calculated correctlyJustin McPherson2010-10-132-79/+90
| | | |/ / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | - Grab length of audio data from Data chunk size - Read from the device no greater than the audio Data chunk size Task-number: QTBUG-13779 Reviewed-by: Andrew den Exter
| | | * | Merge branch '4.6' of scm.dev.nokia.troll.no:qt/qt-s60-public into ↵Qt Continuous Integration System2010-10-121-0/+0
| | | |\ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 4.6-integration * '4.6' of scm.dev.nokia.troll.no:qt/qt-s60-public: Rename .pro file to match directory name.
| | | | * | Rename .pro file to match directory name.Jason McDonald2010-10-121-0/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Task-number: none Reviewed-by: Trust Me
| | | * | | Merge branch '4.6' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into ↵Qt Continuous Integration System2010-10-124-16/+4
| | | |\ \ \ | | | | |/ / | | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | 4.6-integration * '4.6' of scm.dev.nokia.troll.no:qt/oslo-staging-2: Revert "Don't define highp/mediump/lowp if desktop GL has them"
| | | | * | Revert "Don't define highp/mediump/lowp if desktop GL has them"Trond Kjernåsen2010-10-124-16/+4
| | | |/ / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This reverts commit 6155050f68cc86c445552da61a5f240c16f5e2cd. The GL_ARB_ES2_compatibility extension does not mention the lowp, mediump or highp keywords. Task-number: QTBUG-14384 Reviewed-by: Samuel Reviewed-by: Prasanth
| | | * | Merge branch '4.6' of scm.dev.nokia.troll.no:qt/qt-multimedia-staging into ↵Qt Continuous Integration System2010-10-113-0/+14
| | | |\ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 4.6-integration * '4.6' of scm.dev.nokia.troll.no:qt/qt-multimedia-staging: Add header guards to audio example headers.
| | | | * \ Merge branch '4.6' of scm.dev.nokia.troll.no:qt/qt-multimedia-staging into ↵Qt Continuous Integration System2010-10-103-0/+14
| | | | |\ \ | | | |/ / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 4.6-integration * '4.6' of scm.dev.nokia.troll.no:qt/qt-multimedia-staging: Add header guards to audio example headers.
| | | | * | Add header guards to audio example headers.Justin McPherson2010-10-083-0/+14
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Task-number: QTBUG-13413 Reviewed-by: Andrew den Exter
| | | * | | Merge branch '4.6' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into ↵Qt Continuous Integration System2010-10-101-1/+1
| | | |\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 4.6-integration * '4.6' of scm.dev.nokia.troll.no:qt/oslo-staging-1: Doc: Fixed qdoc warning.
| | | | * | | Doc: Fixed qdoc warning.David Boddie2010-10-081-1/+1
| | | | |/ / | | | | | | | | | | | | | | | | | | Reviewed-by: hjk
| * | | | | Merge branch 'qt-master-from-4.7' of ↵Qt Continuous Integration System2010-10-25851-9534/+11548
| |\ \ \ \ \ |/ / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | scm.dev.nokia.troll.no:qt/qt-integration into master-integration * 'qt-master-from-4.7' of scm.dev.nokia.troll.no:qt/qt-integration: (167 commits) Fix warning introduced by last commit on hiding of the 'd' member Fix access to uninitialised memory in case of new throwing Remove accidentially committed .qmlproject.user file, ignore this filetype Corrected build fail for autotests QComboBox popup is shown in incorrect location with bottom CBA Fix Flipable docs Fall back to Qt for loading images with DICAPS_COLORKEY. Implement QWidget::metric PdmNumColors for QWS Adding ::scroll capabilities to live pixmaps. Major refactoring: creating a new QPixmapData subclass for live textures. QS60Style: The QComboBox/QSpinBox text color is not according to theme Using TLS to store QThreadData on Symbian In meego, support Format_RGB32 too for eglShared images. Remove unnecessary rounding Functions that are externally defined to QtOpenGL needs to be imported. Make sure d->ranges does not have invalid ranges before processing it. Added include for missing file for Symbian3 Support for clipboard between Qt and Symbian applications Flickable 'moving' parameter stays at true when setting contentY. Fix network request completion crashing on a canceled pixmap request ...
| * | | | | Merge remote branch 'origin/4.7' into qt-master-from-4.7Olivier Goffart2010-10-25843-9293/+10981
| |\ \ \ \ \ | | |/ / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: demos/declarative/snake/snake.qml qmake/generators/symbian/symbiancommon.cpp src/network/access/qnetworkaccessmanager.cpp src/s60installs/s60installs.pro tests/auto/qitemselectionmodel/tst_qitemselectionmodel.cpp tests/auto/qnetworkreply/tst_qnetworkreply.cpp
| | * | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into ↵Qt Continuous Integration System2010-10-231-3/+11
| | |\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 4.7-integration * '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1: Fix warning introduced by last commit on hiding of the 'd' member Fix access to uninitialised memory in case of new throwing
| | | * | | | Fix warning introduced by last commit on hiding of the 'd' memberThiago Macieira2010-10-231-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | qsharedpointer_impl.h: In constructor 'QtSharedPointer::ExternalRefCount<T>::ExternalRefCount(T*, Deleter)': qsharedpointer_impl.h:385: warning: declaration of 'd' shadows a member of 'this'
| | | * | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into ↵Qt Continuous Integration System2010-10-231-3/+11
| | | |\ \ \ \ | | |/ / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 4.7-integration * '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1: Fix access to uninitialised memory in case of new throwing
| | | * | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into ↵Qt Continuous Integration System2010-10-221-3/+11
| | | |\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 4.7-integration * '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1: Fix access to uninitialised memory in case of new throwing
| | | | * | | | Fix access to uninitialised memory in case of new throwingThiago Macieira2010-10-221-3/+11
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Testing will come later with a full test for exception issues Task-number: QTBUG-14637 Reviewed-by: Olivier Goffart
| | * | | | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-s60-public into ↵Qt Continuous Integration System2010-10-2312-34/+213
| | |\ \ \ \ \ \ | | | |/ / / / / | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 4.7-integration * '4.7' of scm.dev.nokia.troll.no:qt/qt-s60-public: Corrected build fail for autotests QComboBox popup is shown in incorrect location with bottom CBA QS60Style: The QComboBox/QSpinBox text color is not according to theme Using TLS to store QThreadData on Symbian Functions that are externally defined to QtOpenGL needs to be imported. Added include for missing file for Symbian3 Support for clipboard between Qt and Symbian applications
| | | * | | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-s60-public into ↵Qt Continuous Integration System2010-10-2212-34/+213
| | | |\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 4.7-integration * '4.7' of scm.dev.nokia.troll.no:qt/qt-s60-public: Corrected build fail for autotests QComboBox popup is shown in incorrect location with bottom CBA QS60Style: The QComboBox/QSpinBox text color is not according to theme Using TLS to store QThreadData on Symbian Functions that are externally defined to QtOpenGL needs to be imported. Added include for missing file for Symbian3 Support for clipboard between Qt and Symbian applications
| | | | * | | | | Corrected build fail for autotestsTitta Heikkala2010-10-221-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Autotests compiled only for Symbian, this is now corrected. Task-number: QT-2085 Reviewed-by: Janne Koskinen Merge-request: 870 Reviewed-by: Janne Koskinen <janne.p.koskinen@digia.com>
| | | | * | | | | Merge branch '4.7' of git@scm.dev.nokia.troll.no:qt/qt-s60-public into 4.7Sami Merila2010-10-225-13/+109
| | | | |\ \ \ \ \
| | | | | * \ \ \ \ Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-s60-public into ↵Qt Continuous Integration System2010-10-2211-33/+212
| | | | | |\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 4.7-integration * '4.7' of scm.dev.nokia.troll.no:qt/qt-s60-public: QS60Style: The QComboBox/QSpinBox text color is not according to theme Using TLS to store QThreadData on Symbian Functions that are externally defined to QtOpenGL needs to be imported. Added include for missing file for Symbian3 Support for clipboard between Qt and Symbian applications
| | | | | | * \ \ \ \ Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-s60-public into ↵Qt Continuous Integration System2010-10-2111-33/+212
| | | | | | |\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 4.7-integration * '4.7' of scm.dev.nokia.troll.no:qt/qt-s60-public: QS60Style: The QComboBox/QSpinBox text color is not according to theme Using TLS to store QThreadData on Symbian Functions that are externally defined to QtOpenGL needs to be imported. Added include for missing file for Symbian3 Support for clipboard between Qt and Symbian applications
| | | | * | | | | | | | QComboBox popup is shown in incorrect location with bottom CBASami Merila2010-10-221-1/+1
| | | | | |_|/ / / / / | | | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | If native side uses "bottom softkeys" with landscape orientation, QComboBox's popup should be shown above softkeys and centered. Currently it is shown above softkeys and on right border. Task-number: QT-4174 Reviewed-by: mread
| | | | * | | | | | | QS60Style: The QComboBox/QSpinBox text color is not according to themeSami Merila2010-10-211-4/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Theme text colors are incorrect for spinboxes and comboboxes, they should have same theme colors as lineedit has, as they are using same graphic for "editor" sub-control in them. Task-number: QT-4176 Reviewed-by: Miikka Heikkinen
| | | | * | | | | | | Using TLS to store QThreadData on Symbianmread2010-10-211-8/+38
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | TLS access on Symbian is significantly faster than using pthread_getspecific. In the case of QThreadData, the data associated with a thread, it makes sense to store and access the pointer in TLS rather than using the pthread thread specific functions. However, the pthread thread specific function have some destructor functionality that Symbian TLS does not, so Symbian still uses the pthread functions for setting the QThreadData to get the destruction behaviour. This change has wide ranging performance benefits for QML execution. With improvements shown on a number of the declarative benchmarks. Frame drawing times on test apps are also showing some improvement. The qthread* autotests have been run on Symbian^3 and Ubuntu 10.10 Task-number: QT-4089 Reviewed-by: Shane Kearns
| | | | * | | | | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-s60-public into 4.7Janne Koskinen2010-10-218-14/+40
| | | | |\ \ \ \ \ \ \
| | | | | * | | | | | | Functions that are externally defined to QtOpenGL needs to be imported.Jani Hautakangas2010-10-216-11/+11
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This is needed for RVCT4 Reviewed-by: Jason Barron
| | | | * | | | | | | | Added include for missing file for Symbian3Titta Heikkala2010-10-212-0/+6
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Symbian3 has KClipboardUidTypePlainText defined in different file to previous Symbian versions. The missing file is now included. Task-number: QT-2085 Reviewed-by: Janne Koskinen Merge-request: 870 Reviewed-by: Janne Koskinen <janne.p.koskinen@digia.com>
| | | | * | | | | | | | Support for clipboard between Qt and Symbian applicationsTitta Heikkala2010-10-213-10/+156
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Clipboard now supports copying text between Qt and Symbian applications. Text is always copied to QClipboard and to Symbian clipboard. If QClipboard is empty, Symbian clipboard is checked and text is pasted from there. Corresponding test cases added. Task-number: QT-2085 Reviewed-by: Janne Koskinen Merge-request: 870 Reviewed-by: Janne Koskinen <janne.p.koskinen@digia.com>
| | * | | | | | | | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7-integrationQt Continuous Integration System2010-10-222-41/+1
| | |\ \ \ \ \ \ \ \ \ \ | | | |/ / / / / / / / / | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * '4.7' of scm.dev.nokia.troll.no:qt/qt-qml: Remove accidentially committed .qmlproject.user file, ignore this filetype
| | | * | | | | | | | | Remove accidentially committed .qmlproject.user file, ignore this filetypeDaniel Molkentin2010-10-222-41/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Reviewed-By: Thomas Hartmann
| | * | | | | | | | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into ↵Qt Continuous Integration System2010-10-2218-352/+498
| | |\ \ \ \ \ \ \ \ \ \ | | | |_|_|_|_|_|/ / / / | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 4.7-integration * '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-2: Fall back to Qt for loading images with DICAPS_COLORKEY. Implement QWidget::metric PdmNumColors for QWS Adding ::scroll capabilities to live pixmaps. Major refactoring: creating a new QPixmapData subclass for live textures.
| | | * | | | | | | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into ↵Qt Continuous Integration System2010-10-2118-352/+498
| | | |\ \ \ \ \ \ \ \ \ | | | | |_|_|_|/ / / / / | | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 4.7-integration * '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-2: Fall back to Qt for loading images with DICAPS_COLORKEY. Implement QWidget::metric PdmNumColors for QWS Adding ::scroll capabilities to live pixmaps. Major refactoring: creating a new QPixmapData subclass for live textures.
| | | | * | | | | | | | Fall back to Qt for loading images with DICAPS_COLORKEY.Anders Bakken2010-10-211-7/+11
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge-request: 844 Reviewed-by: Donald Carr <donald.carr@nokia.com>
| | | | * | | | | | | | Implement QWidget::metric PdmNumColors for QWSAnders Bakken2010-10-211-0/+24
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This change is necessary for http://acid3.acidtests.org/#top to pass. Merge-request: 845 Reviewed-by: Donald Carr <donald.carr@nokia.com>
| | | | * | | | | | | | Adding ::scroll capabilities to live pixmaps.Michael Dominic K2010-10-212-3/+70
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge-request: 2494 Reviewed-by: Samuel Rødal <samuel.rodal@nokia.com>
| | | | * | | | | | | | Major refactoring: creating a new QPixmapData subclass for live textures.Michael Dominic K2010-10-2116-345/+396
| | | | | |_|_|/ / / / | | | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Moving code from qmeegopixmapdata there. Merge-request: 2494 Reviewed-by: Samuel Rødal <samuel.rodal@nokia.com>