aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorBoris Kolpackov <boris@codesynthesis.com>2015-11-09 18:18:49 +0200
committerBoris Kolpackov <boris@codesynthesis.com>2015-11-09 18:18:49 +0200
commit715b0b5a24523556c116df7b7e5119b11d505f39 (patch)
tree046816fe7200680a9701404bbd8c69a7ce3ab713
parent5398b886ed0da065fe084da0f107bebba0a163ba (diff)
Bump version to 2.5.0.a2
-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 64907cc..c022f85 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 != 20401
+#if ODB_VERSION != 20402
# error incompatible odb interface version detected
#endif
// ODB Qt interface version: odb interface version plus the Qt interface
// version.
//
-#define ODB_QT_VERSION 2040100
-#define ODB_QT_VERSION_STR "2.5.0.a1"
+#define ODB_QT_VERSION 2040200
+#define ODB_QT_VERSION_STR "2.5.0.a2"
// 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 2049901
-#define LIBODB_QT_VERSION_STR "2.5.0.a1"
+#define LIBODB_QT_VERSION 2049902
+#define LIBODB_QT_VERSION_STR "2.5.0.a2"
#include <odb/post.hxx>
diff --git a/odb/qt/version.options b/odb/qt/version.options
index ec906cc..55ed087 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 != 2040100 // 2.5.0.a1'
+--hxx-prologue '#if ODB_QT_VERSION != 2040200 // 2.5.0.a2'
--hxx-prologue '# error ODB and C++ compilers see different libodb-qt interface versions'
--hxx-prologue '#endif'
diff --git a/version b/version
index 3a437d9..b7f6fd3 100644
--- a/version
+++ b/version
@@ -1 +1 @@
-2.5.0.a1
+2.5.0.a2