diff options
author | Gunnar Sletta <gunnar.sletta@nokia.com> | 2011-05-04 11:38:59 +0200 |
---|---|---|
committer | Gunnar Sletta <gunnar.sletta@nokia.com> | 2011-05-04 11:38:59 +0200 |
commit | 01285af37aafa00a1bf3fbd7654b1ec5e057775d (patch) | |
tree | b3c421716c3bc6892b565a096a8ec5be837cd267 /modules | |
parent | 16f58282bc5a1f81f7346ac6560df68761ad277d (diff) | |
parent | dbbcc4dff099d5cf41a3253f922b785889e17545 (diff) |
Merge branch 'master' into qtquick2
Conflicts:
src/imports/particles/particles.pro
Diffstat (limited to 'modules')
-rw-r--r-- | modules/qt_declarative.pri | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/modules/qt_declarative.pri b/modules/qt_declarative.pri index 7a54c6c3b2..59bc0fdd2b 100644 --- a/modules/qt_declarative.pri +++ b/modules/qt_declarative.pri @@ -1,12 +1,12 @@ -QT_DECLARATIVE_VERSION = $$QT_VERSION -QT_DECLARATIVE_MAJOR_VERSION = $$QT_MAJOR_VERSION -QT_DECLARATIVE_MINOR_VERSION = $$QT_MINOR_VERSION -QT_DECLARATIVE_PATCH_VERSION = $$QT_PATCH_VERSION +QT.declarative.VERSION = 4.8.0 +QT.declarative.MAJOR_VERSION = 4 +QT.declarative.MINOR_VERSION = 8 +QT.declarative.PATCH_VERSION = 0 QT.declarative.name = QtDeclarative QT.declarative.bins = $$QT_MODULE_BIN_BASE QT.declarative.includes = $$QT_MODULE_INCLUDE_BASE $$QT_MODULE_INCLUDE_BASE/QtDeclarative -QT.declarative.private_includes = $$QT_MODULE_INCLUDE_BASE/QtDeclarative/private +QT.declarative.private_includes = $$QT_MODULE_INCLUDE_BASE/QtDeclarative/$$QT.declarative.VERSION QT.declarative.sources = $$QT_MODULE_BASE/src/declarative QT.declarative.libs = $$QT_MODULE_LIB_BASE QT.declarative.plugins = $$QT_MODULE_PLUGIN_BASE |