aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorBoris Kolpackov <boris@codesynthesis.com>2011-10-03 09:59:54 +0200
committerBoris Kolpackov <boris@codesynthesis.com>2011-10-03 09:59:54 +0200
commitf8190440e9a574dfabbeafe6752cf91ad02270fe (patch)
tree7e3a611eb00bb1a27fb1efc8ffda5f2f02aec842
parentca72e8dd21e6bf060e6a4c2cf4e775533930780a (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 659ce71..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 != 10502
+#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 1059902
-#define LIBODB_QT_VERSION_STR "1.6.0.a2"
+#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 e527f98..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 != 1059902 // 1.6.0.a2'
+--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 be9a4ff..dc1e644 100644
--- a/version
+++ b/version
@@ -1 +1 @@
-1.6.0.a2
+1.6.0