From 2c2bca95c2df3e931f551e641ca21791a29b676e Mon Sep 17 00:00:00 2001 From: Boris Kolpackov Date: Fri, 5 May 2017 12:50:10 +0200 Subject: Bump version to 2.5.0-b.2.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 5ba4cdd..2771043 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 != 20451 +#if ODB_VERSION != 20452 # error incompatible odb interface version detected #endif // ODB Qt interface version: odb interface version plus the Qt interface // version. // -#define ODB_QT_VERSION 2045100 -#define ODB_QT_VERSION_STR "2.5.0-b.1" +#define ODB_QT_VERSION 2045200 +#define ODB_QT_VERSION_STR "2.5.0-b.2" // 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 2049951 -#define LIBODB_QT_VERSION_STR "2.5.0-b.1" +#define LIBODB_QT_VERSION 2049952 +#define LIBODB_QT_VERSION_STR "2.5.0-b.2" #include diff --git a/odb/qt/version.options b/odb/qt/version.options index 9c56051..c43d89c 100644 --- a/odb/qt/version.options +++ b/odb/qt/version.options @@ -12,6 +12,6 @@ # --hxx-prologue '#include ' ---hxx-prologue '#if ODB_QT_VERSION != 2045100 // 2.5.0-b.1' +--hxx-prologue '#if ODB_QT_VERSION != 2045200 // 2.5.0-b.2' --hxx-prologue '# error ODB and C++ compilers see different libodb-qt interface versions' --hxx-prologue '#endif' diff --git a/version b/version index 07ad3e3..00e2348 100644 --- a/version +++ b/version @@ -1 +1 @@ -2.5.0-b.1 +2.5.0-b.2 -- cgit v1.1