summaryrefslogtreecommitdiffstats
path: root/src
Commit message (Collapse)AuthorAgeFilesLines
* Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7Aaron Kennedy2010-05-1758-606/+1538
|\
| * Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7-integrationQt Continuous Integration System2010-05-1719-95/+302
| |\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * '4.7' of scm.dev.nokia.troll.no:qt/qt-qml: Focus should be applied to focus scopes all the way up the chain, not Add focus docs snippets Fix doc for status, add Image::onLoaded. Don't crash due to recursive positioning. ListModel::get() shouldn't print warnings for invalid indices since it Add \brief to TextInput Add missing .pro Restructure the examples. They are now organized into various graphicsWidgets doc example was previously removed Doc fix Add a "priority" property to Keys and KeyNavigation
| | * Focus should be applied to focus scopes all the way up the chain, notBea Lam2010-05-172-6/+2
| | | | | | | | | | | | just to the closest focus scope parent.
| | * Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7Warwick Allison2010-05-1710-75/+264
| | |\
| | | * Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7Martin Jones2010-05-1710-17/+15
| | | |\
| | | * | Don't crash due to recursive positioning.Martin Jones2010-05-172-25/+40
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Also extend positioner anchor check to include fill and centerIn. Task-number: QTBUG-10731
| | | * | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7Martin Jones2010-05-16129-699/+1656
| | | |\ \
| | | * \ \ Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7Martin Jones2010-05-146-16/+18
| | | |\ \ \
| | | * | | | Add a "priority" property to Keys and KeyNavigationMartin Jones2010-05-147-45/+222
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Allows intercepting keys before or after normal item key processing. Task-number: QTBUG-10467
| | * | | | | Fix doc for status, add Image::onLoaded.Warwick Allison2010-05-172-2/+23
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | statusChanged is NOT emitted for local files, nor should it be (they are loaded synchronously, so status is *initially* Ready). Add onLoaded signal that *is* emitted. Reviewed-by: Michael Brasser
| * | | | | | Use case-insensitive comparison for the "data" scheme in URLsThiago Macieira2010-05-151-1/+1
| | | | | | |
| * | | | | | Revert "Optimized pixmapcache key generation for icons and styles"Thiago Macieira2010-05-153-48/+65
| | | | | | | | | | | | | | | | | | | | | | | | | | | | This reverts commit b8f1d7fd87985375a373ca85052c475241822b03.
| * | | | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into ↵Qt Continuous Integration System2010-05-1511-330/+529
| |\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 4.7-integration * '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1: Revert "More improvements to pixmap cache key generation" More improvements to pixmap cache key generation More 4.7 stuff. Fix for autotest failure in qwidget::saveRestoreGeometry() Optimized pixmapcache key generation for icons and styles doc: Another upgrade of the top page and overviews. Mac: restoreGeometry() [Regression] Build failure on Mac Carbon doc: Added some \briefs to how-to docs. Some 4.7 changes. Updated changelog. Cherry pick fix for MOBILITY-932 from Qt Mobility. Cherry pick fix for MOBILITY-962 from Qt Mobility. Cherry pick fix for MOBILITY-828 from Qt Mobility. Bearer management changes from Qt Mobility. Cherry pick fix for MOBILITY-828 from Qt Mobility. Added snippet labels to QML Dial example. Fixed documentation typo.
| | * | | | | | Revert "More improvements to pixmap cache key generation"Thiago Macieira2010-05-144-57/+50
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This reverts commit c8d2e18c4b431870560f324a17f20904bb47ae68.
| | * | | | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into ↵Qt Continuous Integration System2010-05-1412-334/+540
| | |\ \ \ \ \ \ | | | |_|_|_|/ / | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 4.7-integration * '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1: More improvements to pixmap cache key generation More 4.7 stuff. Fix for autotest failure in qwidget::saveRestoreGeometry() Optimized pixmapcache key generation for icons and styles doc: Another upgrade of the top page and overviews. Mac: restoreGeometry() [Regression] Build failure on Mac Carbon doc: Added some \briefs to how-to docs. Some 4.7 changes. Updated changelog. Cherry pick fix for MOBILITY-932 from Qt Mobility. Cherry pick fix for MOBILITY-962 from Qt Mobility. Cherry pick fix for MOBILITY-828 from Qt Mobility. Bearer management changes from Qt Mobility. Cherry pick fix for MOBILITY-828 from Qt Mobility. Added snippet labels to QML Dial example. Fixed documentation typo.
| | | * | | | | More improvements to pixmap cache key generationJens Bache-Wiig2010-05-144-50/+57
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | HexString is actually more optimal than fromRawData since we dont need any allocations while using it. Arguably the code is also a bit nicer. Task-number: QTBUG-9850 Reviewed-by: ogoffart
| | | * | | | | Fix for autotest failure in qwidget::saveRestoreGeometry()Carlos Manuel Duclos Vergara2010-05-141-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The problem was that the fix for bug QTBUG-10519 introduced a new state for saving the geometry. However there is an exception and that exception comes into play when saving a maximized window. This fixes that by making sure we only enter into that state when the window is not currently maximized. Reviewed-by: tbastian
| | | * | | | | Optimized pixmapcache key generation for icons and stylesJens Bache-Wiig2010-05-143-65/+48
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | If we sacrifice the readability we can make cache keys much faster. Since there is rarely a usecase where we need these as human readable strings we can take advantage of this fact and remove almost all memory allocations while still keeping them unique. Task-number: QTBUG-9850 Reviewed-by: brad
| | | * | | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into ↵Qt Continuous Integration System2010-05-148-265/+481
| | | |\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 4.7-integration * '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1: Mac: restoreGeometry() [Regression] Build failure on Mac Carbon doc: Added some \briefs to how-to docs. Some 4.7 changes. Updated changelog. Cherry pick fix for MOBILITY-932 from Qt Mobility. Cherry pick fix for MOBILITY-962 from Qt Mobility. Cherry pick fix for MOBILITY-828 from Qt Mobility. Bearer management changes from Qt Mobility. Cherry pick fix for MOBILITY-828 from Qt Mobility. Added snippet labels to QML Dial example. Fixed documentation typo.
| | | | * | | | | Mac: restoreGeometry()Carlos Manuel Duclos Vergara2010-05-143-3/+48
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The problem here is the fact that when zooming (maximizing) a window, we should update the starting position since the window is now starting at 0,0. However when restoring the window should be placed in the original position. The bug here occurs because we kept the original position and the new size. So the window was drawn were it was using the new size. This patch introduces a boolean flag that keeps track of the maximized state. We are interested in knowing if the window was maximized but not restored, so when saving the geometry we have a way to know that we need to "move" the window to 0,0. Task-number: QTBUG-10504 Reviewed-by: Richard Moe Gustavsen
| | | | * | | | | [Regression] Build failure on Mac CarbonCarlos Manuel Duclos Vergara2010-05-141-0/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Including objc/runtime.h when using Carbon produced problems so I protected that include via ifdef. Task-number: QTBUG-10519 Reviewed-by: Jason Mcdonald
| | | | * | | | | Merge remote branch 'staging/4.7' into bearermanagement/mobility-changes-squashAaron McCarthy2010-05-14177-977/+2332
| | | | |\ \ \ \ \
| | | | * | | | | | Cherry pick fix for MOBILITY-932 from Qt Mobility.Aaron McCarthy2010-05-141-18/+14
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 807e9868152bb06d37895a5e3d1a3e49908a6036
| | | | * | | | | | Cherry pick fix for MOBILITY-828 from Qt Mobility.Aaron McCarthy2010-05-141-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Change 29776be110cdc121eb5a22446be6adae8ff6f4d8 from Qt Mobility.
| | | | * | | | | | Cherry pick fix for MOBILITY-828 from Qt Mobility.Aaron McCarthy2010-05-144-243/+416
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Change e5f8e3069d0de428a751e8a1dd88f3585f2d3f5f from Qt Mobility.
| * | | | | | | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-webkit into 4.7-integrationQt Continuous Integration System2010-05-1531-244/+718
| |\ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * '4.7' of scm.dev.nokia.troll.no:qt/qt-webkit: Updated WebKit to 5cf023650a8da206a8cf3130e9d4820b95e1bc7c Updated WebKit to 57d10d5c05e59bbf7de8189ff47dd18d1be996dc
| | * \ \ \ \ \ \ \ \ Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-webkit into 4.7-integrationQt Continuous Integration System2010-05-1431-244/+718
| | |\ \ \ \ \ \ \ \ \ | | | |/ / / / / / / / | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * '4.7' of scm.dev.nokia.troll.no:qt/qt-webkit: Updated WebKit to 5cf023650a8da206a8cf3130e9d4820b95e1bc7c Updated WebKit to 57d10d5c05e59bbf7de8189ff47dd18d1be996dc
| | | * | | | | | | | Updated WebKit to 5cf023650a8da206a8cf3130e9d4820b95e1bc7cSimon Hausmann2010-05-1430-229/+718
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Integrated changes: * Doc day API doc overhaul || <https://webkit.org/b/38370> || [Qt] GraphicsLayer: depth-test causes flicker in certain situations || || <https://webkit.org/b/38921> || [Qt] emit initialLayoutCompleted signal from FrameLoaderClientQt::dispatchDidFirstVisuallyNonEmptyLayout || || <https://webkit.org/b/38863> || [Qt] Detect debug mode consistently || || <https://webkit.org/b/38389> || [Qt] Update the Symbian version for the user agent || || <https://webkit.org/b/39062> || [Qt] Improve QtLauncher user agent dialog resize || || <https://webkit.org/b/38841> || Ignore invalid values for various CanvasRenderingContext2D properties || || <https://webkit.org/b/38685> || [Qt] tst_QWebPage::inputMethods failing on Maemo5 || || <https://webkit.org/b/38655> || [Qt] REGRESSION(r58497) tst_QGraphicsWebView::crashOnViewlessWebPages() is failing ||
| | | * | | | | | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-webkit into 4.7-integrationQt Continuous Integration System2010-05-144-17/+2
| | | |\ \ \ \ \ \ \ \ | | | | |/ / / / / / / | | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | * '4.7' of scm.dev.nokia.troll.no:qt/qt-webkit: Updated WebKit to 57d10d5c05e59bbf7de8189ff47dd18d1be996dc
| | | | * | | | | | | Updated WebKit to 57d10d5c05e59bbf7de8189ff47dd18d1be996dcSimon Hausmann2010-05-134-17/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Disable the JIT on Symbian again, as it causes crashes.
| * | | | | | | | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into ↵Qt Continuous Integration System2010-05-147-18/+51
| |\ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 4.7-integration * '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-2: Revert "Optimize QPixmapIconEngine's pixmap() function" Limit the lower glyph texture cache size to 16x16 in GL. Added workarounds for two MBX/SGX specific GL ES bugs/problems. Add missing file! Optimize QPixmapIconEngine's pixmap() function
| | * | | | | | | | | Revert "Optimize QPixmapIconEngine's pixmap() function"Olivier Goffart2010-05-141-21/+14
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This reverts commit ad6dafee9be288bcef6b2c4b318b234d2995abff. This is replaced by commit c8d2e18c4b431870560f324a17f20904bb47ae68
| | * | | | | | | | | Limit the lower glyph texture cache size to 16x16 in GL.Trond Kjernåsen2010-05-141-0/+12
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The SGX chip has a limitation regarding FBOs in that it doesn't support FBO sizes that are POT and less than 16 pixels in width/height. Since the FBO we use in the GL glyph cache always mirrors the size of the texture itself, we limit that instead to avoid creating invalid FBOs. Task-number: QTBUG-10645 Reviewed-by: Gunnar
| | * | | | | | | | | Added workarounds for two MBX/SGX specific GL ES bugs/problems.Trond Kjernåsen2010-05-147-18/+39
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The workaround flags are put into the platform independent section for now, since there might be a general need for these as we expand our GL and GL ES usage. The workaround_needsFullClearOnEveryFrame flag covers the case where you get a performance penalty on PowerVR hw if all rendering buffers are not cleared. The workaround_brokenFBOReadBack flag covers the case where copying pixels from a texture (e.g. via glCopyTexSubImage2d()) bound in an FBO doesn't work. Task-number: QTBUG-10670 Reviewed-by: Gunnar
| | * | | | | | | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into 4.7aavit2010-05-14280-4022/+5626
| | |\ \ \ \ \ \ \ \ \ | | | |/ / / / / / / /
| | * | | | | | | | | Optimize QPixmapIconEngine's pixmap() functionaavit2010-05-111-14/+21
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Replace needlessly expensive cache key generation Task-number: QTBUG-9850 Reviewed-by: Trond
* | | | | | | | | | | Check for acquireReg() failureAaron Kennedy2010-05-171-0/+27
| |_|_|_|_|_|_|_|_|/ |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | QTBUG-10696
* | | | | | | | | | ListModel::get() shouldn't print warnings for invalid indices since itBea Lam2010-05-171-4/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | returns undefined items for these cases anywyay.
* | | | | | | | | | Add \brief to TextInputBea Lam2010-05-171-1/+1
| |_|_|_|_|_|/ / / |/| | | | | | | |
* | | | | | | | | Restructure the examples. They are now organized into variousBea Lam2010-05-168-12/+12
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | subdirectories to make it easier to locate examples for certain features (e.g. animation) and to distinguish between different types of examples (e.g. very basic examples vs complex demo-like examples).
* | | | | | | | | Doc fixBea Lam2010-05-161-0/+1
|/ / / / / / / /
* | | | | | | | Update the dependencies in src.pro because we don't have a good buildsystemThiago Macieira2010-05-141-5/+15
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | QtXml is not required by QtSvg, QtWebKit or QtDeclarative. And QtDeclarative doesn't link to QtWebKit anymore (imports do). But it does link to QtOpenGL.
* | | | | | | | QtDeclarative doesn't use QtXml, so don't link to it or require others toThiago Macieira2010-05-141-2/+2
| | | | | | | |
* | | | | | | | Rename QML Runtime (executable) to QML LauncherKai Koehne2010-05-141-0/+5
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The qml executable was first referred to as QML Viewer, then QML Runtime ... however, the latter one caused much confusion (see old version of qmlruntime.qdoc). Doc changes reviewed by Leena Miettinen.
* | | | | | | | Fix compilation of QtDeclarative module (gcc)Kai Koehne2010-05-141-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Broke with commit 645b9ee9dd6
* | | | | | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7-integrationQt Continuous Integration System2010-05-1428-247/+789
|\ \ \ \ \ \ \ \ | |_|/ / / / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * '4.7' of scm.dev.nokia.troll.no:qt/qt-qml: Qt.include() support in worker scripts Only add "include" property in non-workerscript threads Missing files from 645b9ee9dd6e0576542cc61872ecedb408ca8a89 Reduce the chance of AnchorAnimation animating geometry changes it Add Qt.include() method for scoped inclusion of JavaScript files Fix crash in ParentAnimation. Revert "Fix crash in ParentAnimation." Symbian build fix to declarative auto and benchmark tests Revert "Use raster graphicssystem for qml.app on OS X." Fix crash in ParentAnimation. Minor declarative webview tweaks Removed dependency of QDeclarativeWebView to private Qt (Declarative) API Note that you need to unset a flag to create a visual item Follow-up on Flickable changes. ListModel::get() should return undefined if bad index specified Add an example spinner. Fix crash on remote content. Dates and variants are not considered nested objects
| * | | | | | | Qt.include() support in worker scriptsAaron Kennedy2010-05-144-1/+69
| | | | | | | |
| * | | | | | | Only add "include" property in non-workerscript threadsAaron Kennedy2010-05-141-1/+2
| | | | | | | |
| * | | | | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7Aaron Kennedy2010-05-141-4/+8
| |\ \ \ \ \ \ \
| | * | | | | | | Reduce the chance of AnchorAnimation animating geometry changes itMichael Brasser2010-05-141-4/+8
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | isn't responsible for.
generated by cgit v0.12 at 2025-03-01 01:19:29 (GMT)