summaryrefslogtreecommitdiffstats
path: root/src/declarative/qml/qml.pri
diff options
context:
space:
mode:
authorMichael Brasser <michael.brasser@nokia.com>2009-07-15 22:30:14 (GMT)
committerMichael Brasser <michael.brasser@nokia.com>2009-07-15 22:30:14 (GMT)
commit50f400ac20e918db1d0a6496003d953dedaba42a (patch)
treeb1e03e544c0fd09f2070c5ebb95bd291b7dc39b2 /src/declarative/qml/qml.pri
parentfe591031a8550a8a8c97fa08f0bdf8c2f9d4cf93 (diff)
parentbcae9d84fb5dd2bdc5a5298c8841702505a02867 (diff)
downloadQt-50f400ac20e918db1d0a6496003d953dedaba42a.zip
Qt-50f400ac20e918db1d0a6496003d953dedaba42a.tar.gz
Qt-50f400ac20e918db1d0a6496003d953dedaba42a.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.pri3
1 files changed, 1 insertions, 2 deletions
diff --git a/src/declarative/qml/qml.pri b/src/declarative/qml/qml.pri
index 04c0ca2..857b07e 100644
--- a/src/declarative/qml/qml.pri
+++ b/src/declarative/qml/qml.pri
@@ -12,7 +12,7 @@ SOURCES += qml/qmlparser.cpp \
qml/qmlproxymetaobject.cpp \
qml/qmlvme.cpp \
qml/qmlcompiler.cpp \
- qml/qmlcompiledcomponent.cpp \
+ qml/qmlcompileddata.cpp \
qml/qmlboundsignal.cpp \
qml/qmldom.cpp \
qml/qmlrefcount.cpp \
@@ -43,7 +43,6 @@ HEADERS += qml/qmlparser_p.h \
qml/qmlboundsignal_p.h \
qml/qmlparserstatus.h \
qml/qmlproxymetaobject_p.h \
- qml/qmlcompiledcomponent_p.h \
qml/qmlvme_p.h \
qml/qmlcompiler_p.h \
qml/qmlengine_p.h \