aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorBoris Kolpackov <boris@codesynthesis.com>2016-04-06 14:32:22 +0200
committerBoris Kolpackov <boris@codesynthesis.com>2016-04-06 14:32:22 +0200
commit3b131c0147335b3cca2de29190bc2933fc537959 (patch)
tree1bc88158550b9a37f8fe6c4a5544bb1dab49b01d
parent37c4c87f30777bb9587e4ab842f42f8fc51569bb (diff)
Bump version to 2.5.0.a6
-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 d29d660..772d16f 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 != 20405
+#if ODB_VERSION != 20406
# error incompatible odb interface version detected
#endif
// ODB Qt interface version: odb interface version plus the Qt interface
// version.
//
-#define ODB_QT_VERSION 2040500
-#define ODB_QT_VERSION_STR "2.5.0.a5"
+#define ODB_QT_VERSION 2040600
+#define ODB_QT_VERSION_STR "2.5.0.a6"
// 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 2049905
-#define LIBODB_QT_VERSION_STR "2.5.0.a5"
+#define LIBODB_QT_VERSION 2049906
+#define LIBODB_QT_VERSION_STR "2.5.0.a6"
#include <odb/post.hxx>
diff --git a/odb/qt/version.options b/odb/qt/version.options
index d66a5eb..2daabd5 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 != 2040500 // 2.5.0.a5'
+--hxx-prologue '#if ODB_QT_VERSION != 2040600 // 2.5.0.a6'
--hxx-prologue '# error ODB and C++ compilers see different libodb-qt interface versions'
--hxx-prologue '#endif'
diff --git a/version b/version
index 9518eae..5ae477a 100644
--- a/version
+++ b/version
@@ -1 +1 @@
-2.5.0.a5
+2.5.0.a6