aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorBoris Kolpackov <boris@codesynthesis.com>2014-11-20 06:48:26 +0200
committerBoris Kolpackov <boris@codesynthesis.com>2014-11-20 06:48:26 +0200
commitcf23685ac884e8d8d615037fb32ea84e5d07e05e (patch)
treeccda8c9655a265e33dc5e8cdaec078f53c1605ce
parent0ca6d442fcf7e7493a742aab1171e624ac8ee6d7 (diff)
parent4954e364d0035fc1dddefbd3cbd143b42fe4722f (diff)
Merge branch 'master' into bulkbulk
-rw-r--r--odb/qt/version.hxx10
-rw-r--r--odb/qt/version.options2
-rw-r--r--version2
3 files changed, 7 insertions, 7 deletions
diff --git a/odb/qt/version.hxx b/odb/qt/version.hxx
index 3584e36..2ccac54 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 != 20303
+#if ODB_VERSION != 20304
# error incompatible odb interface version detected
#endif
// ODB Qt interface version: odb interface version plus the Qt interface
// version.
//
-#define ODB_QT_VERSION 2030300
-#define ODB_QT_VERSION_STR "2.4.0.a3"
+#define ODB_QT_VERSION 2030400
+#define ODB_QT_VERSION_STR "2.4.0.a4"
// 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 2039903
-#define LIBODB_QT_VERSION_STR "2.4.0.a3"
+#define LIBODB_QT_VERSION 2039904
+#define LIBODB_QT_VERSION_STR "2.4.0.a4"
#include <odb/post.hxx>
diff --git a/odb/qt/version.options b/odb/qt/version.options
index 8b1cf55..2eec5ae 100644
--- a/odb/qt/version.options
+++ b/odb/qt/version.options
@@ -12,6 +12,6 @@
#
--hxx-prologue '#include <odb/qt/version.hxx>'
---hxx-prologue '#if ODB_QT_VERSION != 2030300 // 2.4.0.a3'
+--hxx-prologue '#if ODB_QT_VERSION != 2030400 // 2.4.0.a4'
--hxx-prologue '# error ODB and C++ compilers see different libodb-qt interface versions'
--hxx-prologue '#endif'
diff --git a/version b/version
index 26d9ac3..42645da 100644
--- a/version
+++ b/version
@@ -1 +1 @@
-2.4.0.a3
+2.4.0.a4