diff options
| author | Qt Continuous Integration System <qt-info@nokia.com> | 2011-05-14 04:52:29 +1000 |
|---|---|---|
| committer | Qt Continuous Integration System <qt-info@nokia.com> | 2011-05-14 04:52:29 +1000 |
| commit | f2209f6f55b7340da0f0112943c7e50fb5f761bf (patch) | |
| tree | 5d119a9ea01b3995699147a72685ae263e90eaa7 | |
| parent | 07a079e63d2cdd91c50f67fac44b8882471f11e9 (diff) | |
| parent | e3c777dc7acc967830be16d418c0c2825e2f593e (diff) | |
Merge branch 'master' of git://scm.dev.nokia.troll.no/qt/qtscript-staging
* 'master' of git://scm.dev.nokia.troll.no/qt/qtscript-staging:
Honor -nomake examples setting
Update module version number to 5.0.0
| -rw-r--r-- | modules/qt_script.pri | 6 | ||||
| -rw-r--r-- | modules/qt_scripttools.pri | 6 | ||||
| -rw-r--r-- | qtscript.pro | 3 |
3 files changed, 9 insertions, 6 deletions
diff --git a/modules/qt_script.pri b/modules/qt_script.pri index 5598bb0..43fab86 100644 --- a/modules/qt_script.pri +++ b/modules/qt_script.pri @@ -1,6 +1,6 @@ -QT.script.VERSION = 4.8.0 -QT.script.MAJOR_VERSION = 4 -QT.script.MINOR_VERSION = 8 +QT.script.VERSION = 5.0.0 +QT.script.MAJOR_VERSION = 5 +QT.script.MINOR_VERSION = 0 QT.script.PATCH_VERSION = 0 QT.script.name = QtScript diff --git a/modules/qt_scripttools.pri b/modules/qt_scripttools.pri index 9b7a863..2ff4fee 100644 --- a/modules/qt_scripttools.pri +++ b/modules/qt_scripttools.pri @@ -1,6 +1,6 @@ -QT.scripttools.VERSION = 4.8.0 -QT.scripttools.MAJOR_VERSION = 4 -QT.scripttools.MINOR_VERSION = 8 +QT.scripttools.VERSION = 5.0.0 +QT.scripttools.MAJOR_VERSION = 5 +QT.scripttools.MINOR_VERSION = 0 QT.scripttools.PATCH_VERSION = 0 QT.scripttools.name = QtScriptTools diff --git a/qtscript.pro b/qtscript.pro index 86124d2..fa8144b 100644 --- a/qtscript.pro +++ b/qtscript.pro @@ -6,6 +6,9 @@ module_qtscript_src.target = module-qtscript-src module_qtscript_examples.subdir = examples module_qtscript_examples.target = module-qtscript-examples module_qtscript_examples.depends = module_qtscript_src +!contains(QT_BUILD_PARTS,examples) { + module_qtscript_examples.CONFIG += no_default_install no_default_target +} module_qtscript_tests.subdir = tests module_qtscript_tests.target = module-qtscript-tests |