6 files changed, 74 insertions, 2 deletions
diff --git a/src/plugins/styles/.prev_CMakeLists.txt b/src/plugins/styles/.prev_CMakeLists.txt
new file mode 100644
index 0000000000..73329915f6
--- /dev/null
+++ b/src/plugins/styles/.prev_CMakeLists.txt
@@ -0,0 +1,11 @@
+# Generated from styles.pro.
+
+if(QT_FEATURE_style_android)
+    add_subdirectory(android)
+endif()
+if(QT_FEATURE_style_mac)
+    add_subdirectory(mac)
+endif()
+if(QT_FEATURE_style_windowsvista)
+    add_subdirectory(windowsvista)
+endif()
diff --git a/src/plugins/styles/CMakeLists.txt b/src/plugins/styles/CMakeLists.txt
new file mode 100644
index 0000000000..d24e3daff8
--- /dev/null
+++ b/src/plugins/styles/CMakeLists.txt
@@ -0,0 +1,11 @@
+# Generated from styles.pro.
+
+if(QT_FEATURE_style_android)
+    # add_subdirectory(android) # special case TODO
+endif()
+if(QT_FEATURE_style_mac)
+    add_subdirectory(mac)
+endif()
+if(QT_FEATURE_style_windowsvista)
+    add_subdirectory(windowsvista)
+endif()
diff --git a/src/plugins/styles/android/qandroidstyle.cpp b/src/plugins/styles/android/qandroidstyle.cpp
index 086df92322..1d0838daec 100644
--- a/src/plugins/styles/android/qandroidstyle.cpp
+++ b/src/plugins/styles/android/qandroidstyle.cpp
@@ -248,7 +248,7 @@ QAndroidStyle::ItemType QAndroidStyle::qtControl(QStyle::PrimitiveElement primit
     case QStyle::PE_FrameLineEdit:
         return QC_EditText;
 
-    case QStyle::PE_IndicatorViewItemCheck:
+    case QStyle::PE_IndicatorItemViewItemCheck:
     case QStyle::PE_IndicatorCheckBox:
         return QC_Checkbox;
 
diff --git a/src/plugins/styles/mac/CMakeLists.txt b/src/plugins/styles/mac/CMakeLists.txt
new file mode 100644
index 0000000000..140d4e4c93
--- /dev/null
+++ b/src/plugins/styles/mac/CMakeLists.txt
@@ -0,0 +1,23 @@
+# Generated from mac.pro.
+
+#####################################################################
+## QMacStylePlugin Plugin:
+#####################################################################
+
+qt_add_plugin(QMacStylePlugin
+    OUTPUT_NAME qmacstyle
+    TYPE styles
+    SOURCES
+        main.mm
+        qmacstyle_mac.mm qmacstyle_mac_p.h
+        qmacstyle_mac_p_p.h
+    LIBRARIES
+        ${FWAppKit}
+    PUBLIC_LIBRARIES
+        Qt::Core
+        Qt::Gui
+        Qt::WidgetsPrivate
+)
+
+#### Keys ignored in scope 1:.:.:mac.pro:<TRUE>:
+# DISTFILES = "macstyle.json"
diff --git a/src/plugins/styles/mac/qmacstyle_mac.mm b/src/plugins/styles/mac/qmacstyle_mac.mm
index a5ab8eeb17..e2599e8c6b 100644
--- a/src/plugins/styles/mac/qmacstyle_mac.mm
+++ b/src/plugins/styles/mac/qmacstyle_mac.mm
@@ -3262,7 +3262,7 @@ void QMacStyle::drawPrimitive(PrimitiveElement pe, const QStyleOption *opt, QPai
 
         CGContextRestoreGState(cg);
         break; }
-    case PE_IndicatorViewItemCheck:
+    case PE_IndicatorItemViewItemCheck:
     case PE_IndicatorRadioButton:
     case PE_IndicatorCheckBox: {
         const bool isEnabled = opt->state & State_Enabled;
diff --git a/src/plugins/styles/windowsvista/CMakeLists.txt b/src/plugins/styles/windowsvista/CMakeLists.txt
new file mode 100644
index 0000000000..008fa624fe
--- /dev/null
+++ b/src/plugins/styles/windowsvista/CMakeLists.txt
@@ -0,0 +1,27 @@
+# Generated from windowsvista.pro.
+
+#####################################################################
+## QWindowsVistaStylePlugin Plugin:
+#####################################################################
+
+qt_add_plugin(QWindowsVistaStylePlugin
+    OUTPUT_NAME qwindowsvistastyle
+    TYPE styles
+    SOURCES
+        main.cpp
+        qwindowsvistastyle.cpp qwindowsvistastyle_p.h
+        qwindowsvistastyle_p_p.h
+        qwindowsxpstyle.cpp qwindowsxpstyle_p.h
+        qwindowsxpstyle_p_p.h
+    LIBRARIES
+        gdi32
+        user32
+        uxtheme
+    PUBLIC_LIBRARIES
+        Qt::Core
+        Qt::Gui
+        Qt::WidgetsPrivate
+)
+
+#### Keys ignored in scope 1:.:.:windowsvista.pro:<TRUE>:
+# DISTFILES = "windowsvistastyle.json"