summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7-integrationQt Continuous Integration System2010-04-221198-4147/+13074
|\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * '4.7' of scm.dev.nokia.troll.no:qt/qt-qml: (135 commits) Do not treat images in qml examples differently. Replace Flickable overshoot property with boundsBehavior Autotests and doc Give error on attempt to import types from too-early version number. Remove (undocumented) QML bindings for effects. De-straighten them lines. Doc: fix QStringList model doc (really). Doc: fix QStringList model docs Change return type to match value(). Add duration and easing properties to AnchorAnimation. Autotest Remove dead code Compile on Windows (export decl fix). Fix versioning of Qt Declarative's in-built types Fixed declarative/parserstress autotest. Fix parsing of regular expression literals. Fill out QGraphicsLayout bindings Update test files to new syntax Compile without Qt3 support. Ensure workerscript.qml works (autotested). ...
| * Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7-integrationQt Continuous Integration System2010-04-221198-4147/+13074
| |\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * '4.7' of scm.dev.nokia.troll.no:qt/qt-qml: (135 commits) Do not treat images in qml examples differently. Replace Flickable overshoot property with boundsBehavior Autotests and doc Give error on attempt to import types from too-early version number. Remove (undocumented) QML bindings for effects. De-straighten them lines. Doc: fix QStringList model doc (really). Doc: fix QStringList model docs Change return type to match value(). Add duration and easing properties to AnchorAnimation. Autotest Remove dead code Compile on Windows (export decl fix). Fix versioning of Qt Declarative's in-built types Fixed declarative/parserstress autotest. Fix parsing of regular expression literals. Fill out QGraphicsLayout bindings Update test files to new syntax Compile without Qt3 support. Ensure workerscript.qml works (autotested). ...
| | * Do not treat images in qml examples differently.Yann Bodson2010-04-221-23/+7
| | |
| | * Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7Martin Jones2010-04-2234-131/+372
| | |\
| | | * Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7-integrationQt Continuous Integration System2010-04-221189-4115/+12901
| | | |\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * '4.7' of scm.dev.nokia.troll.no:qt/qt-qml: (131 commits) Autotests and doc Give error on attempt to import types from too-early version number. Remove (undocumented) QML bindings for effects. De-straighten them lines. Change return type to match value(). Add duration and easing properties to AnchorAnimation. Autotest Remove dead code Compile on Windows (export decl fix). Fix versioning of Qt Declarative's in-built types Fixed declarative/parserstress autotest. Fix parsing of regular expression literals. Fill out QGraphicsLayout bindings Update test files to new syntax Compile without Qt3 support. Ensure workerscript.qml works (autotested). Update strings in test remove debugs Make the dynamic creation functions on the Qt object More focus example cleanup. ...
| | * | | Replace Flickable overshoot property with boundsBehaviorMartin Jones2010-04-2210-35/+86
| | | | | | | | | | | | | | | | | | | | Task-number: QTBUG-9993
| | * | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7Martin Jones2010-04-2226-439/+315
| | |\ \ \ | | | | |/ | | | |/|
| | | * | Autotests and docAaron Kennedy2010-04-225-60/+110
| | | | |
| | | * | Give error on attempt to import types from too-early version number.Warwick Allison2010-04-226-8/+35
| | | | | | | | | | | | | | | | | | | | eg. "import Qt 4.6" not valid.
| | | * | Remove (undocumented) QML bindings for effects.Michael Brasser2010-04-228-348/+2
| | | | | | | | | | | | | | | | | | | | | | | | | Support for effects will be introduced in a future release, when we can make better guarantees about performance.
| | | * | De-straighten them lines.Bea Lam2010-04-221-0/+0
| | | | |
| | | * | Change return type to match value().Michael Brasser2010-04-222-2/+2
| | | | |
| | | * | Add duration and easing properties to AnchorAnimation.Michael Brasser2010-04-222-1/+74
| | | | |
| | | * | AutotestAaron Kennedy2010-04-222-0/+92
| | | | |
| | | * | Remove dead codeAaron Kennedy2010-04-222-20/+0
| | | | |
| | * | | Doc: fix QStringList model doc (really).Martin Jones2010-04-221-1/+1
| | | | |
| | * | | Doc: fix QStringList model docsMartin Jones2010-04-225-0/+106
| | |/ /
| | * | Compile on Windows (export decl fix).Warwick Allison2010-04-211-3/+3
| | | |
| | * | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7-integrationQt Continuous Integration System2010-04-211178-3790/+12700
| | |\ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * '4.7' of scm.dev.nokia.troll.no:qt/qt-qml: (122 commits) Fix versioning of Qt Declarative's in-built types Fixed declarative/parserstress autotest. Fix parsing of regular expression literals. Fill out QGraphicsLayout bindings Update test files to new syntax Compile without Qt3 support. Ensure workerscript.qml works (autotested). Update strings in test remove debugs Make the dynamic creation functions on the Qt object More focus example cleanup. Autotests Add hasModelChildren property to delegates with QAbstractItemModel model type. Emit released and hoveredChanged in MouseArea when a UngrabMouse is received Balance grid items for larger displays. Autotest Cleanup declarative focus example. Add forceFocus method to QDeclarativeItem. Don't allow properties in Component elements Fix crash when QDeclarativeInfo objects are copied ...
| | | * | Fix versioning of Qt Declarative's in-built typesAlan Alpert2010-04-21721-825/+825
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Since we aren't releasing for 4.6, all types are new in 4.7. Task-number: QTBUG-10081
| | | * | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7Alan Alpert2010-04-212-38/+95
| | | |\ \
| | | | * | Fixed declarative/parserstress autotest.Roberto Raggi2010-04-211-8/+16
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The test ecma_3/Unicode/regress-352044-02-n.js is expected to throw an uncaught syntax error when parsing the expression statement "i \u002b= 1;". Task-number: QTBUG-8108
| | | | * | Fix parsing of regular expression literals.Roberto Raggi2010-04-212-31/+80
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Recognize regular expression classes and escape sequences. Task-number: QTBUG-8108 Reviewed-by: Olivier Goffart
| | | * | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7Alan Alpert2010-04-2111-21/+36
| | | |\ \ \ | | | | |/ /
| | | | * | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7-integrationQt Continuous Integration System2010-04-21499-2960/+11626
| | | | |\ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * '4.7' of scm.dev.nokia.troll.no:qt/qt-qml: (118 commits) Update test files to new syntax Compile without Qt3 support. Ensure workerscript.qml works (autotested). Update strings in test remove debugs Make the dynamic creation functions on the Qt object More focus example cleanup. Autotests Add hasModelChildren property to delegates with QAbstractItemModel model type. Emit released and hoveredChanged in MouseArea when a UngrabMouse is received Balance grid items for larger displays. Autotest Cleanup declarative focus example. Add forceFocus method to QDeclarativeItem. Don't allow properties in Component elements Fix crash when QDeclarativeInfo objects are copied Ignore message in QDeclarativeLoader test. Fix crash. Fix qmlvisual/animation/parentAnimation autotest delete the viewer before calling exit(). Ensures correct cleanup. ...
| | | * | \ \ Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7Alan Alpert2010-04-21319-1285/+9284
| | | |\ \ \ \ | | | | | |/ / | | | | |/| |
| | | | * | | Merge branch '4.7' of git@scm.dev.nokia.troll.no:qt/qt-qml into 4.7Alan Alpert2010-04-214-33/+26
| | | | |\ \ \
| | | | | * | | Compile without Qt3 support.Yann Bodson2010-04-211-25/+25
| | | | | | | |
| | | | | * | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7Warwick Allison2010-04-2113-40/+106
| | | | | |\ \ \
| | | | | * | | | Ensure workerscript.qml works (autotested).Warwick Allison2010-04-211-0/+1
| | | | | | | | |
| | | | | * | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7Warwick Allison2010-04-2173-75/+5612
| | | | | |\ \ \ \
| | | | | * | | | | remove debugsWarwick Allison2010-04-212-8/+0
| | | | | | | | | |
| | | | * | | | | | Update test files to new syntaxAlan Alpert2010-04-212-5/+5
| | | | | |_|/ / / | | | | |/| | | |
| | | | * | | | | Update strings in testAlan Alpert2010-04-211-2/+2
| | | | | | | | |
| | | | * | | | | Merge branch '4.7' of git@scm.dev.nokia.troll.no:qt/qt-qml into 4.7Alan Alpert2010-04-21465-3451/+34188
| | | | |\ \ \ \ \ | | | | | | |/ / / | | | | | |/| | |
| | | | | * | | | More focus example cleanup.Yann Bodson2010-04-212-33/+31
| | | | | | | | |
| | | | | * | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7Aaron Kennedy2010-04-2135-55/+5565
| | | | | |\ \ \ \
| | | | | | * \ \ \ Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7Martin Jones2010-04-2118-1/+5185
| | | | | | |\ \ \ \
| | | | | | | * | | | Emit released and hoveredChanged in MouseArea when a UngrabMouse is receivedLeonardo Sobral Cunha2010-04-2118-1/+5185
| | | | | | | |/ / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The unbgrab mouse happens when the mouse area is inside a flickable and the flickables takes control over the mouse handling. In this case, the UngrabMouse will behave similarly to a MouseRelease, emitting released, pressedChanged and hoveredChanged. Visual autotest added to mousearea in qmlvisual. Reviewed-by: Michael Brasser
| | | | | | * | | | Add hasModelChildren property to delegates with QAbstractItemModel model type.Martin Jones2010-04-217-41/+215
| | | | | | |/ / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Also add some helper function to VisualDataModel: - VisualDataModel::modelIndex(int) returns a QModelIndex which can be assigned to VisualDataModel::rootIndex - VisualDataModel::parentModelIndex() returns a QModelIndex which can be assigned to VisualDataModel::rootIndex
| | | | | | * | | Balance grid items for larger displays.Warwick Allison2010-04-211-1/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Task-number: QTBUG-8406
| | | | | | * | | Cleanup declarative focus example.Yann Bodson2010-04-212-7/+2
| | | | | | | | |
| | | | | | * | | Add forceFocus method to QDeclarativeItem.Yann Bodson2010-04-217-5/+161
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Reviewed-by: Aaron Kennedy
| | | | | * | | | AutotestsAaron Kennedy2010-04-2142-0/+163
| | | | | | | | |
| | | | | * | | | AutotestAaron Kennedy2010-04-215-0/+18
| | | | | |/ / /
| | | | | * | | Don't allow properties in Component elementsAaron Kennedy2010-04-218-0/+34
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | QTBUG-10082
| | | | | * | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7Aaron Kennedy2010-04-2118-317/+363
| | | | | |\ \ \
| | | | | | * \ \ Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7Yann Bodson2010-04-211-1/+3
| | | | | | |\ \ \
| | | | | | | * \ \ Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7Warwick Allison2010-04-2168-466/+634
| | | | | | | |\ \ \
| | | | | | | * | | | Fix crash.Warwick Allison2010-04-211-1/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Reviewed-by: Aaron Kennedy