qiurui
/
qtdeclarative
mirror of https://github.com/qt/qtdeclarative.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

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
This commit is contained in:
Qt Continuous Integration System 2011-05-14 04:55:40 +10:00
parent 2ed6cea09f 61c0b5c392
commit b6b1aebf48
2 changed files with 9 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
modules/qt_declarative.pri
View File

@ -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

6
qtdeclarative.pro
View File

@ -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