aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorBoris Kolpackov <boris@codesynthesis.com>2017-08-08 14:08:25 +0200
committerBoris Kolpackov <boris@codesynthesis.com>2017-08-08 14:08:25 +0200
commit1be617a2b4f78d621fd04fadc51a148a115c45c1 (patch)
tree7dd5e0ad6f8ff66048a8b36d2dc849bff3e6d795
parent74f4610ffe277992d280212502a26ca53e896855 (diff)
Bump version to 2.5.0-b.6.z, master is open for business
-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 820a4ec..670c9de 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 != 20455
+#if ODB_VERSION != 20456
# error incompatible odb interface version detected
#endif
// ODB Qt interface version: odb interface version plus the Qt interface
// version.
//
-#define ODB_QT_VERSION 2045500
-#define ODB_QT_VERSION_STR "2.5.0-b.5"
+#define ODB_QT_VERSION 2045600
+#define ODB_QT_VERSION_STR "2.5.0-b.6"
// 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 2049955
-#define LIBODB_QT_VERSION_STR "2.5.0-b.5"
+#define LIBODB_QT_VERSION 2049956
+#define LIBODB_QT_VERSION_STR "2.5.0-b.6"
#include <odb/post.hxx>
diff --git a/odb/qt/version.options b/odb/qt/version.options
index 2368452..6e71f11 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 != 2045500 // 2.5.0-b.5'
+--hxx-prologue '#if ODB_QT_VERSION != 2045600 // 2.5.0-b.6'
--hxx-prologue '# error ODB and C++ compilers see different libodb-qt interface versions'
--hxx-prologue '#endif'
diff --git a/version b/version
index 22c5d3e..62aaa61 100644
--- a/version
+++ b/version
@@ -1 +1 @@
-2.5.0-b.5
+2.5.0-b.6