summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorToby Tomkins <toby.tomkins@nokia.com>2011-03-23 17:55:49 +1000
committerToby Tomkins <toby.tomkins@nokia.com>2011-03-23 17:55:49 +1000
commit93a39cf794894335cbde4188d5c4aa31361fd605 (patch)
tree1629e138e3c505cd8a63d96e7166428113574987
parent64432571a9bac47a3884062fc097083591dca5dc (diff)
Change version number to 1.1.2.v1.1.2
-rw-r--r--common.pri2
-rw-r--r--doc/src/qtmobility.qdocconf8
-rw-r--r--features/mobility.prf.template2
-rw-r--r--qtmobility.pro4
-rw-r--r--src/global/qmobilityglobal.h6
-rw-r--r--src/s60installs/s60installs.pro2
6 files changed, 12 insertions, 12 deletions
diff --git a/common.pri b/common.pri
index a3308f10e2..437c856f30 100644
--- a/common.pri
+++ b/common.pri
@@ -93,7 +93,7 @@ contains(build_unit_tests, yes) {
contains(TEMPLATE,.*lib) {
DESTDIR = $$OUTPUT_DIR/lib
symbian:defFilePath=../s60installs
- VERSION = 1.1.1
+ VERSION = 1.1.2
} else {
DESTDIR = $$OUTPUT_DIR/bin
}
diff --git a/doc/src/qtmobility.qdocconf b/doc/src/qtmobility.qdocconf
index f4dabb2055..758ec3693e 100644
--- a/doc/src/qtmobility.qdocconf
+++ b/doc/src/qtmobility.qdocconf
@@ -19,7 +19,7 @@ naturallanguage = en_US
qhp.projects = QtMobility
qhp.QtMobility.file = qtmobility.qhp
-qhp.QtMobility.namespace = com.nokia.qtmobility.111
+qhp.QtMobility.namespace = com.nokia.qtmobility.112
qhp.QtMobility.virtualFolder = mobility
qhp.QtMobility.indexTitle = Qt Mobility Project Reference Documentation
qhp.QtMobility.indexRoot =
@@ -57,9 +57,9 @@ qhp.QtMobility.extraFiles = index.html \
style/style_ie8.css \
style/style.css
-qhp.QtMobility.filterAttributes = qtmobility 1.1.1
-qhp.QtMobility.customFilters.QtMobility.name = Qt Mobility 1.1.1
-qhp.QtMobility.customFilters.QtMobility.filterAttributes = qtmobility 1.1.1
+qhp.QtMobility.filterAttributes = qtmobility 1.1.2
+qhp.QtMobility.customFilters.QtMobility.name = Qt Mobility 1.1.2
+qhp.QtMobility.customFilters.QtMobility.filterAttributes = qtmobility 1.1.2
qhp.QtMobility.subprojects = classes overviews examples
qhp.QtMobility.subprojects.classes.title = Classes
qhp.QtMobility.subprojects.classes.indexTitle = All Qt Mobility Project Classes
diff --git a/features/mobility.prf.template b/features/mobility.prf.template
index ab0bedf6b6..d2b08ded5e 100644
--- a/features/mobility.prf.template
+++ b/features/mobility.prf.template
@@ -108,6 +108,6 @@ contains(MOBILITY, organizer) {
symbian:contains(CONFIG, mobility):!isEmpty(default_deployment.pkg_prerules):!contains(TARGET.UID3, 0x2002AC89):!contains(TARGET.UID3, 0xE002AC89) {
mobility_default_deployment.pkg_prerules += \
"; Default dependency to QtMobility libraries" \
- "(0x2002AC89), 1, 1, 1, {\"QtMobility\"}"
+ "(0x2002AC89), 1, 1, 2, {\"QtMobility\"}"
DEPLOYMENT += mobility_default_deployment
}
diff --git a/qtmobility.pro b/qtmobility.pro
index f3a2f00691..5b1ea3c58d 100644
--- a/qtmobility.pro
+++ b/qtmobility.pro
@@ -51,10 +51,10 @@ contains(QT_MAJOR_VERSION, 4):lessThan(QT_MINOR_VERSION, 6) {
PRF_CONFIG=$${QT_MOBILITY_BUILD_TREE}/features/mobilityconfig.prf
system(echo MOBILITY_CONFIG=$${mobility_modules} > $$PRF_CONFIG)
- system(echo MOBILITY_VERSION = 1.1.1 >> $$PRF_CONFIG)
+ system(echo MOBILITY_VERSION = 1.1.2 >> $$PRF_CONFIG)
system(echo MOBILITY_MAJOR_VERSION = 1 >> $$PRF_CONFIG)
system(echo MOBILITY_MINOR_VERSION = 1 >> $$PRF_CONFIG)
- system(echo MOBILITY_PATCH_VERSION = 1 >> $$PRF_CONFIG)
+ system(echo MOBILITY_PATCH_VERSION = 2 >> $$PRF_CONFIG)
#symbian does not generate make install rule. we have to copy prf manually
symbian {
diff --git a/src/global/qmobilityglobal.h b/src/global/qmobilityglobal.h
index fcc27f9afd..f817d3e7d8 100644
--- a/src/global/qmobilityglobal.h
+++ b/src/global/qmobilityglobal.h
@@ -41,13 +41,13 @@
#ifndef QMOBILITYGLOBAL_H
#define QMOBILITYGLOBAL_H
-#define QTM_VERSION_STR "1.1.1"
+#define QTM_VERSION_STR "1.1.2"
/*
QTM_VERSION is (major << 16) + (minor << 8) + patch.
*/
-#define QTM_VERSION 0x010101
+#define QTM_VERSION 0x010102
/*
- can be used like #if (QTM_VERSION >= QTM_VERSION_CHECK(1, 1, 1))
+ can be used like #if (QTM_VERSION >= QTM_VERSION_CHECK(1, 1, 2))
*/
#define QTM_VERSION_CHECK(major, minor, patch) ((major<<16)|(minor<<8)|(patch))
diff --git a/src/s60installs/s60installs.pro b/src/s60installs/s60installs.pro
index 4ef5d1f9de..180702ce25 100644
--- a/src/s60installs/s60installs.pro
+++ b/src/s60installs/s60installs.pro
@@ -9,7 +9,7 @@ isEmpty(QT_LIBINFIX):symbian {
TARGET = "QtMobility"
TARGET.UID3 = 0x2002AC89
- VERSION = 1.1.1
+ VERSION = 1.1.2
vendorinfo = \
"; Localised Vendor name" \