diff options
| author | Alexandru Croitor <alexandru.croitor@qt.io> | 2019-05-17 15:42:34 +0200 |
|---|---|---|
| committer | Alexandru Croitor <alexandru.croitor@qt.io> | 2019-05-20 09:35:19 +0000 |
| commit | 7f68437296e1dc1e2008a15b0a41b1685b764f18 (patch) | |
| tree | e142a02165625d8d1271bef1bf2b3b4eb5c223a1 /src/widgets/CMakeLists.txt | |
| parent | a701be565272ecd7c6b07197ac3cecb22a63538e (diff) | |
Regenerate widgets
And add the first version of the .prev file.
Change-Id: I901c413997dcc497da5e45b1675726180c84e709
Reviewed-by: Tobias Hunger <tobias.hunger@qt.io>
Diffstat (limited to 'src/widgets/CMakeLists.txt')
| -rw-r--r-- | src/widgets/CMakeLists.txt | 41 |
1 files changed, 22 insertions, 19 deletions
diff --git a/src/widgets/CMakeLists.txt b/src/widgets/CMakeLists.txt index d73dc8789d..83400dc82a 100644 --- a/src/widgets/CMakeLists.txt +++ b/src/widgets/CMakeLists.txt @@ -39,7 +39,6 @@ add_qt_module(Widgets styles/qpixmapstyle_p_p.h styles/qproxystyle.cpp styles/qproxystyle.h styles/qproxystyle_p.h styles/qstyle.cpp styles/qstyle.h - styles/qstyleanimation.cpp styles/qstyleanimation_p.h styles/qstylefactory.cpp styles/qstylefactory.h styles/qstylehelper.cpp styles/qstylehelper_p.h styles/qstyleoption.cpp styles/qstyleoption.h @@ -63,15 +62,6 @@ add_qt_module(Widgets PUBLIC_LIBRARIES Qt::Core Qt::Gui - # CONFIG = "$$MODULE_CONFIG" "qt_tracepoints" - # KERNEL_P = "kernel" - # MODULE_CONFIG = "uic" - # MODULE_PLUGIN_TYPES = "styles" - # PRECOMPILED_HEADER = "kernel/qt_widgets_pch.h" - # QMAKE_DYNAMIC_LIST_FILE = "$$PWD/QtWidgets.dynlist" - # QMAKE_LIBS = "$$QMAKE_LIBS_GUI" - # TRACEPOINT_PROVIDER = "$$PWD/qtwidgets.tracepoints" - # _LOADED = "qt_module" ) add_dependencies(Widgets ${QT_CMAKE_EXPORT_NAMESPACE}::uic) # special case @@ -263,10 +253,18 @@ add_qt_resource(Widgets "qstyle1" PREFIX "/qt-project.org/styles/macstyle" BASE images/toolbar-ext-macstyle@2x.png) +#### Keys ignored in scope 1:.:.:widgets.pro:<TRUE>: +# CONFIG = "$$MODULE_CONFIG" "qt_tracepoints" +# MODULE_CONFIG = "uic" +# MODULE_PLUGIN_TYPES = "styles" +# QMAKE_DYNAMIC_LIST_FILE = "$$PWD/QtWidgets.dynlist" +# QMAKE_LIBS = "$$QMAKE_LIBS_GUI" +# _LOADED = "qt_module" + ## Scopes: ##################################################################### -extend_target(Widgets CONDITION MSVC AND (TEST_architecture_arch STREQUAL "i386") +extend_target(Widgets CONDITION MSVC AND (TEST_architecture_arch STREQUAL "i386") LINK_OPTIONS "/BASE:0x65000000" ) @@ -291,9 +289,9 @@ extend_target(Widgets CONDITION WIN32 extend_target(Widgets CONDITION WIN32 AND NOT WINRT LIBRARIES + dwmapi shell32 uxtheme - dwmapi ) extend_target(Widgets CONDITION QT_FEATURE_graphicseffect @@ -301,10 +299,9 @@ extend_target(Widgets CONDITION QT_FEATURE_graphicseffect effects/qgraphicseffect.cpp effects/qgraphicseffect.h effects/qgraphicseffect_p.h effects/qpixmapfilter.cpp effects/qpixmapfilter_p.h ) -# -#extend_target(Widgets CONDITION testcocoon -# # _LOADED = "testcocoon" -#) + +#### Keys ignored in scope 6:.:.:widgets.pro:testcocoon: +# _LOADED = "testcocoon" extend_target(Widgets CONDITION QT_FEATURE_opengl SOURCES @@ -321,6 +318,11 @@ extend_target(Widgets CONDITION QT_FEATURE_whatsthis kernel/qwhatsthis.cpp kernel/qwhatsthis.h ) +extend_target(Widgets CONDITION QT_FEATURE_animation + SOURCES + styles/qstyleanimation.cpp styles/qstyleanimation_p.h +) + extend_target(Widgets CONDITION QT_FEATURE_style_windows SOURCES styles/qwindowsstyle.cpp styles/qwindowsstyle_p.h @@ -787,6 +789,7 @@ extend_target(Widgets CONDITION QT_FEATURE_qeventtransition ) -qt_create_tracepoints(Widgets ./qtwidgets.tracepoints) - -add_qt_docs(./doc/qtwidgets.qdocconf) +qt_create_tracepoints(Widgets qtwidgets.tracepoints) +add_qt_docs( + doc/qtwidgets.qdocconf +) |