aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorBoris Kolpackov <boris@codesynthesis.com>2012-10-29 12:10:48 +0200
committerBoris Kolpackov <boris@codesynthesis.com>2012-10-29 12:10:48 +0200
commit146c6309e0f6e124b28f1c02476ef0872d1c51d3 (patch)
tree5ee8f07c4d6ef474ecef3ddede7d0802b4646163
parent2c861078b1a75ba00550fb33dc7733536c413331 (diff)
Bump version to 2.2.0.a12.2.0.a1
-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 2586c03..6110a42 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 != 20100
+#if ODB_VERSION != 20101
# error incompatible odb interface version detected
#endif
// ODB Qt interface version: odb interface version plus the Qt interface
// version.
//
-#define ODB_QT_VERSION 2010000
-#define ODB_QT_VERSION_STR "2.1.0"
+#define ODB_QT_VERSION 2010100
+#define ODB_QT_VERSION_STR "2.2.0.a1"
// 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 2010000
-#define LIBODB_QT_VERSION_STR "2.1.0"
+#define LIBODB_QT_VERSION 2019901
+#define LIBODB_QT_VERSION_STR "2.2.0.a1"
#include <odb/post.hxx>
diff --git a/odb/qt/version.options b/odb/qt/version.options
index 810a061..980422c 100644
--- a/odb/qt/version.options
+++ b/odb/qt/version.options
@@ -7,6 +7,6 @@
#
--hxx-prologue '#include <odb/qt/version.hxx>'
---hxx-prologue '#if ODB_QT_VERSION != 2010000 // 2.1.0'
+--hxx-prologue '#if ODB_QT_VERSION != 2010100 // 2.2.0.a1'
--hxx-prologue '# error ODB and C++ compilers see different libodb-qt interface versions'
--hxx-prologue '#endif'
diff --git a/version b/version
index 7ec1d6d..722318f 100644
--- a/version
+++ b/version
@@ -1 +1 @@
-2.1.0
+2.2.0.a1