summaryrefslogtreecommitdiffstats
path: root/src
Commit message (Collapse)AuthorAgeFilesLines
* Restored old flushing behavior in -graphicssystem opengl on desktop.Samuel Rødal2011-01-071-3/+4
| | | | | | | | | | Change 284211ccbd2cbd recently introduced a fix for EGL, to prevent flushing when nothing has been rendered into the back buffer. However, the skip should only be done when there's no partial update support in the window surface. If there is partial update support we can still flush as usual. Reviewed-by: Gunnar Sletta
* Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-s60-public into ↵Qt Continuous Integration System2011-01-061-2/+4
|\ | | | | | | | | | | | | 4.7-integration * '4.7' of scm.dev.nokia.troll.no:qt/qt-s60-public: Fix KERN-EXEC 0 panic on exit when bearer is searching for WLANs
| * Fix KERN-EXEC 0 panic on exit when bearer is searching for WLANsShane Kearns2011-01-061-2/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | The access point scanner cancels itself in the destructor. This requires the handle to be valid, but it was closed in the symbian engine destructor immediately before deleting the AP scanner. Because of the way symbian active objects work, the crashing function is only called if there was an asynchronous request in progress. So it could be missed in cases where the scan completes faster than the test case. Task-number: QTBUG-16484 Reviewed-by: Markus Goetz
* | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into ↵Qt Continuous Integration System2011-01-062-8/+8
|\ \ | | | | | | | | | | | | | | | | | | | | | | | | 4.7-integration * '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-2: Designer: Block QEvent::WinIdChange. QUrl::setUrl should call detach qkeymapper_x11.cpp: fix compilation with LSB and without XKB
| * | QUrl::setUrl should call detachOlivier Goffart2011-01-061-0/+1
| | | | | | | | | | | | | | | | | | Task-number: QTBUG-16425 Reviewed-by: Gabriel Reviewed-by: Markus Goetz
| * | qkeymapper_x11.cpp: fix compilation with LSB and without XKBOlivier Goffart2011-01-061-8/+7
| |/ | | | | | | | | Task-number: QTBUG-16312 Reviewed-by: Marius Storm-Olsen
* | PathView crashed when the path is provided with undefined values.Martin Jones2011-01-061-1/+7
| | | | | | | | | | Task-number: QTBUG-16356 Reviewed-by: Bea Lam
* | PathView: update modelCount before attempting to regenerate delegates.Martin Jones2011-01-061-1/+3
|/ | | | | | | | | If the model is a VisualDataModel, the count will initally be zero and modelCount is not updated due to itemsInserted() before the component is completed. Task-number: QTBUG-16357 Reviewed-by: Bea Lam
* Doc fixes for introduction page and Item docsBea Lam2011-01-061-28/+0
| | | | | | | Moved 'Identity' and 'Property Change Signals' sections from Item docs to the intro page, which previously had a section on ids but this has been moved out of the 'Properties' section since an id isn't an ordinary property.
* Support for swap modes in QGLWindowSurface.Michael Dominic K2011-01-042-1/+15
| | | | | | | | AlwaysFull and AlwaysPartial implemented in ES only for now. By default do automatic. Merge-request: 993 Reviewed-by: Samuel Rødal <samuel.rodal@nokia.com>
* Pre-create the GL share widget before window surface creation.Michael Dominic K2011-01-041-6/+2
| | | | | | | Not pixmap creation. Merge-request: 988 Reviewed-by: Samuel Rødal <samuel.rodal@nokia.com>
* Fixed first element being a LineToElement in QPainterPath::connectPath()Samuel Rødal2011-01-041-1/+2
| | | | | | | | This would produce an invalid path, causing potential crashes in various parts of Qt. Task-number: QTBUG-16377 Reviewed-by: Gunnar Sletta
* Clear WSERV content when a native child receives an "expose"Jason Barron2010-12-291-0/+8
| | | | | | | | | | | | | | | | | | | | Native child windows on Symbian can cause composition artifacts on S^3 because they own a visible RWindow instance, but the RWindow technically has no content because child windows paint their content to their parent's backing store. In the event that a native child widget completely obscures a top level, the composition engine does not understand that the child is "empty" and should clear the UI surface to let the top level "shine through". The result is that articacts can remain on the UI surface after a transition from a WSERV drawing app to a Qt (EGL rendering) app. To fix this issue, we call CWindowGc::Clear() when the native child widget receives an "expose" event. This clears the UI surface content and ensures the top level is visible even though it is technically below another RWindow. Task-number: QTMOBILITY-484 Reviewed-by: Jani Hautakangas
* Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-s60-public into ↵Qt Continuous Integration System2010-12-231-6/+18
|\ | | | | | | | | | | | | 4.7-integration * '4.7' of scm.dev.nokia.troll.no:qt/qt-s60-public: Fix fullscreen/Maximized dialog misplacement in Symbian
| * Fix fullscreen/Maximized dialog misplacement in SymbianMiikka Heikkinen2010-12-231-6/+18
| | | | | | | | | | Task-number: QTBUG-16277 Reviewed-by: Sami Merila
* | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into ↵Qt Continuous Integration System2010-12-232-36/+86
|\ \ | | | | | | | | | | | | | | | | | | 4.7-integration * '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-2: Add Postgresql 8.x and 9 supports
| * | Add Postgresql 8.x and 9 supportsCharles Yin2010-12-232-36/+86
| |/ | | | | | | | | | | Change-Id: Ic740686ead768cc3e106703049d878549dfd3c6a Task-number:QTBUG-14206 Reviewed-by: Michael Goddard
* | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7-integrationQt Continuous Integration System2010-12-2310-20/+83
|\ \ | |/ |/| | | | | | | | | | | | | | | | | | | | | | | | | * '4.7' of scm.dev.nokia.troll.no:qt/qt-qml: WorkerScript could starve image loading of CPU. More docs for FolderListModel Improve docs on attached properties on view delegates. Models which load incrementally via fetchMore() don't work. Try fixing build error on Windows Ensure PathView doesn't jump when starting to drag. Nested flickables would react alternately to flicks. Improve QDeclarativeComponent test coverage. Add additional QDeclarativeProperty autotests. Removing all visible items in ListView resulted in blank view. XmlListModel requests should set 'Accept' header to 'application/xml'
| * WorkerScript could starve image loading of CPU.Martin Jones2010-12-231-1/+1
| | | | | | | | | | | | | | | | We use idle priority for image loading and XmlListModel in order to keep the UI responsive, but WorkerScript used LowPriority which would significantly reduce CPU available for image loading. Task-number: QTBUG-16167
| * More docs for FolderListModelMartin Jones2010-12-231-0/+33
| |
| * Improve docs on attached properties on view delegates.Martin Jones2010-12-233-0/+25
| | | | | | | | | | | | | | | | Clarify that the properties are attached to the root of the delegate, and must be accessed as such by child items. Task-number: QTBUG-16193 Reviewed-by: Bea Lam
| * Models which load incrementally via fetchMore() don't work.Martin Jones2010-12-231-0/+6
| | | | | | | | | | | | | | | | Call canFetchMore()/fetchMore() on setModel(), setRootIndex() and when the last item is created. Task-number: QTBUG-16039 Reviewed-by: Bea Lam
| * Ensure PathView doesn't jump when starting to drag.Martin Jones2010-12-231-1/+3
| | | | | | | | | | Task-number: QTBUG-16133 Reviewed-by: Bea Lam
| * Nested flickables would react alternately to flicks.Martin Jones2010-12-231-2/+4
| | | | | | | | | | | | | | | | The grab was not always kept by filtering Flickables, but would remain set next flick, resulting in toggling of flicking. Task-number: QTBUG-16177 Reviewed-by: Michael Brasser
| * Improve QDeclarativeComponent test coverage.Michael Brasser2010-12-222-12/+0
| |
| * Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7-integrationQt Continuous Integration System2010-12-222-4/+11
| |\ | | | | | | | | | | | | | | | * '4.7' of scm.dev.nokia.troll.no:qt/qt-qml: Removing all visible items in ListView resulted in blank view. XmlListModel requests should set 'Accept' header to 'application/xml'
| | * Removing all visible items in ListView resulted in blank view.Martin Jones2010-12-221-4/+10
| | | | | | | | | | | | | | | | | | | | | | | | | | | When delayRemove is true and all visible items are tagged to be removed the visibleIndex became invalid and refill() began filling from 0. Task-number: QTBUG-16183 Reviewed-by: Michael Brasser
| | * XmlListModel requests should set 'Accept' header to 'application/xml'Bea Lam2010-12-221-0/+1
| | | | | | | | | | | | | | | Task-number: QTBUG-15836 Reviewed-by: Michael Brasser
* | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into ↵Qt Continuous Integration System2010-12-231-3/+32
|\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | 4.7-integration * '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-2: Improve performance of bilinear upscaling of images with neon.
| * | | Improve performance of bilinear upscaling of images with neon.Samuel Rødal2010-12-221-3/+32
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Gives an improvement of around 19.6 % for upscaling a 256x256 pixmap to 480x480 with SmoothPixmapFilter enabled. Reviewed-by: Olivier Goffart
* | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-water-staging into ↵Qt Continuous Integration System2010-12-232-3/+7
|\ \ \ \ | |_|/ / |/| | | | | | | | | | | | | | | | | | | | | | | 4.7-integration * '4.7' of scm.dev.nokia.troll.no:qt/qt-water-staging: Fix crash in indeterminate progressbars on windows Fix timer regression for indeterminate progressbars
| * | | Fix crash in indeterminate progressbars on windowsJens Bache-Wiig2010-12-222-3/+6
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Note that this is a surgical fix for 4.7 only. In 4.8 we will add these checks at the top of the styling functions or in the widgets instead. Task-number:QTBUG-15227 Reviewed-by:gabi
| * | | Fix timer regression for indeterminate progressbarsJens Bache-Wiig2010-12-221-0/+1
| | |/ | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Indeterminate progressbars were broken since 4.7.0 due to 0f771c62f5253a969f5a8a81bfd9254b9bd58b8f Since start was never called on QElapsedTimer, the elaped time was undefined and resulted in random repaints and behavior for indeterminate progressbars. Task-number:QTBUG-15227 Reviewed-by:richard
* | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-s60-public into ↵Qt Continuous Integration System2010-12-221-1/+11
|\ \ \ | |_|/ |/| | | | | | | | | | | | | | | | | 4.7-integration * '4.7' of scm.dev.nokia.troll.no:qt/qt-s60-public: Fix infinite loop in qmake when reading malformed .ts files. Fix libinfixed usage in Symbian when def files are used
| * | Fix libinfixed usage in Symbian when def files are usedMiikka Heikkinen2010-12-221-1/+11
| |/ | | | | | | | | | | | | | | There was a hardcoded lookup on "qtcore.dll" in s60main, which caused loading of wrong dll. Task-number: QTBUG-16221 Reviewed-by: Janne Koskinen
* | Made documentation of QPixmap::createMaskFromColor match behaviour.Samuel Rødal2010-12-221-2/+2
| | | | | | | | | | Task-number: QTBUG-16223 Reviewed-by: Gunnar Sletta
* | Improve performance of bilinear downscaling of images with neon.Samuel Rødal2010-12-221-26/+107
|/ | | | | | | Gives a 36 % performance boost for downscaling a 512x512 pixmap to 480x480 with SmoothPixmapFilter enabled. Reviewed-by: Andreas Kling
* Merge branch '4.7' of scm.dev.nokia.troll.no:qt/doc-staging into 4.7-integrationQt Continuous Integration System2010-12-217-22/+44
|\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * '4.7' of scm.dev.nokia.troll.no:qt/doc-staging: (29 commits) Doc: Added a missing license header. doc: Replaced some \raw and \endraw uses with \table and \endtable doc: Replaced some \raw and \endraw uses with \table and \endtable doc: Replaced some \raw and \endraw uses with \table and \endtable Doc: Added a note about the Public Suffix List. Doc: Fixed doc bug in Diagram Scene example doc: Removed some empty \row commands from a table. Doc: Added link to QML Basic Types in main Qt Quick page. Doc: Added missing What's New information for Qt 4.6 and 4.7. Doc: Fixed incorrect case in a page file name. Doc: Added a link to the QML Basic Types page. Doc: Removed duplicate external page reference. Doc: Fixed a link to the correct searchPaths() function. Doc: Added documentation about the use of null custom title bar widgets. Doc: Added a missing external page reference. Fixed the QML Focus document. Fixed snippets, images, and formatting. Added QML coding convention for "private" properties. Fixed link to qtestlib-tools by adding link to qt-webpages.qdoc. Some whitespace fixes. Fixed a bug by changing the id name to lower case. ...
| * Merge branch '4.7-upstream' into 4.7-docA-Team2010-12-1423-54/+139
| |\
| * \ Merge branch '4.7-upstream' into 4.7-docA-Team2010-12-1317-78/+181
| |\ \
| * \ \ Merge branch '4.7-upstream' into 4.7-docA-Team2010-12-109-162/+214
| |\ \ \
| * \ \ \ Merge branch '4.7-upstream' into 4.7-docA-Team2010-12-097-8/+17
| |\ \ \ \
| * \ \ \ \ Merge branch '4.7-upstream' into 4.7-docA-Team2010-12-0817-70/+139
| |\ \ \ \ \
| * \ \ \ \ \ Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-doc-team into 4.7David Boddie2010-12-073-4/+18
| |\ \ \ \ \ \
| | * \ \ \ \ \ Merge branch '4.7-upstream' into 4.7-docA-Team2010-12-063-4/+18
| | |\ \ \ \ \ \
| * | | | | | | | Doc: Fixed a link to the correct searchPaths() function.David Boddie2010-12-071-1/+1
| | | | | | | | |
| * | | | | | | | Doc: Added documentation about the use of null custom title bar widgets.David Boddie2010-12-071-5/+12
| |/ / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | Task-number: QTBUG-15516
| * | | | | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-doc-team into 4.7David Boddie2010-12-06114-862/+1978
| |\ \ \ \ \ \ \
| | * \ \ \ \ \ \ Merge branch '4.7-upstream' into 4.7-docA-Team2010-12-031-0/+3
| | |\ \ \ \ \ \ \
| | * \ \ \ \ \ \ \ Merge branch '4.7-upstream' into 4.7-docA-Team2010-12-024-3/+42
| | |\ \ \ \ \ \ \ \