summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Designer: Block QEvent::WinIdChange.Friedemann Kleint2011-01-061-0/+1
| | | | | | | As it causes an obscure deletion crash related to the formeditor rubberband on Mac. Reviewed-by: con
* QUrl::setUrl should call detachOlivier Goffart2011-01-062-0/+9
| | | | | | 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
* Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7-integrationQt Continuous Integration System2011-01-063-116/+138
|\ | | | | | | | | | | * '4.7' of scm.dev.nokia.troll.no:qt/qt-qml: Update docs - calling overloaded functions from QML is now supported Doc fixes for introduction page and Item docs
| * Update docs - calling overloaded functions from QML is now supportedBea Lam2011-01-061-5/+8
| |
| * Doc fixes for introduction page and Item docsBea Lam2011-01-062-111/+130
| | | | | | | | | | | | | | 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.
* | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7-integrationQt Continuous Integration System2011-01-0510-130/+1779
|\ \ | |/ | | | | | | * '4.7' of scm.dev.nokia.troll.no:qt/qt-qml: Fix outdated tests
| * Fix outdated testsAlan Alpert2011-01-0510-130/+1779
|/ | | | | | | selftest_noimages and qdeclarativespringanimation were correct, updating test scripts to match. Task-number: QTBUG-14792
* Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-s60-public into ↵Qt Continuous Integration System2011-01-043-1/+51
|\ | | | | | | | | | | | | | | 4.7-integration * '4.7' of scm.dev.nokia.troll.no:qt/qt-s60-public: Fix def file names for libinfixed testlib Generate freeze targets in Symbian
| * Fix def file names for libinfixed testlibMiikka Heikkinen2011-01-041-1/+1
| | | | | | | | Reviewed-by: Janne Koskinen
| * Generate freeze targets in SymbianMiikka Heikkinen2011-01-042-0/+50
| | | | | | | | | | | | | | Make it possible to freeze def files via makefile targets. Task-number: QTBUG-13769 Reviewed-by: Janne Koskinen
* | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into ↵Qt Continuous Integration System2011-01-049-11/+81
|\ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 4.7-integration * '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-2: QMeeGoGraphicsSystemHelper::setSwapBehavior implementation. Support for swap modes in QGLWindowSurface. Pre-create the GL share widget before window surface creation. QMeeGoSwitchEvent exported and static. Fixed first element being a LineToElement in QPainterPath::connectPath()
| * | QMeeGoGraphicsSystemHelper::setSwapBehavior implementation.Michael Dominic K2011-01-043-1/+34
| | | | | | | | | | | | | | | Merge-request: 993 Reviewed-by: Samuel Rødal <samuel.rodal@nokia.com>
| * | 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>
| * | QMeeGoSwitchEvent exported and static.Michael Dominic K2011-01-041-2/+2
| | | | | | | | | | | | | | | Merge-request: 1009 Reviewed-by: Samuel Rødal <samuel.rodal@nokia.com>
| * | Fixed first element being a LineToElement in QPainterPath::connectPath()Samuel Rødal2011-01-042-1/+28
| | | | | | | | | | | | | | | | | | | | | | | | This would produce an invalid path, causing potential crashes in various parts of Qt. Task-number: QTBUG-16377 Reviewed-by: Gunnar Sletta
* | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7-integrationQt Continuous Integration System2011-01-0420-923/+923
|\ \ \ | | | | | | | | | | | | | | | | * '4.7' of scm.dev.nokia.troll.no:qt/qt-qml: Update visual tests
| * | | Update visual testsAlan Alpert2011-01-0420-923/+923
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Minor changes in flickable and rectangle radius behaviours have led to some altered pixels here and there. Task-number: QTBUG-14792
* | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-s60-public into ↵Qt Continuous Integration System2011-01-041-1/+1
|\ \ \ \ | |/ / / |/| | / | | |/ | |/| | | | | | | 4.7-integration * '4.7' of scm.dev.nokia.troll.no:qt/qt-s60-public: Ignore static_and_shared in Symbian builds.
| * | Ignore static_and_shared in Symbian builds.Miikka Heikkinen2011-01-031-1/+1
|/ / | | | | | | | | | | | | | | | | The function addExclusiveBuilds doesn't work on Symbian and is unlikely to ever work due to build system mandated target directories, so ignore static_and_shared in Symbian builds that rely on Symbian toolchains. Task-number: QTBUG-16298 Reviewed-by: axis
* | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into ↵Qt Continuous Integration System2010-12-301-1/+1
|\ \ | |/ | | | | | | | | | | 4.7-integration * '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-2: Fixed networkselftest failing to resolve hostname
| * Fixed networkselftest failing to resolve hostnameRohan McGovern2010-12-301-1/+1
|/ | | | | | | | | The logic here was the opposite from what was intended. Note that this bug was hidden under normal circumstances when running the entire testcase. It only appeared when one of the following was true: (1) httpProxy or socks5Proxy was run on its own, or (2) the dnsResolution test failed.
* Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-s60-public into ↵Qt Continuous Integration System2010-12-291-0/+8
|\ | | | | | | | | | | | | 4.7-integration * '4.7' of scm.dev.nokia.troll.no:qt/qt-s60-public: Clear WSERV content when a native child receives an "expose"
| * 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-233-36/+88
|\ \ | | | | | | | | | | | | | | | | | | 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-233-36/+88
| |/ | | | | | | | | | | 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-2346-550/+3199
|\ \ | |/ |/| | | | | | | | | | | | | | | | | | | | | | | | | * '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-237-8/+75
| | | | | | | | | | | | | | | | 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-235-1/+193
| | | | | | | | | | | | | | | | Call canFetchMore()/fetchMore() on setModel(), setRootIndex() and when the last item is created. Task-number: QTBUG-16039 Reviewed-by: Bea Lam
| * Try fixing build error on WindowsBea Lam2010-12-231-1/+1
| |
| * Ensure PathView doesn't jump when starting to drag.Martin Jones2010-12-2317-520/+524
| | | | | | | | | | Task-number: QTBUG-16133 Reviewed-by: Bea Lam
| * Nested flickables would react alternately to flicks.Martin Jones2010-12-239-2/+2213
| | | | | | | | | | | | | | | | 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-223-12/+15
| |
| * Add additional QDeclarativeProperty autotests.Michael Brasser2010-12-221-0/+62
| |
| * Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7-integrationQt Continuous Integration System2010-12-224-5/+82
| |\ | | | | | | | | | | | | | | | * '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-222-5/+12
| | | | | | | | | | | | | | | | | | | | | | | | | | | 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-222-0/+70
| | | | | | | | | | | | | | | 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-233-3/+14
|\ \ \ \ | |_|/ / |/| | | | | | | | | | | | | | | | | | | | | | | 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-223-3/+13
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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-222-2/+12
|\ \ \ \ | |_|/ / |/| | | | | | | | | | | | | | | | | | | | | | | 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 infinite loop in qmake when reading malformed .ts files.Miikka Heikkinen2010-12-221-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | No checking for the end of xml file was done in while loop looking for TS element. Task-number: QTBUG-16261 Reviewed-by: Janne Koskinen
| * | | 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