summaryrefslogtreecommitdiffstats
path: root/src/declarative
Commit message (Collapse)AuthorAgeFilesLines
* Fix incorrect scope resolution for script in a script block.Michael Brasser2010-03-031-0/+1
| | | | | | | Make sure global variables in a script file are searched before component properties. Task-number: QTBUG-8641
* Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7Bea Lam2010-03-031-7/+13
|\
| * Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7Martin Jones2010-03-031-1/+1
| |\
| * | Fix mouse stealing in nested flickables.Martin Jones2010-03-031-7/+13
| | | | | | | | | | | | | | | | | | | | | Set intent to steal mouse, but don't steal the initiating event. This allows other, higher Flickables to override lower. Task-number: QTBUG-5292
* | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7Bea Lam2010-03-0323-1836/+175
|\ \ \ | | |/ | |/|
| * | Initialize variable before use.Michael Brasser2010-03-021-1/+1
| |/
| * Fix build of importsTobias Hunger2010-03-0217-2744/+26
| | | | | | | | | | | | * Fix export macro used in webkit * Fix dependencies on declarative/mutlimedia * Copy qmldir files into the build tree
| * Compile fix on WindowsAlan Alpert2010-03-021-1/+1
| |
| * Build fix on windowsTobias Hunger2010-03-021-1/+1
| |
| * Fix qml import modules loading on Windowsmae2010-03-021-8/+20
| | | | | | | | | | | | On windows, when importing a declarative plugin by name, extend with "d.dll" in the debug case, then with ".dll". This is in sync with qmake's behaviour for libraries.
| * Moved qdeclarativemodules to importsmae2010-03-0217-26/+2744
| |
| * Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7-integrationQt Continuous Integration System2010-03-0236-1959/+588
| |\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * '4.7' of scm.dev.nokia.troll.no:qt/qt-qml: (28 commits) Add "on" syntax to QmlChanges.txt Don't return QDeclarativeDeclarativeData for a deleting object Empty URL test Fix zooming (broke with transformOrigin default change). doc Move WebView to an extension plugin. follow syntax change missed file Optimization. Add autotests for script block scoping. Make test more reliable. Add NOTIFY signals to list, grid and path views Example of text focus. Add docs and tests for WorkerListModel. Add NOTIFY signals to list, grid and path views Example of text focus. Add accessor operations to VisualItemModel::children Make "on" syntax mandatory for value sources and interceptors Fix warning. Minor optimization. ...
| | * Add "on" syntax to QmlChanges.txtAaron Kennedy2010-03-021-0/+10
| | |
| | * Don't return QDeclarativeDeclarativeData for a deleting objectAaron Kennedy2010-03-022-2/+6
| | | | | | | | | | | | This was causing crashes in the qmldesigner.
| | * Empty URL testAaron Kennedy2010-03-021-0/+7
| | |
| | * Merge branch 'master' into 4.7Warwick Allison2010-03-027-1785/+3
| | |\ | | | | | | | | | | | | | | | | Conflicts: tests/auto/declarative/qdeclarativegridview/tst_qdeclarativegridview.cpp
| | | * docWarwick Allison2010-03-021-0/+1
| | | |
| | | * Move WebView to an extension plugin.Warwick Allison2010-03-025-1785/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Using WebView now requires: import org.webkit 1.0 Task-number: QT-2995
| | | * Merge branch 'master' of scm.dev.nokia.troll.no:qt/qt-qmlBea Lam2010-03-0214-141/+325
| | | |\
| | | | * Add NOTIFY signals to list, grid and path viewsJoona Petrell2010-03-028-36/+124
| | | | | | | | | | | | | | | | | | | | Reviewed-by: akennedy
| | | * | Merge branch 'master' of scm.dev.nokia.troll.no:qt/qt-qmlBea Lam2010-03-012-4/+10
| | | |\ \
| | | * | | Export QDeclarativeWorkerScript and QDeclarativeWorkerListModel andBea Lam2010-03-011-2/+8
| | | | | | | | | | | | | | | | | | | | | | | | call other usual macros.
| | * | | | Optimization.Michael Brasser2010-03-021-2/+2
| | | | | |
| | * | | | Add NOTIFY signals to list, grid and path viewsJoona Petrell2010-03-028-36/+124
| | | | | | | | | | | | | | | | | | | | | | | | Reviewed-by: akennedy
| * | | | | doc: Fixed some qdoc errors.Martin Smith2010-03-021-1/+1
| | | | | |
* | | | | | Add WorkerScript docs and tests.Bea Lam2010-03-031-1/+82
| |/ / / / |/| | | | | | | | | | | | | | Task-number: QT-2807
* | | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7Bea Lam2010-03-0214-130/+253
|\ \ \ \ \
| * | | | | Add accessor operations to VisualItemModel::childrenAaron Kennedy2010-03-021-1/+10
| | | | | |
| * | | | | Merge branch 'master' into 4.7Aaron Kennedy2010-03-026-105/+201
| |\ \ \ \ \ | | | |_|_|/ | | |/| | |
| | * | | | Merge branch 'master' of scm.dev.nokia.troll.no:qt/qt-qmlAaron Kennedy2010-03-023-6/+29
| | |\ \ \ \ | | | | |_|/ | | | |/| | | | | | | | | | | | | | | | | | | | Conflicts: demos/declarative/minehunt/main.cpp demos/declarative/minehunt/minehunt.qml
| | * | | | Make "on" syntax mandatory for value sources and interceptorsAaron Kennedy2010-03-026-105/+201
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Where you would have written x: NumberAnimation {} y: Behavior {} you now must write NumberAnimation on x {} Behavior on y {} This change also makes the parser more strict with respect to multiple assignments to a single property - they're no longer allowed. For example this x: 10 x: 11 is now an error.
| * | | | | Fix warning.Michael Brasser2010-03-021-1/+0
| | | | | |
| * | | | | Minor optimization.Michael Brasser2010-03-021-2/+3
| | | | | |
| * | | | | Merge branch '4.7' of git@scm.dev.nokia.troll.no:qt/qt-qml into 4.7Alan Alpert2010-03-0212-23/+78
| |\ \ \ \ \
| | * | | | | Replace remaining QGuard usage with QDeclarativeGuard.Michael Brasser2010-03-014-5/+9
| | | | | | |
| | * | | | | Reapply "Some animation cleanup/refactoring."Michael Brasser2010-03-012-12/+20
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This reverts commit 543c4b82e6d6cc4a396b1c105d7321643b6ef4c6. Conflicts: src/declarative/util/qdeclarativeanimation.cpp
| | * | | | | Setting the same source again causes reload.Martin Jones2010-03-011-4/+5
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Task-number: QTBUG-8623
| * | | | | | Document TextEdit::textMarginAlan Alpert2010-03-011-0/+5
| | |_|/ / / | |/| | | |
* | | | | | Add docs and tests for WorkerListModel.Bea Lam2010-03-022-3/+143
| |/ / / / |/| | | | | | | | | | | | | | Task-number: QT-2807
* | | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7-integrationQt Continuous Integration System2010-03-014-1/+40
|\ \ \ \ \ | |_|_|/ / |/| | | | | | | | | | | | | | * '4.7' of scm.dev.nokia.troll.no:qt/qt-qml: Expand documention of status property with examples
| * | | | Expand documention of status property with examplesAlan Alpert2010-03-014-1/+40
| |/ / / | | | | | | | | | | | | Task-number: QTBUG-8542
* | | | compile fix with namespaceshjk2010-03-011-1/+2
| | | |
* | | | compile fix for WinCEMaurice Kalinowski2010-03-011-0/+2
|/ / / | | | | | | | | | | | | | | | do not include headers of disabled modules Reviewed-by: Paul Olav Tvete
* | | Merge branch 'master' of scm.dev.nokia.troll.no:qt/qt-qmlMartin Jones2010-03-011-2/+19
|\ \ \ | | |/ | |/| | | | | | | Conflicts: demos/declarative/flickr/mobile/ImageDetails.qml
| * | Merge branch 'master' of scm.dev.nokia.troll.no:qt/qt-qmlBea Lam2010-03-011-1/+1
| |\ \ | | |/
| * | Merge branch 'master' of scm.dev.nokia.troll.no:qt/qt-qmlBea Lam2010-03-0149-563/+1284
| |\ \ | | | | | | | | | | | | | | | | Conflicts: tests/auto/declarative/qdeclarativeproperty/tst_qdeclarativeproperty.cpp
| * | | Fix reload() when keys are not specified, and add extra tests.Bea Lam2010-03-011-2/+19
| | | |
* | | | Small optimizations.Martin Jones2010-03-012-4/+10
| |_|/ |/| |
* | | Use setOpacity(0.) rather than setVisible() to avoid positioner relayout.Martin Jones2010-03-011-1/+1
| |/ |/|
* | Merge branch 'master' of scm.dev.nokia.troll.no:qt/qt-qmlMartin Jones2010-03-011-0/+2
|\ \
generated by cgit v0.12 at 2024-10-24 23:19:56 (GMT)