diff options
| author | Jan Arve Sæther <jan-arve.saether@qt.io> | 2020-11-04 09:52:18 +0100 |
|---|---|---|
| committer | Jan Arve Sæther <jan-arve.saether@qt.io> | 2020-11-04 14:32:49 +0100 |
| commit | d7ebda38139bcc4bf0d7c3a28af659e27800eb45 (patch) | |
| tree | 57fde6a790dc3c101f6396e4f8ebdb9ba38ee20c /src/quickcontrols2/qquickstyle.cpp | |
| parent | 6df8214d39106b1a3b6133357c764b909841d141 (diff) | |
Native style: Enable windows style
Task-number: QTBUG-86399
Change-Id: I634db1d4514a685743504748251e53703676881a
Reviewed-by: Richard Moe Gustavsen <richard.gustavsen@qt.io>
Diffstat (limited to 'src/quickcontrols2/qquickstyle.cpp')
| -rw-r--r-- | src/quickcontrols2/qquickstyle.cpp | 12 |
1 files changed, 5 insertions, 7 deletions
diff --git a/src/quickcontrols2/qquickstyle.cpp b/src/quickcontrols2/qquickstyle.cpp index 7ad4a38d..40cbce2d 100644 --- a/src/quickcontrols2/qquickstyle.cpp +++ b/src/quickcontrols2/qquickstyle.cpp @@ -188,9 +188,8 @@ struct QQuickStyleSpec qCDebug(lcQtQuickControlsStyle) << "no style was specified; checking if we have an appropriate style for this platform"; #if defined(Q_OS_MACOS) style = QLatin1String("macOS"); -// TODO: Enable this section when the windows style is complete: QTBUG-86399 -//#elif defined(Q_OS_WINDOWS) -// style = QLatin1String("Windows"); +#elif defined(Q_OS_WINDOWS) + style = QLatin1String("Windows"); #elif defined(Q_OS_ANDROID) style = QLatin1String("Material"); #elif defined(QT_OS_LINUX) @@ -420,10 +419,9 @@ QStringList QQuickStylePrivate::builtInStyles() #endif QLatin1String("Material"), QLatin1String("Universal"), -// #ifdef Q_OS_WINDOWS -// Enable this section when the windows style is complete -// QLatin1String("Windows") -// #endif +#ifdef Q_OS_WINDOWS + QLatin1String("Windows") +#endif }; } |