diff options
| author | Warwick Allison <warwick.allison@nokia.com> | 2009-07-21 07:24:36 (GMT) |
|---|---|---|
| committer | Warwick Allison <warwick.allison@nokia.com> | 2009-07-21 07:24:36 (GMT) |
| commit | 34055e0160e2e94b0dd6b972c5bdc96a421adcf1 (patch) | |
| tree | bf7667e86dfe4d5c8e7ee3be40aa8862ff4042ca /src/declarative/qml/qml.pri | |
| parent | c301d995c646c70f8f943e2e4fc293a3e2d29edf (diff) | |
| parent | 8db694cb38e1f7f5096db96fcc1f168b13e643a4 (diff) | |
| download | Qt-34055e0160e2e94b0dd6b972c5bdc96a421adcf1.zip Qt-34055e0160e2e94b0dd6b972c5bdc96a421adcf1.tar.gz Qt-34055e0160e2e94b0dd6b972c5bdc96a421adcf1.tar.bz2 | |
Merge branch 'kinetic-declarativeui' of git@scm.dev.nokia.troll.no:qt/kinetic into kinetic-declarativeui
Diffstat (limited to 'src/declarative/qml/qml.pri')
| -rw-r--r-- | src/declarative/qml/qml.pri | 9 |
1 files changed, 6 insertions, 3 deletions
diff --git a/src/declarative/qml/qml.pri b/src/declarative/qml/qml.pri index eecf8cd..b71ca1f 100644 --- a/src/declarative/qml/qml.pri +++ b/src/declarative/qml/qml.pri @@ -3,8 +3,9 @@ SOURCES += qml/qmlparser.cpp \ qml/qmlvmemetaobject.cpp \ qml/qmlengine.cpp \ qml/qmlexpression.cpp \ - qml/qmlbindablevalue.cpp \ + qml/qmlbinding.cpp \ qml/qmlmetaproperty.cpp \ + qml/qmlbindablecomponent.cpp \ qml/qmlcomponent.cpp \ qml/qmlcontext.cpp \ qml/qmlcustomparser.cpp \ @@ -33,9 +34,11 @@ HEADERS += qml/qmlparser_p.h \ qml/qmlinstruction_p.h \ qml/qmlvmemetaobject_p.h \ qml/qml.h \ - qml/qmlbindablevalue.h \ - qml/qmlbindablevalue_p.h \ + qml/qmlbinding.h \ + qml/qmlbinding_p.h \ qml/qmlmetaproperty.h \ + qml/qmlbindablecomponent.h \ + qml/qmlbindablecomponent_p.h \ qml/qmlcomponent.h \ qml/qmlcomponent_p.h \ qml/qmlcustomparser_p.h \ |