diff options
| author | Maurice Kalinowski <maurice.kalinowski@theqtcompany.com> | 2016-01-13 12:57:18 +0100 |
|---|---|---|
| committer | Maurice Kalinowski <maurice.kalinowski@theqtcompany.com> | 2016-01-14 07:43:26 +0000 |
| commit | c3376ed3f90179586aa7a82730fa972dcd4cf5cd (patch) | |
| tree | 7faaac036592eac00b5d2f2d4d0f48f92fa7bc6e /qmake | |
| parent | f831c97a084d0781ecaa378cc8f54cf8ba4716fd (diff) | |
winrt: enable hardware buttons for Windows 10
Previously the hardware and camera button handler were guarded inside a
Q_OS_WINPHONE which does not apply to Windows 10.
Instead use WINAPI_PARTITION_FAMILY like on other places, this covers
Windows Phone 8.1 as well as Windows 10.
To find windows.phone.ui.input.h at build time the Mobile Extension
directory needs to be added to the include paths inside qmake. On
runtime we need to check whether we have hardware buttons or not. In
case they exist, register the handlers, otherwise skip registration.
Skipping also helps to keep WACK succeeding.
Task-number: QTBUG-50427
Change-Id: Ibeae15dbde12553cebd2b73b1a40b754c014f426
Reviewed-by: Oliver Wolff <oliver.wolff@theqtcompany.com>
Diffstat (limited to 'qmake')
| -rw-r--r-- | qmake/generators/win32/msvc_nmake.cpp | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/qmake/generators/win32/msvc_nmake.cpp b/qmake/generators/win32/msvc_nmake.cpp index 06c99b6e38..d6753b4ed6 100644 --- a/qmake/generators/win32/msvc_nmake.cpp +++ b/qmake/generators/win32/msvc_nmake.cpp @@ -193,6 +193,9 @@ NmakeMakefileGenerator::writeMakefile(QTextStream &t) incDirs << crtInclude + QStringLiteral("/shared"); incDirs << crtInclude + QStringLiteral("/winrt"); + incDirs << kitDir + QStringLiteral("Extension SDKs/WindowsMobile/") + + crtVersion + QStringLiteral("/Include/WinRT"); + libDirs << vcInstallDir + QStringLiteral("lib/store/") + compilerArch; libDirs << vcInstallDir + QStringLiteral("atlmfc/lib") + compilerArch; |