aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorBoris Kolpackov <boris@codesynthesis.com>2017-04-28 16:17:22 +0200
committerBoris Kolpackov <boris@codesynthesis.com>2017-04-28 16:17:22 +0200
commit6511788d4b5b4df0d8808ca9c1abbad34189beb1 (patch)
tree8879c6bbb99a1c44c314c8e98fdfd57ebff8b9d4
parent33ddbe3d3fd75f9ca11f7f1a721e2ba97b201753 (diff)
Bump version to 2.5.0.b.1.z, switch to build2 version module2.5.0-b.1
-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 0c6d4d4..5ba4cdd 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 != 20411
+#if ODB_VERSION != 20451
# error incompatible odb interface version detected
#endif
// ODB Qt interface version: odb interface version plus the Qt interface
// version.
//
-#define ODB_QT_VERSION 2041100
-#define ODB_QT_VERSION_STR "2.5.0-a11"
+#define ODB_QT_VERSION 2045100
+#define ODB_QT_VERSION_STR "2.5.0-b.1"
// 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 2049911
-#define LIBODB_QT_VERSION_STR "2.5.0-a11"
+#define LIBODB_QT_VERSION 2049951
+#define LIBODB_QT_VERSION_STR "2.5.0-b.1"
#include <odb/post.hxx>
diff --git a/odb/qt/version.options b/odb/qt/version.options
index 90f3158..9c56051 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 != 2041100 // 2.5.0-a11'
+--hxx-prologue '#if ODB_QT_VERSION != 2045100 // 2.5.0-b.1'
--hxx-prologue '# error ODB and C++ compilers see different libodb-qt interface versions'
--hxx-prologue '#endif'
diff --git a/version b/version
index b6012ca..07ad3e3 100644
--- a/version
+++ b/version
@@ -1 +1 @@
-2.5.0-a11
+2.5.0-b.1