diff options
| author | Alan Alpert <alan.alpert@nokia.com> | 2009-10-29 03:52:36 (GMT) |
|---|---|---|
| committer | Alan Alpert <alan.alpert@nokia.com> | 2009-10-29 04:06:09 (GMT) |
| commit | 220eea1b5a978cf62e27878e7d9b2e1f4d10e91e (patch) | |
| tree | 0cdb8ba932cedd3b2f0f1b45b92c4c095a36862c /src/declarative/qml/qml.pri | |
| parent | bfbded95056d43a65b2c9ef1fa90bfd40adc6472 (diff) | |
| download | Qt-220eea1b5a978cf62e27878e7d9b2e1f4d10e91e.zip Qt-220eea1b5a978cf62e27878e7d9b2e1f4d10e91e.tar.gz Qt-220eea1b5a978cf62e27878e7d9b2e1f4d10e91e.tar.bz2 | |
Merge QmlComponentJS into QmlComponent
createComponent() and Component{} are now the same, and so Component{}s
can now be passed around for use in script.
Also this commit fixes the minor bug QT-2386
Diffstat (limited to 'src/declarative/qml/qml.pri')
| -rw-r--r-- | src/declarative/qml/qml.pri | 3 |
1 files changed, 0 insertions, 3 deletions
diff --git a/src/declarative/qml/qml.pri b/src/declarative/qml/qml.pri index 6c00beb..4c02f95 100644 --- a/src/declarative/qml/qml.pri +++ b/src/declarative/qml/qml.pri @@ -5,7 +5,6 @@ SOURCES += qml/qmlparser.cpp \ qml/qmlexpression.cpp \ qml/qmlbinding.cpp \ qml/qmlmetaproperty.cpp \ - qml/qmlcomponentjs.cpp \ qml/qmlcomponent.cpp \ qml/qmlcontext.cpp \ qml/qmlcustomparser.cpp \ @@ -56,8 +55,6 @@ HEADERS += qml/qmlparser_p.h \ qml/qmlbinding.h \ qml/qmlbinding_p.h \ qml/qmlmetaproperty.h \ - qml/qmlcomponentjs_p.h \ - qml/qmlcomponentjs_p_p.h \ qml/qmlcomponent.h \ qml/qmlcomponent_p.h \ qml/qmlcustomparser_p.h \ |