Skip to content
GitLab
Projects
Groups
Snippets
Help
Loading...
Help
What's new
7
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
Open sidebar
Education
Marble
Commits
90c65921
Commit
90c65921
authored
Jun 01, 2015
by
Dennis Nienhüser
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Version bump to 0.21.23 (0.22 development version)
parent
ac2a7714
Changes
3
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
4 additions
and
4 deletions
+4
-4
src/apps/marble-ui/ControlView.cpp
src/apps/marble-ui/ControlView.cpp
+1
-1
src/lib/marble/CMakeLists.txt
src/lib/marble/CMakeLists.txt
+1
-1
src/lib/marble/MarbleGlobal.h
src/lib/marble/MarbleGlobal.h
+2
-2
No files found.
src/apps/marble-ui/ControlView.cpp
View file @
90c65921
...
...
@@ -130,7 +130,7 @@ ControlView::~ControlView()
QString
ControlView
::
applicationVersion
()
{
return
"1.11.2
2
(1.12 development version)"
;
return
"1.11.2
3
(1.12 development version)"
;
}
MapThemeManager
*
ControlView
::
mapThemeManager
()
...
...
src/lib/marble/CMakeLists.txt
View file @
90c65921
...
...
@@ -40,7 +40,7 @@ INCLUDE(geodata/CMakeLists.txt)
INCLUDE
(
graphicsview/CMakeLists.txt
)
INCLUDE
(
layers/CMakeLists.txt
)
set
(
GENERIC_LIB_VERSION
"0.21.2
2
"
)
set
(
GENERIC_LIB_VERSION
"0.21.2
3
"
)
set
(
GENERIC_LIB_SOVERSION
"22"
)
# link_directories (${QT_LIBRARY_DIR})
...
...
src/lib/marble/MarbleGlobal.h
View file @
90c65921
...
...
@@ -256,14 +256,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.21.2
2
(0.22 development version)"
);
const
QString
MARBLE_VERSION_STRING
=
QString
::
fromLatin1
(
"0.21.2
3
(0.22 development version)"
);
// API Version id:
// form : 0xMMmmpp
// MM = major revision.
// mm = minor revision.
// pp = patch revision.
#define MARBLE_VERSION 0x00151
6
#define MARBLE_VERSION 0x00151
7
static
const
char
NOT_AVAILABLE
[]
=
QT_TR_NOOP
(
"not available"
);
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
.
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment