summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorFriedrich W. H. Kossebau <kossebau@kde.org>2016-12-03 13:56:55 (GMT)
committerFriedrich W. H. Kossebau <kossebau@kde.org>2016-12-03 13:56:55 (GMT)
commitba0306cfe35dc4adb30d98e1a7e4cfde9d3b3d74 (patch)
treef531c83f20d3006927e159e07e36c94f947c05a1
parent4e087c81d3bf3c24b99a2a696215937c0f61ce30 (diff)
Version bump to 0.26.0 (stable release)
-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 9c3f7d8..948fcbc 100644
--- a/src/apps/marble-ui/ControlView.cpp
+++ b/src/apps/marble-ui/ControlView.cpp
@@ -132,7 +132,7 @@ ControlView::~ControlView()
QString ControlView::applicationVersion()
{
- return "2.0.20 (2.1 development version)";
+ return "2.1.0 (stable release)";
}
MapThemeManager *ControlView::mapThemeManager()
diff --git a/src/lib/marble/CMakeLists.txt b/src/lib/marble/CMakeLists.txt
index 746de84..3dac8bb 100644
--- a/src/lib/marble/CMakeLists.txt
+++ b/src/lib/marble/CMakeLists.txt
@@ -38,8 +38,8 @@ INCLUDE(layers/CMakeLists.txt)
INCLUDE(osm/CMakeLists.txt)
set(MARBLE_LIB_VERSION_MAJOR "0")
-set(MARBLE_LIB_VERSION_MINOR "25")
-set(MARBLE_LIB_VERSION_PATCH "20")
+set(MARBLE_LIB_VERSION_MINOR "26")
+set(MARBLE_LIB_VERSION_PATCH "0")
set(MARBLE_LIB_VERSION "${MARBLE_LIB_VERSION_MAJOR}.${MARBLE_LIB_VERSION_MINOR}.${MARBLE_LIB_VERSION_PATCH}")
set(MARBLE_ABI_VERSION "26")
diff --git a/src/lib/marble/MarbleGlobal.h b/src/lib/marble/MarbleGlobal.h
index 773e0e4..a38e70a 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.25.20 (0.26 development version)" );
+const QString MARBLE_VERSION_STRING = QString::fromLatin1( "0.26.0 (stable release)" );
// API Version id:
// form : 0xMMmmpp
// MM = major revision.
// mm = minor revision.
// pp = patch revision.
-#define MARBLE_VERSION 0x001914
+#define MARBLE_VERSION 0x001a00
static const char NOT_AVAILABLE[] = QT_TRANSLATE_NOOP("Marble", "not available");