diff --git a/cmake/Modules/HandleVersionGeneration.cmake b/cmake/Modules/HandleVersionGeneration.cmake
index 4b52a6804..4ef42e71f 100644
--- a/cmake/Modules/HandleVersionGeneration.cmake
+++ b/cmake/Modules/HandleVersionGeneration.cmake
@@ -2,7 +2,6 @@
file(WRITE ${CMAKE_BINARY_DIR}/version.h.in
"#define GIT_VERSION_STRING \"@GIT_VERSION_STRING@\"
#define CANONICAL_VERSION_STRING \"@CANONICAL_VERSION_STRING@\"
-#define MOBILE_VERSION_STRING \"@MOBILE_VERSION_STRING@\"
")
file(COPY cmake/Modules/version.cmake
diff --git a/cmake/Modules/version.cmake b/cmake/Modules/version.cmake
index 8596c9dd0..2fc011ffd 100644
--- a/cmake/Modules/version.cmake
+++ b/cmake/Modules/version.cmake
@@ -10,7 +10,6 @@ execute_process(
OUTPUT_VARIABLE CANONICAL_VERSION_STRING
OUTPUT_STRIP_TRAILING_WHITESPACE
)
-set(MOBILE_VERSION_STRING "3.4.8")
configure_file(${SRC} ${DST} @ONLY)
if(CMAKE_SYSTEM_NAME STREQUAL "Windows")
diff --git a/core/qthelper.cpp b/core/qthelper.cpp
index afcf60bd5..4d7636763 100644
--- a/core/qthelper.cpp
+++ b/core/qthelper.cpp
@@ -410,7 +410,7 @@ QString getUserAgent()
// fill in the system data - use ':' as separator
// replace all other ':' with ' ' so that this is easy to parse
#ifdef SUBSURFACE_MOBILE
- QString userAgent = QString("Subsurface-mobile:%1(%2):").arg(subsurface_mobile_version()).arg(subsurface_canonical_version());
+ QString userAgent = QString("Subsurface-mobile:%1:").arg(subsurface_canonical_version());
#elif SUBSURFACE_DOWNLOADER
QString userAgent = QString("Subsurface-downloader:%1:").arg(subsurface_canonical_version());
#else
diff --git a/core/version.c b/core/version.c
index c77f68e7a..036353b66 100644
--- a/core/version.c
+++ b/core/version.c
@@ -11,9 +11,3 @@ const char *subsurface_canonical_version(void)
return CANONICAL_VERSION_STRING;
}
-#ifdef SUBSURFACE_MOBILE
-const char *subsurface_mobile_version(void)
-{
- return MOBILE_VERSION_STRING;
-}
-#endif
diff --git a/core/version.h b/core/version.h
index 0a3204bd9..98385e970 100644
--- a/core/version.h
+++ b/core/version.h
@@ -8,10 +8,6 @@ extern "C" {
const char *subsurface_git_version(void);
const char *subsurface_canonical_version(void);
-#ifdef SUBSURFACE_MOBILE
-const char *subsurface_mobile_version(void);
-#endif
-
#ifdef __cplusplus
}
#endif
diff --git a/packaging/android/qmake-build.sh b/packaging/android/qmake-build.sh
index 196cdfcd0..0170ae181 100755
--- a/packaging/android/qmake-build.sh
+++ b/packaging/android/qmake-build.sh
@@ -86,11 +86,8 @@ pushd "$BUILDROOT"/subsurface-mobile-build
# set up the Subsurface versions by hand
GITVERSION=$(cd "$SUBSURFACE_SOURCE" ; git describe --match "v[0-9]*" --abbrev=12)
CANONICALVERSION=$(echo "$GITVERSION" | sed -e 's/-g.*$// ; s/^v//' | sed -e 's/-/./')
-MOBILEVERSION=$(grep MOBILE "$SUBSURFACE_SOURCE"/cmake/Modules/version.cmake | cut -d\" -f 2)
echo "#define GIT_VERSION_STRING \"$GITVERSION\"" > ssrf-version.h
echo "#define CANONICAL_VERSION_STRING \"$CANONICALVERSION\"" >> ssrf-version.h
-echo "#define MOBILE_VERSION_STRING \"$MOBILEVERSION\"" >> ssrf-version.h
-SUBSURFACE_MOBILE_VERSION="$MOBILEVERSION ($CANONICALVERSION)"
popd
if [ "$versionOnly" = "1" ] ; then
@@ -387,7 +384,7 @@ popd
# call qmake to set up the build
echo "Run qmake to setup the Subsurface-mobile build for all architectures"
-$QMAKE BUILD_NR="$BUILDNR" BUILD_VERSION_NAME="$SUBSURFACE_MOBILE_VERSION" ANDROID_ABIS="$BUILD_ABIS" "$SUBSURFACE_SOURCE"/Subsurface-mobile.pro
+$QMAKE BUILD_NR="$BUILDNR" BUILD_VERSION_NAME="$CANONICALVERSION" ANDROID_ABIS="$BUILD_ABIS" "$SUBSURFACE_SOURCE"/Subsurface-mobile.pro
# if this isn't just a quick rebuild compile the translations
if [ "$QUICK" = "" ] ; then
diff --git a/packaging/ios/Info.plist.in b/packaging/ios/Info.plist.in
index 5923c9a9a..73ab786cd 100644
--- a/packaging/ios/Info.plist.in
+++ b/packaging/ios/Info.plist.in
@@ -17,7 +17,7 @@
CFBundlePackageType
APPL
CFBundleShortVersionString
- @MOBILE_VERSION@
+ @CANONICAL_VERSION@
CFBundleSignature
????
CFBundleVersion
diff --git a/packaging/ios/build.sh b/packaging/ios/build.sh
index 7ded59900..ad54869ab 100755
--- a/packaging/ios/build.sh
+++ b/packaging/ios/build.sh
@@ -79,10 +79,8 @@ fi
# set up the Subsurface versions by hand
GITVERSION=$(cd "$SUBSURFACE_SOURCE" ; git describe --match "v[0-9]*" --abbrev=12)
CANONICALVERSION=$(echo "$GITVERSION" | sed -e 's/-g.*$// ; s/^v//' | sed -e 's/-/./')
-MOBILEVERSION=$(grep MOBILE "$SUBSURFACE_SOURCE"/cmake/Modules/version.cmake | cut -d\" -f 2)
echo "#define GIT_VERSION_STRING \"$GITVERSION\"" > "$SUBSURFACE_SOURCE"/ssrf-version.h
echo "#define CANONICAL_VERSION_STRING \"$CANONICALVERSION\"" >> "$SUBSURFACE_SOURCE"/ssrf-version.h
-echo "#define MOBILE_VERSION_STRING \"$MOBILEVERSION\"" >> "$SUBSURFACE_SOURCE"/ssrf-version.h
BUNDLE=org.subsurface-divelog.subsurface-mobile
if [ "${IOS_BUNDLE_PRODUCT_IDENTIFIER}" != "" ] ; then
@@ -92,7 +90,7 @@ fi
pushd "$SUBSURFACE_SOURCE"/packaging/ios
# create Info.plist with the correct versions
# shellcheck disable=SC2002
-cat Info.plist.in | sed "s/@MOBILE_VERSION@/$MOBILEVERSION/;s/@CANONICAL_VERSION@/$CANONICALVERSION/;s/@PRODUCT_BUNDLE_IDENTIFIER@/$BUNDLE/" > Info.plist
+cat Info.plist.in | sed "s/@CANONICAL_VERSION@/$CANONICALVERSION/;s/@PRODUCT_BUNDLE_IDENTIFIER@/$BUNDLE/" > Info.plist
popd
if [ "$versionOnly" = "1" ] ; then
diff --git a/smtk-import/cmake/Modules/version.cmake b/smtk-import/cmake/Modules/version.cmake
index 1d6b0f474..44f3c842c 100644
--- a/smtk-import/cmake/Modules/version.cmake
+++ b/smtk-import/cmake/Modules/version.cmake
@@ -11,7 +11,6 @@ execute_process(
OUTPUT_VARIABLE CANONICAL_VERSION_STRING
OUTPUT_STRIP_TRAILING_WHITESPACE
)
-set(MOBILE_VERSION_STRING "1.2.1")
configure_file(${SRC} ${DST} @ONLY)
if(CMAKE_SYSTEM_NAME STREQUAL "Windows")