summaryrefslogtreecommitdiffstats
path: root/src
Commit message (Collapse)AuthorAgeFilesLines
* QmlView API review. See QmlChanges.txt for details.Martin Jones2010-02-183-227/+229
|
* Fix typo in docsAlan Alpert2010-02-171-1/+1
|
* Merge branch 'master' of scm.dev.nokia.troll.no:qt/qt-qml into ↵Qt Continuous Integration System2010-02-1787-764/+1429
|\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | master-integration * 'master' of scm.dev.nokia.troll.no:qt/qt-qml: (47 commits) Add missing NOTIFY signals to various QML item class properties Fix currentIndex after itemsMoved() qmlviewer: build on symbian Revert "Replace QList<>* support with QmlListProperty" Declare QmlXmlListModelRole meta type before any code uses it. Make compile on Symbian (call Q_DECLARE_METATYPE earlier) Conditionally link webkit on wince Revert "Run dos2unix on these files." Expose LayoutItem documentation Fix palette on the N900 Fix QTBUG-8090, improve original patch effectiveness. Replace QList<>* support with QmlListProperty Run dos2unix on these files. Remove standalone QmlDebugger. It is now only available through the Mobility 404 Fix crash in QmlMetaProperty that could occur when using value-type QML binding optimizer crash QML binding optimizer crash Fix crash in QML binding optimizer Don't delete binding directly ...
| * Add missing NOTIFY signals to various QML item class propertiesJoona Petrell2010-02-1710-17/+74
| | | | | | | | Reviewed-by: Aaron Kennedy
| * Fix currentIndex after itemsMoved()Martin Jones2010-02-171-8/+46
| | | | | | | | | | | | Ensure fixupPosition() positions properly for StrictlyEnforceRange highlight mode. Update visibleIndex after itemsMoved().
| * Merge branch 'master' of scm.dev.nokia.troll.no:qt/qt-qmlAaron Kennedy2010-02-173-3/+9
| |\
| | * Declare QmlXmlListModelRole meta type before any code uses it.Bea Lam2010-02-171-2/+4
| | |
| | * Make compile on Symbian (call Q_DECLARE_METATYPE earlier)Bea Lam2010-02-172-1/+5
| | |
| * | Revert "Replace QList<>* support with QmlListProperty"Aaron Kennedy2010-02-1720-215/+307
| |/ | | | | | | | | | | This was accidentally pushed early. This reverts commit 8454c53b304a4aba7c058b315041b3a38ad4fff5.
| * Merge branch 'master' of scm.dev.nokia.troll.no:qt/qt-qmlAaron Kennedy2010-02-171-0/+7
| |\
| | * Expose LayoutItem documentationAlan Alpert2010-02-161-0/+7
| | | | | | | | | | | | Also made it slightly more verbose.
| * | Replace QList<>* support with QmlListPropertyAaron Kennedy2010-02-1620-307/+215
| |/ | | | | | | | | | | | | | | Conflicts: src/declarative/graphicsitems/qmlgraphicsitem.cpp src/declarative/qml/qmlmetaproperty.cpp src/declarative/qml/qmlmetatype.cpp
| * Mobility 404Wolfgang Beck2010-02-161-2/+2
| |
| * Fix crash in QmlMetaProperty that could occur when using value-typeMichael Brasser2010-02-162-4/+4
| | | | | | | | properties after the engine was deleted.
| * Merge branch 'master' of scm.dev.nokia.troll.no:qt/qt-qmlAaron Kennedy2010-02-1633-54/+342
| |\
| | * Merge branch 'master' of scm.dev.nokia.troll.no:qt/qt-qmlMartin Jones2010-02-16148-824/+1483
| | |\
| | | * Merge branch 'master' of scm.dev.nokia.troll.no:qt/qt-qmlMichael Brasser2010-02-161-4/+0
| | | |\
| | | | * transformOrigin defaults to Center, fix image/docs.Warwick Allison2010-02-161-4/+0
| | | | |
| | | * | MOBILITY -404 / 507Wolfgang Beck2010-02-162-0/+4
| | | | |
| | | * | MOBILITY-404 QS Windows.Wolfgang Beck2010-02-1625-27/+88
| | | |/
| | * | Add QmlImageProvider to allow asynchronous access to images.Martin Jones2010-02-167-23/+250
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Setting an image source to image://providerid/imageid will pass the request for imageid to the provider registered for providerid. QmlImageProvider::request() is run in a low priority thread, so the main thread is not blocked while the image is loaded/rendered. Reviewed-by: Aaron Kennedy
| * | | QML binding optimizer crashAaron Kennedy2010-02-161-2/+2
| | | | | | | | | | | | | | | | | | | | The context's id values must be deleted after the compiled bindings as they may access the id values during shutdown.
| * | | QML binding optimizer crashAaron Kennedy2010-02-161-4/+5
| | | | | | | | | | | | | | | | We should check that the fetch() generation succeeded before continuing.
| * | | Fix crash in QML binding optimizerAaron Kennedy2010-02-163-138/+164
| | | | | | | | | | | | | | | | Optimized bindings need to reset the mePtr too.
| * | | Don't delete binding directlyAaron Kennedy2010-02-161-2/+4
| | |/ | |/| | | | | | | | | | Bindings should be destroyed by calling their destroy() method, not by deleting them.
| * | Merge branch 'master' of scm.dev.nokia.troll.no:qt/qt-qmlWarwick Allison2010-02-166-7/+48
| |\ \
| | * \ Merge branch 'master' of git@scm.dev.nokia.troll.no:qt/qt-qmlAlan Alpert2010-02-153-4/+8
| | |\ \
| | | * | Fixing QDesktopServices so that file server session can be accessedAleksandar Sasha Babic2010-02-151-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | from secondary thread. It is well known fact that CEikonEnv::Static() will return NULL from secondary thread. This means that accessing QDesktopServices from secondary thread will cause crash. Example for this is qmlviewer, where there is separate thread that handles .qml files. Reviewed-by: TrustMe
| | | * | Exposing some Validators requires Qt >= 4.7.0Alan Alpert2010-02-152-2/+6
| | | | | | | | | | | | | | | | | | | | This commit should make declarative compile against 4.6.2 again.
| | * | | Fix TextInput keypad navigationAlan Alpert2010-02-151-2/+4
| | |/ / | | | | | | | | | | | | | | | | | | | | | | | | Was accidentally ignoring key movements even when an existing selection meant that pressing right/left would do something. Task-number: QT-2944
| | * | Merge branch 'master' of git@scm.dev.nokia.troll.no:qt/qt-qmlBea Lam2010-02-153-1/+8
| | |\ \
| | * | | For qmldebug* tests, make sure engine is running before the test threadBea Lam2010-02-152-1/+36
| | | | | | | | | | | | | | | | | | | | is started. Also fix some memory leaks.
| * | | | Ensure new WebView windows are notified correctly. Improve test.Warwick Allison2010-02-151-1/+2
| | |/ / | |/| | | | | | | | | | | | | | Change 282a46ab5edafa7b82e9c58658143cb979db2d85 prevents itemChange() notification. That seems wrong, but this change is a work-around.
| * | | Fix compile with -no-webkitWarwick Allison2010-02-153-1/+8
| |/ /
| * | Fix buildWarwick Allison2010-02-153-6/+0
| | | | | | | | | | | | Remove unneeded .moc imports resulting from moved classes.
| * | Merge branch 'master' of scm.dev.nokia.troll.no:qt/qt-qml into ↵Qt Continuous Integration System2010-02-1541-522/+719
| |\ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | master-integration * 'master' of scm.dev.nokia.troll.no:qt/qt-qml: Remove noop code Move type initialization from global static initializers to QmlEngine construction.
| | * | Remove noop codeAaron Kennedy2010-02-151-1/+0
| | | |
| | * | Move type initialization from global static initializers to QmlEngine ↵Warwick Allison2010-02-1440-521/+719
| | | | | | | | | | | | | | | | | | | | | | | | construction. Task-number: QT-2798
* | | | Merge branch 'master' of scm.dev.nokia.troll.no:qt/qt-s60-public into ↵Qt Continuous Integration System2010-02-166-36/+48
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | master-integration * 'master' of scm.dev.nokia.troll.no:qt/qt-s60-public: Enabled commit 2b60b542a for all platforms. Fixed missing repaints on S60 3.1. Build break fix for QS60Style. QS60Style: Branch indicator in tree view is misplaced Compilation error fix: missing comma in enum list in QS60Style Scroll bar handle/groove ends are squeezed (in nHD resolution) QS60Style draws drop area as a black rect Remove scrollbar context menu from QS60Style Change a name of a variable to be more descriptive
| * \ \ \ Merge remote branch 'qt/master' into s60-masterQt Continuous Integration System2010-02-162-3/+8
| |\ \ \ \ | | |/ / / | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: qmake/generators/symbian/symmake.cpp tests/auto/qlineedit/tst_qlineedit.cpp tests/benchmarks/benchmarks.pro
| * | | | Merge branch '4.6' of scm.dev.nokia.troll.no:qt/qt-s60-public into master-s60axis2010-02-1677-258/+611
| |\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: qmake/generators/symbian/symmake.cpp tests/auto/qlineedit/tst_qlineedit.cpp tests/benchmarks/benchmarks.pro
| | * | | | Fixed missing repaints on S60 3.1.axis2010-02-151-1/+9
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The bug happened when a paint event came in from Symbian, but the painted area was bigger than the exposed rect being passed in by Symbian. In these cases we would lose updates to the area outside. Fixed by calling Draw() once more if we detect that we painted a larger area to the backing store. It is still a mystery why this worked on 5.0 though... :-P AutoTest: QWidget passed RevBy: Jason Barron Task: QTBUG-8200
| | * | | | Build break fix for QS60Style.Sami Merila2010-02-151-1/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Very recent change for QS60Style breaks compilation of the style for 3.1. This is due to that style refers to a skin item ID that is not existing on 3.1 environment. Fixed by referring to the skin ID with its internal values. Task-number: QTBUG-8193 Reviewed-by: TrustMe
| | * | | | QS60Style: Branch indicator in tree view is misplacedSami Merila2010-02-151-7/+9
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fix for QTBUG-7258 make itemview margins larger. This broke the treeviews visually, as indicators are not shown in correct places. Now, indocators are placed correctly for treeviews as well. Task-number: QTBUG-7995 Reviewed-by: Alessandro Portale
| | * | | | Compilation error fix: missing comma in enum list in QS60StyleSami Merila2010-02-151-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fix for QTBUG-8193 introduced a new enum value into s60style. Unfortunately, the comma after the value didn't make it into the fix itself. Adding the comma to allow compilation of style. Task-number: QTBUG-8193 Reviewed-by: TrustMe
| | * | | | Scroll bar handle/groove ends are squeezed (in nHD resolution)Sami Merila2010-02-151-4/+7
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | QS60Style uses non-square area for scrollbar end graphics areas. It then tries to scale the areas to make them look like native graphics (and keeps the width-height ratio), thus squeezing them. Change style so that scrollbar end areas are squares, just like in native graphics they are. Task-number: QTBUG-7996 Reviewed-by: Alessandro Portale
| | * | | | QS60Style draws drop area as a black rectSami Merila2010-02-153-2/+12
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | When Drag-n-Dropping elements in itemviews QS60Style draws drop area as a black rect. Change this so that native graphics are used instead. This change only affects touch-devices as non-touch 3.x devices do not have the native graphics defined. In 3.x non-touch devices, style still uses QCommonStyle to draw the DropArea. Task-number: QTBUG-8193 Reviewed-by: Alessandro Portale
| | * | | | Remove scrollbar context menu from QS60StyleSami Merila2010-02-151-0/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Currently style does not forbid scrollbar context menu, so by default long pressing over the scrollbar widget shows the context menu. This is not according to 'S60-style', so from now on the stylehint SH_ScrollBar_ContextMenu returns false. Task-number: QTBUG-8194 Reviewed-by: Alessandro Portale
| | * | | | Change a name of a variable to be more descriptiveSami Merila2010-02-141-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Currently when calculating a button content size, QS60Style has a variable called buttonWidth, which actually is the width of the content, not the button itself. Change this to buttonContentWidth. Reviewed-by: TrustMe
| * | | | | Enabled commit 2b60b542a for all platforms.axis2010-02-162-20/+5
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Task: QTBUG-5892 RevBy: Trust me