From 1be617a2b4f78d621fd04fadc51a148a115c45c1 Mon Sep 17 00:00:00 2001 From: Boris Kolpackov Date: Tue, 8 Aug 2017 14:08:25 +0200 Subject: Bump version to 2.5.0-b.6.z, master is open for business --- odb/qt/version.hxx | 10 +++++----- odb/qt/version.options | 2 +- version | 2 +- 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 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 ' ---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 -- cgit v1.1