aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorBoris Kolpackov <boris@codesynthesis.com>2015-02-07 14:00:39 +0200
committerBoris Kolpackov <boris@codesynthesis.com>2015-02-07 14:00:39 +0200
commit26500654a6662e00cc86383f9ed83c4e439adcef (patch)
tree36c93bc816d2905887d17b96b1909e688d4f6514
parentbfc1747d04d3f6eddad7bd118989971c6d42d3bd (diff)
Bump version to 2.4.0
-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 37b62cc..ddc4674 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 != 20306
+#if ODB_VERSION != 20400
# error incompatible odb interface version detected
#endif
// ODB Qt interface version: odb interface version plus the Qt interface
// version.
//
-#define ODB_QT_VERSION 2030600
-#define ODB_QT_VERSION_STR "2.4.0.a6"
+#define ODB_QT_VERSION 2040000
+#define ODB_QT_VERSION_STR "2.4.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 2039906
-#define LIBODB_QT_VERSION_STR "2.4.0.a6"
+#define LIBODB_QT_VERSION 2040000
+#define LIBODB_QT_VERSION_STR "2.4.0"
#include <odb/post.hxx>
diff --git a/odb/qt/version.options b/odb/qt/version.options
index cfc5678..6361904 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 != 2030600 // 2.4.0.a6'
+--hxx-prologue '#if ODB_QT_VERSION != 2040000 // 2.4.0'
--hxx-prologue '# error ODB and C++ compilers see different libodb-qt interface versions'
--hxx-prologue '#endif'
diff --git a/version b/version
index 770201d..197c4d5 100644
--- a/version
+++ b/version
@@ -1 +1 @@
-2.4.0.a6
+2.4.0