diff --git a/src/core/qgismobileapp.cpp b/src/core/qgismobileapp.cpp index a8de1c363c..7793214bc3 100644 --- a/src/core/qgismobileapp.cpp +++ b/src/core/qgismobileapp.cpp @@ -27,6 +27,7 @@ #include "cpl_conv.h" #include "cpl_string.h" #include "cpl_vsi.h" +#include "gdal_version.h" #ifdef WITH_BLUETOOTH #include "bluetoothdevicemodel.h" @@ -557,6 +558,8 @@ void QgisMobileapp::initDeclarative( QQmlEngine *engine ) // Register some globally available variables engine->rootContext()->setContextProperty( "qVersion", qVersion() ); + engine->rootContext()->setContextProperty( "qgisVersion", Qgis::version() ); + engine->rootContext()->setContextProperty( "gdalVersion", GDAL_RELEASE_NAME ); engine->rootContext()->setContextProperty( "withNfc", QVariant( NearFieldReader::isSupported() ) ); engine->rootContext()->setContextProperty( "systemFontPointSize", PlatformUtilities::instance()->systemFontPointSize() ); engine->rootContext()->setContextProperty( "mouseDoubleClickInterval", QApplication::styleHints()->mouseDoubleClickInterval() ); diff --git a/src/qml/About.qml b/src/qml/About.qml index 2f1db4b9c8..1d2f7c65d6 100644 --- a/src/qml/About.qml +++ b/src/qml/About.qml @@ -74,10 +74,13 @@ Item { color: Theme.light textFormat: Text.RichText text: { - var links = '' + gitRev.substr(0, 6) + ''; - if (appVersion && appVersion !== '1.0.0') + const links = '' + gitRev.substr(0, 6) + ''; + if (appVersion && appVersion !== '1.0.0') { links += ' ' + appVersion + ''; - return "QField
" + appVersionStr + " (" + links + ")
Qt " + qVersion; + } + const dependencies = [["Qt", qVersion], ["QGIS", qgisVersion], ["GDAL/OGR", gdalVersion]]; + const dependenciesStr = dependencies.map(pair => pair.join(" ")).join(" | "); + return "QField
" + appVersionStr + " (" + links + ")
" + dependenciesStr; } onLinkActivated: link => Qt.openUrlExternally(link) }