aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorBoris Kolpackov <boris@codesynthesis.com>2011-07-27 17:00:12 +0200
committerBoris Kolpackov <boris@codesynthesis.com>2011-07-27 17:00:12 +0200
commitcf2dee1c8fd934a74ea1dadd16e9cbc2b28220bb (patch)
tree0304d2b1417b26bc0a67a7f3632be89a391d01a8
parentf1548b68e10914049bbb62dddedf7e76b8f0e0c9 (diff)
Bump version to 1.6.0
-rw-r--r--odb/qt/version.hxx6
-rw-r--r--odb/qt/version.options2
-rw-r--r--version2
3 files changed, 5 insertions, 5 deletions
diff --git a/odb/qt/version.hxx b/odb/qt/version.hxx
index 3f11e5d..188ec11 100644
--- a/odb/qt/version.hxx
+++ b/odb/qt/version.hxx
@@ -29,15 +29,15 @@
// Check that we have compatible ODB version.
//
-#if ODB_VERSION != 10500
+#if ODB_VERSION != 10600
# error incompatible odb interface version detected
#endif
// libodb-qt version: odb interface version plus the bugfix
// version.
//
-#define LIBODB_QT_VERSION 1050000
-#define LIBODB_QT_VERSION_STR "1.5.0"
+#define LIBODB_QT_VERSION 1060000
+#define LIBODB_QT_VERSION_STR "1.6.0"
#include <odb/post.hxx>
diff --git a/odb/qt/version.options b/odb/qt/version.options
index b7c5183..7a913f3 100644
--- a/odb/qt/version.options
+++ b/odb/qt/version.options
@@ -8,6 +8,6 @@
#
--hxx-prologue '#include <odb/qt/version.hxx>'
---hxx-prologue '#if LIBODB_QT_VERSION != 1050000 // 1.5.0'
+--hxx-prologue '#if LIBODB_QT_VERSION != 1060000 // 1.6.0'
--hxx-prologue '# error ODB and C++ compilers see different libodb-qt versions'
--hxx-prologue '#endif'
diff --git a/version b/version
index bc80560..dc1e644 100644
--- a/version
+++ b/version
@@ -1 +1 @@
-1.5.0
+1.6.0