diff options
| author | Michael Brasser <michael.brasser@nokia.com> | 2011-06-07 10:15:38 +1000 |
|---|---|---|
| committer | Michael Brasser <michael.brasser@nokia.com> | 2011-06-07 10:15:38 +1000 |
| commit | 26942a682c82bd347da65b143442d53d58533263 (patch) | |
| tree | cb051af61f43d609a02c8894d2e0c6a3caff781b /src/declarative/declarative.pro | |
| parent | 6b54de600ce74025bc8ada20bea95ad183a6cd8d (diff) | |
| parent | fafe446dfe07606100d055395360513ed4eb4ecd (diff) | |
Merge branch 'master' into v8
Conflicts:
src/declarative/graphicsitems/qdeclarativeitem.cpp
src/declarative/qml/qdeclarativecontextscriptclass.cpp
src/declarative/qml/qdeclarativeengine.cpp
src/declarative/qml/qdeclarativeengine_p.h
src/declarative/qml/qdeclarativeglobalscriptclass.cpp
src/declarative/qml/qdeclarativeinclude.cpp
src/declarative/qml/qdeclarativelistscriptclass.cpp
src/declarative/qml/qdeclarativeobjectscriptclass.cpp
src/declarative/qml/qdeclarativeobjectscriptclass_p.h
src/declarative/qml/qdeclarativetypenamescriptclass.cpp
src/declarative/qml/qdeclarativevaluetypescriptclass.cpp
Diffstat (limited to 'src/declarative/declarative.pro')
| -rw-r--r-- | src/declarative/declarative.pro | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/src/declarative/declarative.pro b/src/declarative/declarative.pro index 354b5b6577..bc3dbbb9c4 100644 --- a/src/declarative/declarative.pro +++ b/src/declarative/declarative.pro @@ -21,6 +21,8 @@ exists("qdeclarative_enable_gcov") { include($$QT_SOURCE_TREE/src/qbase.pri) +HEADERS += qtdeclarativeversion.h + #INCLUDEPATH -= $$QMAKE_INCDIR_QT/$$TARGET #DESTDIR=. |