summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDennis Nienhüser <nienhueser@kde.org>2016-09-03 13:40:28 (GMT)
committerDennis Nienhüser <nienhueser@kde.org>2016-09-03 13:40:28 (GMT)
commitc66c27c71c12096d56913b750315bc5698b3939a (patch)
tree5c75ecfdbaf9fff12725849b516bf2430e64135f
parent68de7e50892b61f952161236026485c4166a5052 (diff)
Version bump to 0.25.20 (0.26 development version)
-rw-r--r--src/apps/marble-ui/ControlView.cpp2
-rw-r--r--src/lib/marble/CMakeLists.txt4
-rw-r--r--src/lib/marble/MarbleGlobal.h4
3 files changed, 5 insertions, 5 deletions
diff --git a/src/apps/marble-ui/ControlView.cpp b/src/apps/marble-ui/ControlView.cpp
index 4305a8f..909caf0 100644
--- a/src/apps/marble-ui/ControlView.cpp
+++ b/src/apps/marble-ui/ControlView.cpp
@@ -131,7 +131,7 @@ ControlView::~ControlView()
QString ControlView::applicationVersion()
{
- return "1.14.21 (2.0 development version)";
+ return "2.0.20 (2.1 development version)";
}
MapThemeManager *ControlView::mapThemeManager()
diff --git a/src/lib/marble/CMakeLists.txt b/src/lib/marble/CMakeLists.txt
index 6a58d16..475513b 100644
--- a/src/lib/marble/CMakeLists.txt
+++ b/src/lib/marble/CMakeLists.txt
@@ -37,8 +37,8 @@ INCLUDE(graphicsview/CMakeLists.txt)
INCLUDE(layers/CMakeLists.txt)
INCLUDE(osm/CMakeLists.txt)
-set(MARBLE_LIB_VERSION "0.24.21")
-set(MARBLE_ABI_VERSION "25")
+set(MARBLE_LIB_VERSION "0.25.20")
+set(MARBLE_ABI_VERSION "26")
########### next target ###############
diff --git a/src/lib/marble/MarbleGlobal.h b/src/lib/marble/MarbleGlobal.h
index 3c186c5..773e0e4 100644
--- a/src/lib/marble/MarbleGlobal.h
+++ b/src/lib/marble/MarbleGlobal.h
@@ -247,14 +247,14 @@ const qreal SEC2HOUR = 1.0 / HOUR2SEC;
// String for about dialog and http user agent
// FIXME: check if blanks are allowed in user agent version numbers
-const QString MARBLE_VERSION_STRING = QString::fromLatin1( "0.24.21 (0.25 development version)" );
+const QString MARBLE_VERSION_STRING = QString::fromLatin1( "0.25.20 (0.26 development version)" );
// API Version id:
// form : 0xMMmmpp
// MM = major revision.
// mm = minor revision.
// pp = patch revision.
-#define MARBLE_VERSION 0x001815
+#define MARBLE_VERSION 0x001914
static const char NOT_AVAILABLE[] = QT_TRANSLATE_NOOP("Marble", "not available");