summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* 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
* | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into ↵Qt Continuous Integration System2010-12-222-28/+109
|\ \ \ \ | |_|/ / |/| | | | | | | | | | | | | | | | | | | | | | | 4.7-integration * '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-2: Made documentation of QPixmap::createMaskFromColor match behaviour. Improve performance of bilinear downscaling of images with neon.
| * | | 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/qt-qml into 4.7-integrationQt Continuous Integration System2010-12-223-93/+107
|\ \ \ | |/ / |/| / | |/ | | | | | | * '4.7' of scm.dev.nokia.troll.no:qt/qt-qml: Document the 'variant' basic type Add double type to QML Basic Types docs Remove redundant docs
| * Document the 'variant' basic typeBea Lam2010-12-222-12/+87
| | | | | | | | | | | | | | | | | | This includes documentation on restrictions and considerations when storing a JavaScript object with this type, since such properties only hold a copy of the object's values and not the actual object. Task-number: QTBUG-16196 Reviewed-by: Michael Brasser
| * Add double type to QML Basic Types docsBea Lam2010-12-221-0/+20
| |
| * Remove redundant docsBea Lam2010-12-221-81/+0
|/
* Merge branch '4.7' of scm.dev.nokia.troll.no:qt/doc-staging into 4.7-integrationQt Continuous Integration System2010-12-2152-3464/+1943
|\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * '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. ...
| * Doc: Added a missing license header.David Boddie2010-12-211-0/+39
| |
| * Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-doc-team into 4.7David Boddie2010-12-15105-3511/+2294
| |\
| | * Merge branch '4.7-upstream' into 4.7-docA-Team2010-12-1428-85/+286
| | |\
| | * \ Merge branch '4.7-upstream' into 4.7-docA-Team2010-12-1342-157/+802
| | |\ \
| | * | | doc: Replaced some \raw and \endraw uses with \table and \endtableMartin Smith2010-12-131-82/+30
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | In DITA XML, there is no straightforward way to translate raw html into DITA XML, because the XML stream writer automagically escapes all the raw html elements. So I am beginning to replace uses of the \raw command with \table, which gets output correctly. The problem is the XML stream writer must see each XML element start and end, because it keeps them on a stack. When you output XML elements with the writeCharacters() function, it escapes the '<' and '>' of any XML elements the character string contains.
| | * | | doc: Replaced some \raw and \endraw uses with \table and \endtableMartin Smith2010-12-138-2692/+768
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | In DITA XML, there is no straightforward way to translate raw html into DITA XML, because the XML stream writer automagically escapes all the raw html elements. So I am beginning to replace uses of the \raw command with \table, which gets output correctly. The problem is the XML stream writer must see each XML element start and end, because it keeps them on a stack. When you output XML elements with the writeCharacters() function, it escapes the '<' and '>' of any XML elements the character string contains.
| | * | | Merge branch '4.7' of git@scm.dev.nokia.troll.no:qt/qt-doc-team into 4.7Martin Smith2010-12-1328-187/+345
| | |\ \ \
| | | * \ \ Merge branch '4.7-upstream' into 4.7-docA-Team2010-12-111-0/+7
| | | |\ \ \
| | | * \ \ \ Merge branch '4.7-upstream' into 4.7-docA-Team2010-12-1016-174/+276
| | | |\ \ \ \
| | | * \ \ \ \ Merge branch '4.7-upstream' into 4.7-docA-Team2010-12-0910-12/+61
| | | |\ \ \ \ \
| | * | | | | | | doc: Replaced some \raw and \endraw uses with \table and \endtableMartin Smith2010-12-131-336/+91
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | In DITA XML, there is no straightforward way to translate raw html into DITA XML, because the XML stream writer automagically escapes all the raw html elements. So I am beginning to replace uses of the \raw command with \table, which gets output correctly. The problem is the XML stream writer must see each XML element start and end, because it keeps them on a stack. When you output XML elements with the writeCharacters() function, it escapes the '<' and '>' of any XML elements the character string contains.
| * | | | | | | | Doc: Added a note about the Public Suffix List.David Boddie2010-12-101-30/+51
| | |/ / / / / / | |/| | | | | | | | | | | | | | | | | | | | | | Added at the request of Peter Hartmann and Legal.
| * | | | | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-doc-team into 4.7Geir Vattekar2010-12-09293-3887/+9136
| |\ \ \ \ \ \ \ | | |/ / / / / /
generated by cgit v0.12 at 2024-12-01 10:26:19 (GMT)