aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorBoris Kolpackov <boris@codesynthesis.com>2013-02-09 10:33:13 +0200
committerBoris Kolpackov <boris@codesynthesis.com>2013-02-09 10:33:13 +0200
commit0131fe60daf703589192987afdc0c67fc1941860 (patch)
tree9fee248a0f4bc6b81fb4c258a5d13368682418cd
parent397e4df24fa118952a6af5945f70572653a0f7fb (diff)
Bump version to 2.2.0
-rw-r--r--odb/qt/version.hxx10
-rw-r--r--odb/qt/version.options2
-rw-r--r--version2
3 files changed, 7 insertions, 7 deletions
diff --git a/odb/qt/version.hxx b/odb/qt/version.hxx
index e0d0569..447612c 100644
--- a/odb/qt/version.hxx
+++ b/odb/qt/version.hxx
@@ -28,23 +28,23 @@
// Check that we have compatible ODB version.
//
-#if ODB_VERSION != 20103
+#if ODB_VERSION != 20200
# error incompatible odb interface version detected
#endif
// ODB Qt interface version: odb interface version plus the Qt interface
// version.
//
-#define ODB_QT_VERSION 2010300
-#define ODB_QT_VERSION_STR "2.2.0.a3"
+#define ODB_QT_VERSION 2020000
+#define ODB_QT_VERSION_STR "2.2.0"
// libodb-qt version: odb interface version plus the bugfix version. Note
// that LIBODB_QT_VERSION is always greater or equal to ODB_QT_VERSION
// since if the Qt interface virsion is incremented then the bugfix version
// must be incremented as well.
//
-#define LIBODB_QT_VERSION 2019903
-#define LIBODB_QT_VERSION_STR "2.2.0.a3"
+#define LIBODB_QT_VERSION 2020000
+#define LIBODB_QT_VERSION_STR "2.2.0"
#include <odb/post.hxx>
diff --git a/odb/qt/version.options b/odb/qt/version.options
index 213f1fa..9e8f0ba 100644
--- a/odb/qt/version.options
+++ b/odb/qt/version.options
@@ -12,6 +12,6 @@
#
--hxx-prologue '#include <odb/qt/version.hxx>'
---hxx-prologue '#if ODB_QT_VERSION != 2010300 // 2.2.0.a3'
+--hxx-prologue '#if ODB_QT_VERSION != 2020000 // 2.2.0'
--hxx-prologue '# error ODB and C++ compilers see different libodb-qt interface versions'
--hxx-prologue '#endif'
diff --git a/version b/version
index 90d185b..ccbccc3 100644
--- a/version
+++ b/version
@@ -1 +1 @@
-2.2.0.a3
+2.2.0