diff options
| author | Jan-Marek Glogowski <glogow@fbihome.de> | 2021-11-30 19:21:17 +0100 |
|---|---|---|
| committer | Jan-Marek Glogowski <glogow@fbihome.de> | 2022-01-19 16:11:45 +0100 |
| commit | 5f3b92f89767deda73620bc5e77e1933dfa81dcc (patch) | |
| tree | ef87ffba7f8eac6cf143a871ba93bbf13d65c398 | |
| parent | 4565382ee6f8fec96f0df94c34a2567816291c2e (diff) | |
WASM add toolkit and Emscripten version to About
Change-Id: I095cbb17accf04654a928bf0d89c0fbf1f443c9b
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/128610
Tested-by: Jenkins
Reviewed-by: Jan-Marek Glogowski <glogow@fbihome.de>
| -rw-r--r-- | vcl/source/app/svapp.cxx | 2 | ||||
| -rw-r--r-- | vcl/unx/generic/app/geninst.cxx | 13 |
2 files changed, 8 insertions, 7 deletions
diff --git a/vcl/source/app/svapp.cxx b/vcl/source/app/svapp.cxx index f5e84b94bbd1..2e02bffcb7f2 100644 --- a/vcl/source/app/svapp.cxx +++ b/vcl/source/app/svapp.cxx @@ -1204,7 +1204,7 @@ OUString Application::GetHWOSConfInfo(const int bSelection, const bool bLocalize #endif appendDetails(u"", Localize(SV_APP_DEFAULT, bLocalize)); -#if (defined LINUX || defined _WIN32 || defined MACOSX || defined __FreeBSD__) +#if (defined LINUX || defined _WIN32 || defined MACOSX || defined __FreeBSD__ || defined EMSCRIPTEN) appendDetails(u"; ", SV_APP_VCLBACKEND + GetToolkitName()); #endif } diff --git a/vcl/unx/generic/app/geninst.cxx b/vcl/unx/generic/app/geninst.cxx index 0093f64376c6..705a30e86933 100644 --- a/vcl/unx/generic/app/geninst.cxx +++ b/vcl/unx/generic/app/geninst.cxx @@ -52,7 +52,6 @@ SalGenericInstance::~SalGenericInstance() OUString SalGenericInstance::getOSVersion() { OUString aKernelVer = "unknown"; - #if defined(LINUX) FILE* pVersion = fopen( "/proc/version", "r" ); if ( pVersion ) @@ -72,7 +71,6 @@ OUString SalGenericInstance::getOSVersion() } fclose( pVersion ); } - return aKernelVer; #elif defined(__FreeBSD__) struct utsname stName; if ( uname( &stName ) != 0 ) @@ -87,11 +85,14 @@ OUString SalGenericInstance::getOSVersion() if ( c == ' ' || c == '-' || ( c == '.' && nDots++ > 0 ) ) break; } - return OUString::createFromAscii( stName.sysname ) + " " + - aKernelVer.copy( 0, nIndex ); -#else - return aKernelVer; + aKernelVer = OUString::createFromAscii(stName.sysname) + " " + aKernelVer.copy(0, nIndex); +#elif defined(EMSCRIPTEN) +#define str(s) #s +#define xstr(s) str(s) + aKernelVer = "Emscripten " xstr(__EMSCRIPTEN_major__) + "." xstr(__EMSCRIPTEN_minor__) "." xstr(__EMSCRIPTEN_tiny__); #endif + return aKernelVer; } /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ |