Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7 | Yann Bodson | 2010-03-03 | 7 | -40/+65 |
|\ | |||||
| * | QDeclarativeProperty::read() returns a QObjectStar when accessing a QObject ↵ | Aaron Kennedy | 2010-03-03 | 1 | -2/+9 |
| | | | | | | | | | | | | property QT-2793 | ||||
| * | Move JS global scope to top of the QML scope chain | Aaron Kennedy | 2010-03-03 | 6 | -38/+56 |
| | | | | | | | | QT-2787 | ||||
* | | 'on' syntax fixes | Yann Bodson | 2010-03-03 | 1 | -4/+4 |
|/ | |||||
* | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7 | Aaron Kennedy | 2010-03-03 | 1 | -0/+1 |
|\ | |||||
| * | Fix incorrect scope resolution for script in a script block. | Michael Brasser | 2010-03-03 | 1 | -0/+1 |
| | | | | | | | | | | | | | | Make sure global variables in a script file are searched before component properties. Task-number: QTBUG-8641 | ||||
* | | QDeclarativeGuard should handle objects being deleted | Aaron Kennedy | 2010-03-03 | 1 | -0/+5 |
|/ | |||||
* | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7 | Bea Lam | 2010-03-03 | 7 | -13/+38 |
|\ | |||||
| * | Compile fix on Windows | Alan Alpert | 2010-03-02 | 1 | -1/+1 |
| | | |||||
| * | Build fix on windows | Tobias Hunger | 2010-03-02 | 1 | -1/+1 |
| | | |||||
| * | Fix qml import modules loading on Windows | mae | 2010-03-02 | 1 | -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 object | Aaron Kennedy | 2010-03-02 | 2 | -2/+6 |
| | | | | | | | | This was causing crashes in the qmldesigner. | ||||
| * | Empty URL test | Aaron Kennedy | 2010-03-02 | 1 | -0/+7 |
| | | |||||
| * | Merge branch 'master' into 4.7 | Warwick Allison | 2010-03-02 | 1 | -0/+2 |
| |\ | | | | | | | | | | | | | Conflicts: tests/auto/declarative/qdeclarativegridview/tst_qdeclarativegridview.cpp | ||||
| | * | Merge branch 'master' of scm.dev.nokia.troll.no:qt/qt-qml | Bea Lam | 2010-03-02 | 6 | -105/+201 |
| | |\ | |||||
| | * | | Export QDeclarativeWorkerScript and QDeclarativeWorkerListModel and | Bea Lam | 2010-03-01 | 1 | -2/+8 |
| | | | | | | | | | | | | | | | | call other usual macros. | ||||
| * | | | Optimization. | Michael Brasser | 2010-03-02 | 1 | -2/+2 |
| | | | | |||||
* | | | | Add WorkerScript docs and tests. | Bea Lam | 2010-03-03 | 1 | -1/+82 |
|/ / / | | | | | | | | | | Task-number: QT-2807 | ||||
* | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7 | Bea Lam | 2010-03-02 | 6 | -105/+201 |
|\ \ \ | |||||
| * \ \ | Merge branch 'master' into 4.7 | Aaron Kennedy | 2010-03-02 | 6 | -105/+201 |
| |\ \ \ | | | |/ | | |/| | |||||
| | * | | Make "on" syntax mandatory for value sources and interceptors | Aaron Kennedy | 2010-03-02 | 6 | -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 Lam | 2010-03-02 | 2 | -3/+143 |
|/ / | | | | | | | Task-number: QT-2807 | ||||
* | | compile fix with namespaces | hjk | 2010-03-01 | 1 | -1/+2 |
|/ | |||||
* | Rename QDeclarativeGraphics_setParent_noEvent QDeclarative_setParent_noEvent | Martin Jones | 2010-03-01 | 4 | -5/+5 |
| | |||||
* | Fixed private header include style to work when headers are installed. | Rohan McGovern | 2010-03-01 | 1 | -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.7 | Thiago Macieira | 2010-02-27 | 156 | -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 | ||||
| * | Doc | Aaron Kennedy | 2010-02-26 | 2 | -13/+150 |
| | | |||||
| * | Polish QDeclarativeProperty API | Aaron Kennedy | 2010-02-26 | 5 | -58/+126 |
| | | |||||
| * | Remove unnecessary QDeclarativeProperty::Type enum values | Aaron Kennedy | 2010-02-26 | 3 | -22/+43 |
| | | |||||
| * | Merge branch 'master' of scm.dev.nokia.troll.no:qt/qt-qml | Bea Lam | 2010-02-25 | 34 | -1259/+1395 |
| |\ | | | | | | | | | | | | | Conflicts: src/declarative/qml/qdeclarativeproperty.cpp | ||||
| | * | Protect against double initialization. | Roberto Raggi | 2010-02-25 | 2 | -6/+20 |
| | | | |||||
| | * | Fix compilation due to enabling of QStringBuilder throughout | Thiago Macieira | 2010-02-25 | 1 | -1/+1 |
| | | | |||||
| | * | Don't look for contextual keywords when defining properties. | Roberto Raggi | 2010-02-25 | 3 | -632/+658 |
| | | | |||||
| | * | Introduced QDeclarativeExtensionPlugin::registerTypes(uri). | Roberto Raggi | 2010-02-25 | 5 | -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 -> QDeclarativeProperty | Aaron Kennedy | 2010-02-25 | 24 | -226/+225 |
| | | | | | | | | | | | | There's nothing meta about our properties. | ||||
| | * | Introduced alternative syntax for defining QML bindings. | Roberto Raggi | 2010-02-25 | 7 | -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 private | Aaron Kennedy | 2010-02-25 | 11 | -69/+71 |
| | | | |||||
| * | | Merge branch 'master' of scm.dev.nokia.troll.no:qt/qt-qml | Bea Lam | 2010-02-25 | 4 | -29/+27 |
| |\ \ | | |/ | |||||
| | * | Tweak QDeclarativeMetaProperty type category API | Aaron Kennedy | 2010-02-25 | 4 | -29/+27 |
| | | | |||||
| * | | Merge branch 'master' of scm.dev.nokia.troll.no:qt/qt-qml | Bea Lam | 2010-02-25 | 24 | -653/+635 |
| |\ \ | | |/ | | | | | | | | | | Conflicts: src/declarative/qml/qdeclarativemetaproperty.cpp | ||||
| | * | Remove QDeclarativeMetaProperty::Attached | Aaron Kennedy | 2010-02-25 | 3 | -40/+13 |
| | | | | | | | | | | | | | | | We now prohibit QDeclarativeMetaProperty ever getting into a state where it is pointing to the attached object itself. | ||||
| | * | Remove QDeclarativeMetaProperty::createProperty() method | Aaron Kennedy | 2010-02-25 | 2 | -106/+86 |
| | | | | | | | | | | | | | | | The behavior of createProperty() (to resolve dot properties) is now the behavior of the constructors. | ||||
| | * | Move private QDeclarativeMetaProperty functions into the private class | Aaron Kennedy | 2010-02-25 | 5 | -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 Allison | 2010-02-25 | 1 | -13/+13 |
| | | | | | | | | | | | | Fix multimedia plugin. | ||||
| | * | Add support for qml imports directory in configure, qmake, and qmlengine | mae | 2010-02-24 | 1 | -7/+12 |
| | | | |||||
| | * | Build fix when using <QtDeclarative> include. | Alexis Menard | 2010-02-24 | 1 | -0/+3 |
| | | | |||||
| | * | Make QDeclarativeMetaType and QDeclarativeType private | Aaron Kennedy | 2010-02-24 | 11 | -23/+27 |
| | | | |||||
| | * | Fixup tests after QDeclarative class renames | Aaron Kennedy | 2010-02-24 | 1 | -1/+1 |
| | | | |||||
| | * | Simplify QML element registration headers | Aaron Kennedy | 2010-02-24 | 12 | -314/+316 |
| | | | |||||
| * | | Automatically connect to signals "onFooChanged" if property is "foo". | Bea Lam | 2010-02-25 | 3 | -25/+14 |
| |/ | | | | | | | | | | | | | This follows on from a2a8cea2835ef24104fe784b6ce0f508cc5637c0 to make it work for PropertyChanges and QDeclarativeMetaProperty as well. Task-number: QT-2783 |