summaryrefslogtreecommitdiffstats
path: root/src
Commit message (Collapse)AuthorAgeFilesLines
* doc: Fixed many broken links.Martin Smith2010-05-198-50/+48
|
* Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into ↵Qt Continuous Integration System2010-05-1912-2069/+2097
|\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 4.7-integration * '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1: Only setup ICD test data when ICD is enabled. Doc: Fixed two diagrams and finally committed images for them. Make sure cursorPositionChanged is emitted when doing undo/redo Some more 4.7.0 changes Fix cosmetic issue in designer filter edits Doc: Adding support for IE 6, 7 and 8 doc: Updated the widgets tutorial to work without page links. My 4.7.0 changes Added support for es_419 locale. Added Korean and Nynorsk locales support on Symbian. Gestures in GraphicsView do not require a viewport to subscribe to gestures. Upgraded QLocale to Unicode CLDR 1.8.1 Removed the "maybe" timer from gesturemanager. Fixes a crash and a memory leak in gesturemanager. Embedded changes for 4.7 Added a default value for optimization settings. Update Polish translations
| * Make sure cursorPositionChanged is emitted when doing undo/redoThorbjørn Lindeijer2010-05-181-0/+8
| | | | | | | | | | Done-by: mae Reviewed-by: Thorbjørn Lindeijer
| * Added support for es_419 locale.Denis Dzyubenko2010-05-184-356/+367
| | | | | | | | | | | | | | | | Added a new country code "419" which stands for "Latin America and the Caribbean". This is the first three-letter country code (from UN M.49). Task-number: QT-3312 Reviewed-by: Thiago Macieira
| * Added Korean and Nynorsk locales support on Symbian.Denis Dzyubenko2010-05-181-0/+2
| | | | | | | | | | | | Task-number: QT-3368 Task-number: QT-3370 Reviewed-by: Thiago Macieira
| * Gestures in GraphicsView do not require a viewport to subscribe to gestures.Denis Dzyubenko2010-05-185-8/+44
| | | | | | | | | | | | | | | | | | When a graphicsitem subscribes to a gesture the viewport is implicitly subscribed to it as well. Task-number: QTBUG-9849 Reviewed-by: Olivier Goffart Reviewed-by: Mikko Harju
| * Upgraded QLocale to Unicode CLDR 1.8.1Denis Dzyubenko2010-05-182-1666/+1666
| | | | | | | | Reviewed-by: trustme
| * Removed the "maybe" timer from gesturemanager.Denis Dzyubenko2010-05-182-38/+7
| | | | | | | | | | | | | | | | | | | | | | According to users of the api "maybe" timer (that is supposed to cancel gestures that have stayed in the "MaybeGesture" state for too long) is not useful and might even harm some gestures, so removing it completely and leaving it up to the author of a gesture recognizer to make sure the state machine is implemented properly. Task-number: QTBUG-9926 Reviewed-by: Thomas Zander
| * Fixes a crash and a memory leak in gesturemanager.Denis Dzyubenko2010-05-181-1/+3
| | | | | | | | | | | | | | | | need to remove a QGesture object pointer from an internal hash when the widget/graphicsobject gets destroyed. Task-number: QTBUG-9801 Reviewed-by: Thomas Zander
* | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-webkit into 4.7-integrationQt Continuous Integration System2010-05-1816-16/+151
|\ \ | | | | | | | | | | | | | | | | | | * '4.7' of scm.dev.nokia.troll.no:qt/qt-webkit: Updated WebKit to cacbdf18fc917122834042d77a9164a490aafde4 Updated WebKit to 4696beb87359fe9236d23e0791526eb38dab341d Updated WebKit to 3d774b9df1f963452b1cfe34f9fafad0d399372a
| * | Updated WebKit to cacbdf18fc917122834042d77a9164a490aafde4Simon Hausmann2010-05-184-6/+18
| | | | | | | | | | | | Cherry pick http://trac.webkit.org/changeset/59606 to fix auto-test regression of r59563
| * | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-webkit into 4.7-integrationQt Continuous Integration System2010-05-1816-16/+139
| |\ \ | | |/ | |/| | | | | | | | | | * '4.7' of scm.dev.nokia.troll.no:qt/qt-webkit: Updated WebKit to 4696beb87359fe9236d23e0791526eb38dab341d Updated WebKit to 3d774b9df1f963452b1cfe34f9fafad0d399372a
| | * Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-webkit into 4.7-integrationQt Continuous Integration System2010-05-1716-16/+139
| | |\ | | | | | | | | | | | | | | | | | | | | * '4.7' of scm.dev.nokia.troll.no:qt/qt-webkit: Updated WebKit to 4696beb87359fe9236d23e0791526eb38dab341d Updated WebKit to 3d774b9df1f963452b1cfe34f9fafad0d399372a
| | | * Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-webkit into 4.7-integrationQt Continuous Integration System2010-05-1716-16/+139
| | | |\ | | | | | | | | | | | | | | | | | | | | | | | | | * '4.7' of scm.dev.nokia.troll.no:qt/qt-webkit: Updated WebKit to 4696beb87359fe9236d23e0791526eb38dab341d Updated WebKit to 3d774b9df1f963452b1cfe34f9fafad0d399372a
| | | | * Updated WebKit to 4696beb87359fe9236d23e0791526eb38dab341dSimon Hausmann2010-05-167-8/+61
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Integrated changes: || <https://webkit.org/b/38444> || [Qt] GraphicsLayer caches directly composited images || || <https://webkit.org/b/37684> || [Qt] JSValue QtClass::fallbackObject can be optimized || || <https://webkit.org/b/37701> || [Qt] Target(WebCore,jsc,...) must depends on static library of JavaScriptCore ||
| | | | * Updated WebKit to 3d774b9df1f963452b1cfe34f9fafad0d399372aSimon Hausmann2010-05-1513-10/+80
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Integrated changes: || <https://webkit.org/b/37665> || [Qt] Rename QtLauncher to QtTestBrowser || || <https://webkit.org/b/37381> || [Qt] animations/dynamic-stylesheet-loading.html fails with accelerated compositing || || <https://webkit.org/b/38630> || VS2010 asserts a null iterator passed to std::copy in Vector::operator= || || <https://webkit.org/b/38440> || [Qt] use QT_MOBILE_THEME in Symbian || || <https://webkit.org/b/39031> || CSSParser::parseColor() shouldn't alter 'color' unless passed a valid color string. || || <https://webkit.org/b/38949> || JavaScript unable to invoke methods declared in QML ||
* | | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into ↵Qt Continuous Integration System2010-05-174-69/+60
|\ \ \ \ \ | |/ / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | 4.7-integration * '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-2: Compile with Gcc 4.1 Optimized pixmapcache key generation for icons and styles
| * | | | Compile with Gcc 4.1Olivier Goffart2010-05-171-0/+1
| | | | |
| * | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into ↵Qt Continuous Integration System2010-05-174-69/+59
| |\ \ \ \ | | |/ / / | |/| | | | | | | | | | | | | | | | | | | | | | | 4.7-integration * '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-2: Optimized pixmapcache key generation for icons and styles
| | * | | Optimized pixmapcache key generation for icons and stylesOlivier Goffart2010-05-174-69/+59
| | |/ / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This re-apply commit c8d2e18c4b431870560f324a17f20904bb47ae68 from Jens that was reverted in b0f4dab4 because it did not compile. Added the missing include to make it compile on mac Task-number: QTBUG-9850
* | | | Compile fixes.ck2010-05-171-0/+1
|/ / /
* | | Move Q_ENUMS to start of class declarationAaron Kennedy2010-05-172-3/+3
| | |
* | | Restructure QDeclarativeAbstractBinding destructorAaron Kennedy2010-05-171-2/+4
| | |
* | | Don't call pure virtual method in ~QDeclarativeAbstractBinding()Aaron Kennedy2010-05-171-1/+1
| | |
* | | 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