From 6ccde9eec5f89e48195ff6597603278e7ed15a53 Mon Sep 17 00:00:00 2001 From: Alexandru Croitor Date: Mon, 7 Oct 2019 18:36:29 +0200 Subject: Regenerate styles plugins Change-Id: I6b34fec0d6421e7523be0eb235495e6ab9b8df00 Reviewed-by: Simon Hausmann Reviewed-by: Qt CMake Build Bot --- src/plugins/styles/.prev_CMakeLists.txt | 11 +++++++++++ src/plugins/styles/CMakeLists.txt | 8 ++++---- src/plugins/styles/mac/CMakeLists.txt | 4 ++-- 3 files changed, 17 insertions(+), 6 deletions(-) create mode 100644 src/plugins/styles/.prev_CMakeLists.txt (limited to 'src/plugins/styles') 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 index 34248d0a59..31dba001b0 100644 --- a/src/plugins/styles/CMakeLists.txt +++ b/src/plugins/styles/CMakeLists.txt @@ -1,11 +1,11 @@ +# Generated from styles.pro. + if(QT_FEATURE_style_android) -# TODO add_subdirectory(android) + # add_subdirectory(android) # special case TODO endif() - if(QT_FEATURE_style_mac) add_subdirectory(mac) endif() - if(QT_FEATURE_style_windowsvista) -# TODO add_subdirectory(windowsvista) + # add_subdirectory(windowsvista) # special case TODO endif() diff --git a/src/plugins/styles/mac/CMakeLists.txt b/src/plugins/styles/mac/CMakeLists.txt index 0628f28811..2109187b29 100644 --- a/src/plugins/styles/mac/CMakeLists.txt +++ b/src/plugins/styles/mac/CMakeLists.txt @@ -15,11 +15,11 @@ add_qt_plugin(qmacstyle ${FWAppKit} Qt::WidgetsPrivate PUBLIC_LIBRARIES + Qt::Core + Qt::Gui Qt::Widgets ) #### Keys ignored in scope 1:.:.:mac.pro:: # DISTFILES = "macstyle.json" -# PLUGIN_CLASS_NAME = "QMacStylePlugin" -# PLUGIN_TYPE = "styles" # _LOADED = "qt_plugin" -- cgit v1.2.3