diff options
| author | Kent Hansen <kent.hansen@nokia.com> | 2012-03-19 12:29:32 +0100 |
|---|---|---|
| committer | Kent Hansen <kent.hansen@nokia.com> | 2012-03-19 12:37:03 +0100 |
| commit | 4821058f10118be55a541ad39e25ec9165cca3b3 (patch) | |
| tree | 167973e3c68fc442b0e37d6f628f3fdbe759f15a /src/qml/qml/qml.pri | |
| parent | 83f11e33745180e9370d484cbcedd0bac020c9dd (diff) | |
| parent | 26d5f2e833f0e3686aaa27e695bbfab5fbd808ad (diff) | |
Merge master into api_changes
Conflicts:
src/qml/debugger/qqmlenginedebugservice.cpp
src/qml/qml/v8/qv8qobjectwrapper.cpp
src/quick/util/qquickimageprovider.cpp
tests/auto/qml/qqmlecmascript/tst_qqmlecmascript.cpp
Change-Id: Ie78ba2fabd32f4812bcae9dbdd66ed289dc11dcb
Diffstat (limited to 'src/qml/qml/qml.pri')
| -rw-r--r-- | src/qml/qml/qml.pri | 13 |
1 files changed, 10 insertions, 3 deletions
diff --git a/src/qml/qml/qml.pri b/src/qml/qml/qml.pri index b3897637e8..5d26197b1c 100644 --- a/src/qml/qml/qml.pri +++ b/src/qml/qml/qml.pri @@ -46,7 +46,11 @@ SOURCES += \ $$PWD/qqmlimport.cpp \ $$PWD/qqmllist.cpp \ $$PWD/qqmllocale.cpp \ - $$PWD/qlistmodelinterface.cpp + $$PWD/qlistmodelinterface.cpp \ + $$PWD/qqmlabstractexpression.cpp \ + $$PWD/qqmljavascriptexpression.cpp \ + $$PWD/qqmlabstractbinding.cpp \ + $$PWD/qqmlvaluetypeproxybinding.cpp \ HEADERS += \ $$PWD/qqmlglobal_p.h \ @@ -59,7 +63,6 @@ HEADERS += \ $$PWD/qqml.h \ $$PWD/qquickapplication_p.h \ $$PWD/qqmlbinding_p.h \ - $$PWD/qqmlbinding_p_p.h \ $$PWD/qqmlproperty.h \ $$PWD/qqmlcomponent.h \ $$PWD/qqmlcomponent_p.h \ @@ -114,7 +117,11 @@ HEADERS += \ $$PWD/qqmlscriptstring_p.h \ $$PWD/qqmllocale_p.h \ $$PWD/qlistmodelinterface_p.h \ - $$PWD/qqmlcomponentattached_p.h + $$PWD/qqmlcomponentattached_p.h \ + $$PWD/qqmlabstractexpression_p.h \ + $$PWD/qqmljavascriptexpression_p.h \ + $$PWD/qqmlabstractbinding_p.h \ + $$PWD/qqmlvaluetypeproxybinding_p.h \ include(parser/parser.pri) include(rewriter/rewriter.pri) |