summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Fixed many spelling errors.Rohan McGovern2010-10-2571-94/+94
|
* 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>
* | | | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7-integrationQt Continuous Integration System2010-10-222-21/+23
|\ \ \ \ \ \ | |/ / / / / |/| | / / / | | |/ / / | |/| | | * '4.7' of scm.dev.nokia.troll.no:qt/qt-qml: Fix Flipable docs
| * | | | Fix Flipable docsBea Lam2010-10-222-21/+23
|/ / / / | | | | | | | | | | | | Task-number: QTBUG-13789
* | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7-integrationQt Continuous Integration System2010-10-211-2/+0
|\ \ \ \ | |/ / / |/| | | | | | | | | | | * '4.7' of scm.dev.nokia.troll.no:qt/qt-qml: Remove unnecessary rounding
| * | | Remove unnecessary roundingAlan Alpert2010-10-211-2/+0
| | | | | | | | | | | | | | | | Task-number: QTBUG-13995
* | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into ↵Qt Continuous Integration System2010-10-213-2/+82
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 4.7-integration * '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-2: In meego, support Format_RGB32 too for eglShared images. Make sure d->ranges does not have invalid ranges before processing it.
| * | | | In meego, support Format_RGB32 too for eglShared images.Michael Dominic K2010-10-211-2/+3
| | | | | | | | | | | | | | | | | | | | | | | | | Merge-request: 2493 Reviewed-by: Samuel Rødal <samuel.rodal@nokia.com>
| * | | | Make sure d->ranges does not have invalid ranges before processing it.Stephen Kelly2010-10-212-0/+79
| | |_|/ | |/| | | | | | | | | | | | | | Reviewed-by: gabi Merge-request: 831
* | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7-integrationQt Continuous Integration System2010-10-212-9/+27
|\ \ \ \ | |/ / / |/| / / | |/ / | | | * '4.7' of scm.dev.nokia.troll.no:qt/qt-qml: Flickable 'moving' parameter stays at true when setting contentY.
| * | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7Martin Jones2010-10-212-3/+29
| |\ \
| * | | Flickable 'moving' parameter stays at true when setting contentY.Martin Jones2010-10-212-9/+27
| | |/ | |/| | | | | | | | | | | | | | | | | | | Since all animation is reset when changing contentX or contentY the appropriate moving properties should be false. Task-number: QTBUG-14583 Reviewed-by: Michael Brasser
* | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7-integrationQt Continuous Integration System2010-10-212-3/+29
|\ \ \ | |/ / |/| / | |/ | | * '4.7' of scm.dev.nokia.troll.no:qt/qt-qml: Fix network request completion crashing on a canceled pixmap request
| * Fix network request completion crashing on a canceled pixmap requestJoona Petrell2010-10-212-3/+29
|/ | | | | Task-number: QT-3957 reviewed-by: Aaron Kennedy
* Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into ↵Qt Continuous Integration System2010-10-201-2/+19
|\ | | | | | | | | | | | | 4.7-integration * '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-2: Fixed font rendering in manually built Qt on ARMv6.
| * Fixed font rendering in manually built Qt on ARMv6.Samuel Rødal2010-10-201-2/+19
| | | | | | | | | | | | | | | | The pixelSize ends up being 0 unless these changes are applied. Must be a compiler bug in GCC 4.3.x, fixed in GCC 4.4.1. Reviewed-by: Prasanth Reviewed-by: Olivier Goffart
* | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into ↵Qt Continuous Integration System2010-10-205-20/+166
|\ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | 4.7-integration * '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1: Don't allow posted events to starve native messages. Fix autotest failure with experimental client deco fix a translation bug in qt_zh_CN.ts Add skeleton changes file for Qt 4.7.2
| * | Don't allow posted events to starve native messages.Bradley T. Hughes2010-10-201-16/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This reverts commit 9215506e6a057d8aef7415c2921214e1ba1c760d, which caused the above behavior. The intention of this commit was to prevent native messages from starving posted events, but as shown by the example, it is possible for posted events to then starve native messages (which results in very bad behavior on Windows if the user is moving or resizing a window). Unfortunately, my attempts to construct an autotest for this have failed, as I've not found a way to generate the right kinds of native messages from code. Task-number: QTBUG-14021 Reviewed-by: prasanth
| * | Fix autotest failure with experimental client decoHarald Fernengel2010-10-202-3/+5
| | | | | | | | | | | | The menu bar is in the outer layout, not the inner one
| * | fix a translation bug in qt_zh_CN.tsliang jian2010-10-201-1/+1
| | | | | | | | | | | | | | | Merge-request: 858 Reviewed-by: Liang Qi <liang.qi@nokia.com>
| * | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into ↵Qt Continuous Integration System2010-10-201-0/+158
| |\ \ | | |/ | |/| | | | | | | | | | | | | 4.7-integration * '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1: Add skeleton changes file for Qt 4.7.2
| | * Add skeleton changes file for Qt 4.7.2Jason McDonald2010-10-201-0/+158
| | | | | | | | | | | | Reviewed-by: Trust Me
* | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7-integrationQt Continuous Integration System2010-10-203-51/+40
|\ \ \ | | | | | | | | | | | | | | | | | | | | * '4.7' of scm.dev.nokia.troll.no:qt/qt-qml: Ensure we don't refill the view before all model changes are complete. ListView item insertion didn't handle delayed item removal correctly.
| * | | Ensure we don't refill the view before all model changes are complete.Martin Jones2010-10-202-21/+27
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Calling setPosition(0) in itemsRemoved caused the view to be refilled, which is a bad thing if the model has changed but not all updates have been handled. Fixed in both ListView and GridView. Task-number: QTBUG-14548 Reviewed-by: Michael Brasser
| * | | ListView item insertion didn't handle delayed item removal correctly.Martin Jones2010-10-202-30/+13
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The delayed removal items weren't handled correctly by mapRangeFromModel() function. Use mapFromModel() instead which gives us what we actually want and remove unused mapRangeFromModel(). Task-number: QTBUG-14471 Reviewed-by: Michael Brasser
generated by cgit v0.12 at 2024-12-30 21:12:15 (GMT)