From a06b69c4343e85c1a3c16b0a96d23b1a02d62ae4 Mon Sep 17 00:00:00 2001 From: Boris Kolpackov Date: Fri, 14 Sep 2012 08:29:55 +0200 Subject: Bump version to 2.1.0 --- 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 b3456f2..2586c03 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 != 20002 +#if ODB_VERSION != 20100 # error incompatible odb interface version detected #endif // ODB Qt interface version: odb interface version plus the Qt interface // version. // -#define ODB_QT_VERSION 2000200 -#define ODB_QT_VERSION_STR "2.1.0.a2" +#define ODB_QT_VERSION 2010000 +#define ODB_QT_VERSION_STR "2.1.0" // 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 2009902 -#define LIBODB_QT_VERSION_STR "2.1.0.a2" +#define LIBODB_QT_VERSION 2010000 +#define LIBODB_QT_VERSION_STR "2.1.0" #include diff --git a/odb/qt/version.options b/odb/qt/version.options index 39c552d..810a061 100644 --- a/odb/qt/version.options +++ b/odb/qt/version.options @@ -7,6 +7,6 @@ # --hxx-prologue '#include ' ---hxx-prologue '#if ODB_QT_VERSION != 2000200 // 2.1.0.a2' +--hxx-prologue '#if ODB_QT_VERSION != 2010000 // 2.1.0' --hxx-prologue '# error ODB and C++ compilers see different libodb-qt interface versions' --hxx-prologue '#endif' diff --git a/version b/version index 51b720e..7ec1d6d 100644 --- a/version +++ b/version @@ -1 +1 @@ -2.1.0.a2 +2.1.0 -- cgit v1.1