summaryrefslogtreecommitdiffstats
path: root/src/declarative/qml
Commit message (Collapse)AuthorAgeFilesLines
* Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7Yann Bodson2010-03-037-40/+65
|\
| * QDeclarativeProperty::read() returns a QObjectStar when accessing a QObject ↵Aaron Kennedy2010-03-031-2/+9
| | | | | | | | | | | | property QT-2793
| * Move JS global scope to top of the QML scope chainAaron Kennedy2010-03-036-38/+56
| | | | | | | | QT-2787
* | 'on' syntax fixesYann Bodson2010-03-031-4/+4
|/
* Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7Aaron Kennedy2010-03-031-0/+1
|\
| * 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
* | QDeclarativeGuard should handle objects being deletedAaron Kennedy2010-03-031-0/+5
|/
* Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7Bea Lam2010-03-037-13/+38
|\
| * 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.
| * 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-021-0/+2
| |\ | | | | | | | | | | | | Conflicts: tests/auto/declarative/qdeclarativegridview/tst_qdeclarativegridview.cpp
| | * Merge branch 'master' of scm.dev.nokia.troll.no:qt/qt-qmlBea Lam2010-03-026-105/+201
| | |\
| | * | Export QDeclarativeWorkerScript and QDeclarativeWorkerListModel andBea Lam2010-03-011-2/+8
| | | | | | | | | | | | | | | | call other usual macros.
| * | | Optimization.Michael Brasser2010-03-021-2/+2
| | | |
* | | | 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-026-105/+201
|\ \ \
| * \ \ Merge branch 'master' into 4.7Aaron Kennedy2010-03-026-105/+201
| |\ \ \ | | | |/ | | |/|
| | * | 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.
* | | Add docs and tests for WorkerListModel.Bea Lam2010-03-022-3/+143
|/ / | | | | | | Task-number: QT-2807
* | compile fix with namespaceshjk2010-03-011-1/+2
|/
* Rename QDeclarativeGraphics_setParent_noEvent QDeclarative_setParent_noEventMartin Jones2010-03-014-5/+5
|
* Fixed private header include style to work when headers are installed.Rohan McGovern2010-03-011-1/+1
| | | | | | | | | | Private headers should include other private headers by: #include <private/qfoo_p.h> Using a relative path works during the build, but does not work when building other projects which attempt to use the installed private headers (e.g. unit tests for private classes).
* Merge remote branch 'origin/master' into 4.7Thiago Macieira2010-02-27156-10083/+11063
|\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: src/corelib/kernel/qmetatype.cpp src/declarative/graphicsitems/qdeclarativeevents.cpp src/declarative/graphicsitems/qdeclarativeflickable.cpp src/declarative/graphicsitems/qdeclarativegridview.cpp src/declarative/qml/qdeclarativescript.cpp src/declarative/util/qdeclarativeanimation.cpp src/declarative/util/qdeclarativebehavior.cpp src/declarative/util/qdeclarativeeasefollow.cpp src/declarative/util/qdeclarativefontloader.cpp src/declarative/util/qdeclarativelistmodel.cpp src/declarative/util/qdeclarativespringfollow.cpp src/declarative/util/qdeclarativestategroup.cpp src/declarative/util/qdeclarativesystempalette.cpp src/declarative/util/qdeclarativetimer.cpp src/declarative/util/qmlstateoperations.cpp src/multimedia/qml/qdeclarativeaudio.cpp src/multimedia/qml/qdeclarativevideo.cpp
| * DocAaron Kennedy2010-02-262-13/+150
| |
| * Polish QDeclarativeProperty APIAaron Kennedy2010-02-265-58/+126
| |
| * Remove unnecessary QDeclarativeProperty::Type enum valuesAaron Kennedy2010-02-263-22/+43
| |
| * Merge branch 'master' of scm.dev.nokia.troll.no:qt/qt-qmlBea Lam2010-02-2534-1259/+1395
| |\ | | | | | | | | | | | | Conflicts: src/declarative/qml/qdeclarativeproperty.cpp
| | * Protect against double initialization.Roberto Raggi2010-02-252-6/+20
| | |
| | * Fix compilation due to enabling of QStringBuilder throughoutThiago Macieira2010-02-251-1/+1
| | |
| | * Don't look for contextual keywords when defining properties.Roberto Raggi2010-02-253-632/+658
| | |
| | * Introduced QDeclarativeExtensionPlugin::registerTypes(uri).Roberto Raggi2010-02-255-6/+29
| | | | | | | | | | | | | | | | | | Now, you have to reimplement registerTypes(uri) to expose native QML types, and initializeEngine(engine,uri) to add instances to the QML engine's root context.
| | * Rename QDeclarativeMetaProperty -> QDeclarativePropertyAaron Kennedy2010-02-2524-226/+225
| | | | | | | | | | | | There's nothing meta about our properties.
| | * Introduced alternative syntax for defining QML bindings.Roberto Raggi2010-02-257-1000/+1072
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Now it is possible to define bindings using the `on' context keyword. For example, you can write Behavior on opacity { NumberAnimation { duration: 500 } } instead of opacity: Behavior { NumberAnimation { duration: 500 } }
| | * Make more private QDeclarativeMetaProperty methods privateAaron Kennedy2010-02-2511-69/+71
| | |
| * | Merge branch 'master' of scm.dev.nokia.troll.no:qt/qt-qmlBea Lam2010-02-254-29/+27
| |\ \ | | |/
| | * Tweak QDeclarativeMetaProperty type category APIAaron Kennedy2010-02-254-29/+27
| | |
| * | Merge branch 'master' of scm.dev.nokia.troll.no:qt/qt-qmlBea Lam2010-02-2524-653/+635
| |\ \ | | |/ | | | | | | | | | Conflicts: src/declarative/qml/qdeclarativemetaproperty.cpp
| | * Remove QDeclarativeMetaProperty::AttachedAaron Kennedy2010-02-253-40/+13
| | | | | | | | | | | | | | | We now prohibit QDeclarativeMetaProperty ever getting into a state where it is pointing to the attached object itself.
| | * Remove QDeclarativeMetaProperty::createProperty() methodAaron Kennedy2010-02-252-106/+86
| | | | | | | | | | | | | | | The behavior of createProperty() (to resolve dot properties) is now the behavior of the constructors.
| | * Move private QDeclarativeMetaProperty functions into the private classAaron Kennedy2010-02-255-34/+49
| | | | | | | | | | | | | | | | | | We don't want to allow manipulation of bindings and signal properties through the public API. Equivalents of the public functions now exist in QDeclarativeMetaPropertyPrivate for internal use.
| | * Make QML_REGISTER...TYPE functions unnecessary (still exist for now).Warwick Allison2010-02-251-13/+13
| | | | | | | | | | | | Fix multimedia plugin.
| | * Add support for qml imports directory in configure, qmake, and qmlenginemae2010-02-241-7/+12
| | |
| | * Build fix when using <QtDeclarative> include.Alexis Menard2010-02-241-0/+3
| | |
| | * Make QDeclarativeMetaType and QDeclarativeType privateAaron Kennedy2010-02-2411-23/+27
| | |
| | * Fixup tests after QDeclarative class renamesAaron Kennedy2010-02-241-1/+1
| | |
| | * Simplify QML element registration headersAaron Kennedy2010-02-2412-314/+316
| | |
| * | Automatically connect to signals "onFooChanged" if property is "foo".Bea Lam2010-02-253-25/+14
| |/ | | | | | | | | | | | | This follows on from a2a8cea2835ef24104fe784b6ce0f508cc5637c0 to make it work for PropertyChanges and QDeclarativeMetaProperty as well. Task-number: QT-2783