diff options
| author | Maurice Kalinowski <maurice.kalinowski@qt.io> | 2016-07-01 08:50:49 +0200 |
|---|---|---|
| committer | Maurice Kalinowski <maurice.kalinowski@qt.io> | 2016-07-01 07:00:47 +0000 |
| commit | a10b6b5bf6ed29f705c2e3dd85c1206a96171f60 (patch) | |
| tree | de543db3e68837c54fdf64a8042e4c9071dbfd68 | |
| parent | 7505c7ef734245bef4094fe627290a8836a6e3f8 (diff) | |
| download | qtlocation-a10b6b5bf6ed29f705c2e3dd85c1206a96171f60.tar.gz | |
winrt: Add GeolocationAccessStatus existence check
GeolocationAccessStatus was added in the 10586 SDK which is the minimum
SDK version for Windows 10 development. However, some updates might keep
10240 and caused the config test to succeed and then fail compilation
later on.
Hence add it to the config test and disable the winrt plugin if it it
not available.
Task-number: QTBUG-54474
Change-Id: I3931bcd1125026c438bff991b9a9d053efcb31f7
Reviewed-by: Friedemann Kleint <Friedemann.Kleint@qt.io>
| -rw-r--r-- | config.tests/winrt/main.cpp | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/config.tests/winrt/main.cpp b/config.tests/winrt/main.cpp index e5a39008..e1b14959 100644 --- a/config.tests/winrt/main.cpp +++ b/config.tests/winrt/main.cpp @@ -29,10 +29,16 @@ #include <functional> #include <windows.system.h> #include <windows.devices.geolocation.h> +#include <windows.foundation.h> #include <wrl.h> using namespace Microsoft::WRL::Wrappers; using namespace ABI::Windows::Devices::Geolocation; +using namespace ABI::Windows::Foundation; + +#if _MSC_VER >= 1900 +typedef IAsyncOperationCompletedHandler<GeolocationAccessStatus> AccessHandler; +#endif int main(int, char**) { |