On 20 September 2015 at 07:03, Dirk Hohndel <[email protected]> wrote: > On Sun, Sep 20, 2015 at 01:18:00PM +0930, Steve wrote: >> >> Thanks Claudiu, these patches fixed the issue perfectly. Both HW OSTC and SW >> Petrel devices worked well. > > Thanks for verifying! The patches made it to Beta 2, so hopefully we'll > get some more testing. So far there appears to be only one person who has > tested my Beta 2 binaries, though :-) > > One other thing I notice... I have not a single entry for "Windows 10" and > looking at the code I don't think we have a correct test here. > > Thiago, can you help us out here? >
here is my quick attempt, this assumes that Qt 5.5 has the means to find the Windows 10.0 version at runtime. the WINAPI broke the standard GetVersion(Ex) for versions >= 8.1, but i see that Qt handles that in qglobal.cpp. lubomir --
From f8dc8736a8b47b985a88c1bfb9aa525ec841b25c Mon Sep 17 00:00:00 2001 From: "Lubomir I. Ivanov" <[email protected]> Date: Sun, 20 Sep 2015 12:37:10 +0300 Subject: [PATCH] SubsurfaceSysInfo: detect Windows 10 in winVer_helper() Should work as long as Subsurface is built against >= Qt 5.5. Signed-off-by: Lubomir I. Ivanov <[email protected]> --- subsurfacesysinfo.cpp | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/subsurfacesysinfo.cpp b/subsurfacesysinfo.cpp index a7173b1..69b0f72 100644 --- a/subsurfacesysinfo.cpp +++ b/subsurfacesysinfo.cpp @@ -211,6 +211,10 @@ static const char *winVer_helper() return "8"; case SubsurfaceSysInfo::WV_WINDOWS8_1: return "8.1"; +#if QT_VERSION >= QT_VERSION_CHECK(5, 5, 0) + case SubsurfaceSysInfo::WV_WINDOWS10: + return "10"; +#endif case SubsurfaceSysInfo::WV_CE: return "CE"; -- 1.7.11.msysgit.0
_______________________________________________ subsurface mailing list [email protected] http://lists.subsurface-divelog.org/cgi-bin/mailman/listinfo/subsurface
