diff options
| author | Qt Continuous Integration System <qt-info@nokia.com> | 2011-05-14 04:55:40 +1000 |
|---|---|---|
| committer | Qt Continuous Integration System <qt-info@nokia.com> | 2011-05-14 04:55:40 +1000 |
| commit | b6b1aebf480ef84d8b2b3a7fc338493811cc2ee0 (patch) | |
| tree | bfab5b23caf0293f43ccd8b7e3c8474efcab6884 | |
| parent | 2ed6cea09ff3761ceb662ef8aacf5edc6cd1dfc8 (diff) | |
| parent | 61c0b5c3923956db53408ad3513488f6f4893c2f (diff) | |
Merge branch 'master' of git://scm.dev.nokia.troll.no/qt/qtdeclarative-staging
* 'master' of git://scm.dev.nokia.troll.no/qt/qtdeclarative-staging:
Honor -nomake for examples and demos
Update module version number to 5.0.0
| -rw-r--r-- | modules/qt_declarative.pri | 6 | ||||
| -rw-r--r-- | qtdeclarative.pro | 6 |
2 files changed, 9 insertions, 3 deletions
diff --git a/modules/qt_declarative.pri b/modules/qt_declarative.pri index fe69b5f105..5c76ed66a7 100644 --- a/modules/qt_declarative.pri +++ b/modules/qt_declarative.pri @@ -1,6 +1,6 @@ -QT.declarative.VERSION = 4.8.0 -QT.declarative.MAJOR_VERSION = 4 -QT.declarative.MINOR_VERSION = 8 +QT.declarative.VERSION = 5.0.0 +QT.declarative.MAJOR_VERSION = 5 +QT.declarative.MINOR_VERSION = 0 QT.declarative.PATCH_VERSION = 0 QT.declarative.name = QtDeclarative diff --git a/qtdeclarative.pro b/qtdeclarative.pro index acffb01417..ccee5fab6c 100644 --- a/qtdeclarative.pro +++ b/qtdeclarative.pro @@ -10,10 +10,16 @@ module_qtdeclarative_tools.depends = module_qtdeclarative_src module_qtdeclarative_demos.subdir = demos module_qtdeclarative_demos.target = module-qtdeclarative-demos module_qtdeclarative_demos.depends = module_qtdeclarative_src +!contains(QT_BUILD_PARTS,demos) { + module_qtdeclarative_demos.CONFIG = no_default_target no_default_install +} module_qtdeclarative_examples.subdir = examples/declarative module_qtdeclarative_examples.target = module-qtdeclarative-examples module_qtdeclarative_examples.depends = module_qtdeclarative_src +!contains(QT_BUILD_PARTS,examples) { + module_qtdeclarative_examples.CONFIG = no_default_target no_default_install +} module_qtdeclarative_tests.subdir = tests module_qtdeclarative_tests.target = module-qtdeclarative-tests |