winrt: Fix build for Windows 10 Creators Update
Phone specific UI colors have been removed from the windows headers. Continue to use the enum values does not gain anything as the native calls return errors for those. Actually they did that already with 14393. Change-Id: I4b04d3af319766216ae7c550af704aab488c1d15 Reviewed-by: Friedemann Kleint <Friedemann.Kleint@qt.io> Reviewed-by: Oliver Wolff <oliver.wolff@qt.io>
This commit is contained in:
parent
43a5fe258b
commit
45862976b7
@ -146,6 +146,8 @@ static void nativeColorSettings(QPalette &p)
|
||||
if (uiColorSettings(L"Hotlight", UIElementType_Hotlight, &color))
|
||||
p.setColor(QPalette::BrightText, fromColor(color));
|
||||
|
||||
// Starting with SDK 15063 those have been removed.
|
||||
#ifndef QT_WINRT_DISABLE_PHONE_COLORS
|
||||
//Phone related
|
||||
if (uiColorSettings(L"PopupBackground", UIElementType_PopupBackground, &color)) {
|
||||
p.setColor(QPalette::ToolTipBase, fromColor(color));
|
||||
@ -186,6 +188,7 @@ static void nativeColorSettings(QPalette &p)
|
||||
|
||||
if (uiColorSettings(L"TextContrastWithHigh", UIElementType_TextContrastWithHigh, &color))
|
||||
p.setColor(QPalette::BrightText, fromColor(color));
|
||||
#endif // QT_WINRT_DISABLE_PHONE_COLORS
|
||||
}
|
||||
|
||||
QWinRTTheme::QWinRTTheme()
|
||||
|
@ -51,6 +51,7 @@ OTHER_FILES += winrt.json
|
||||
WINRT_SDK_VERSION_STRING = $$(UCRTVersion)
|
||||
WINRT_SDK_VERSION = $$member($$list($$split(WINRT_SDK_VERSION_STRING, .)), 2)
|
||||
lessThan(WINRT_SDK_VERSION, 14322): DEFINES += QT_WINRT_LIMITED_DRAGANDDROP
|
||||
greaterThan(WINRT_SDK_VERSION, 14393): DEFINES += QT_WINRT_DISABLE_PHONE_COLORS
|
||||
|
||||
contains(DEFINES, QT_NO_DRAGANDDROP) {
|
||||
SOURCES -= qwinrtdrag.cpp
|
||||
|
Loading…
x
Reference in New Issue
Block a user