aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorBoris Kolpackov <boris@codesynthesis.com>2017-05-24 13:47:37 +0200
committerBoris Kolpackov <boris@codesynthesis.com>2017-05-24 13:47:37 +0200
commite3a2ac452c6358679c9125d033b4d2f1363dae94 (patch)
tree7ab64179fc450a3a64f9c57fd1caec30bee8b8c0
parentbe846b7f1fb29cf3553b3c95504c4472a5e38cbb (diff)
Bump version to 2.5.0-b.4.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 ce5aa85..ad2e9c4 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 != 20453
+#if ODB_VERSION != 20454
# error incompatible odb interface version detected
#endif
// ODB Qt interface version: odb interface version plus the Qt interface
// version.
//
-#define ODB_QT_VERSION 2045300
-#define ODB_QT_VERSION_STR "2.5.0-b.3"
+#define ODB_QT_VERSION 2045400
+#define ODB_QT_VERSION_STR "2.5.0-b.4"
// 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 2049953
-#define LIBODB_QT_VERSION_STR "2.5.0-b.3"
+#define LIBODB_QT_VERSION 2049954
+#define LIBODB_QT_VERSION_STR "2.5.0-b.4"
#include <odb/post.hxx>
diff --git a/odb/qt/version.options b/odb/qt/version.options
index 3c3e5b4..7198da9 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 != 2045300 // 2.5.0-b.3'
+--hxx-prologue '#if ODB_QT_VERSION != 2045400 // 2.5.0-b.4'
--hxx-prologue '# error ODB and C++ compilers see different libodb-qt interface versions'
--hxx-prologue '#endif'
diff --git a/version b/version
index 7aa40f6..9cce3ff 100644
--- a/version
+++ b/version
@@ -1 +1 @@
-2.5.0-b.3
+2.5.0-b.4