diff options
| author | Alan Alpert <alan.alpert@nokia.com> | 2011-06-06 15:19:50 +1000 |
|---|---|---|
| committer | Alan Alpert <alan.alpert@nokia.com> | 2011-06-06 15:19:50 +1000 |
| commit | 6e22ead1767d0ef9463b34bee071ca54647a547c (patch) | |
| tree | e347fbc15f8695027930eac80ea9a437229cb57b /src/declarative/declarative.pro | |
| parent | 6dbd4286eb19e9ac45665046a43342bcdc8b127e (diff) | |
| parent | b6b1aebf480ef84d8b2b3a7fc338493811cc2ee0 (diff) | |
Merge branch 'master' into qtquick2
Conflicts:
src/declarative/graphicsitems/qdeclarativetextinput.cpp
src/declarative/qml/qdeclarativeengine.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 0a1f76a251..adf1408c58 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=. |