diff options
| author | Alexandru Croitor <alexandru.croitor@qt.io> | 2019-10-10 16:50:25 +0200 |
|---|---|---|
| committer | Alexandru Croitor <alexandru.croitor@qt.io> | 2019-10-14 08:49:24 +0000 |
| commit | b6e75ff3eaccc4f0322c9735533a1f3435597eba (patch) | |
| tree | e42f8adad0259624fa6f17713074265ebf16928d /src/widgets/CMakeLists.txt | |
| parent | eba59bfd14d0ea29f36e80be81137d26cc67e23a (diff) | |
Regenerate qtbase after wip/qt6 -> wip/cmake merge
Note that android builds will be broken after this merge and
regeneration, because we don't currently handle the minimum required
changes that were brought in with the Android multi ABI support
that comes from 5.14.
This will have to be addressed in a separate change.
For now the build on Android will fail while compiling due to incorrect
generation of LIB_SUFFIX with QT_ARCH.
Change-Id: Ia4a871f4b7ddd0da11caf5f34e10a599a97bb55d
Reviewed-by: Simon Hausmann <simon.hausmann@qt.io>
Reviewed-by: Qt CMake Build Bot
Diffstat (limited to 'src/widgets/CMakeLists.txt')
| -rw-r--r-- | src/widgets/CMakeLists.txt | 13 |
1 files changed, 6 insertions, 7 deletions
diff --git a/src/widgets/CMakeLists.txt b/src/widgets/CMakeLists.txt index 1359f637fd..4ca3a70241 100644 --- a/src/widgets/CMakeLists.txt +++ b/src/widgets/CMakeLists.txt @@ -29,7 +29,7 @@ add_qt_module(Widgets kernel/qtwidgetsglobal.h kernel/qtwidgetsglobal_p.h kernel/qwidget.cpp kernel/qwidget.h kernel/qwidget_p.h kernel/qwidgetaction.cpp kernel/qwidgetaction.h kernel/qwidgetaction_p.h - kernel/qwidgetbackingstore.cpp kernel/qwidgetbackingstore_p.h + kernel/qwidgetrepaintmanager.cpp kernel/qwidgetrepaintmanager_p.h kernel/qwidgetsvariant.cpp kernel/qwidgetwindow.cpp kernel/qwidgetwindow_p.h kernel/qwindowcontainer.cpp kernel/qwindowcontainer_p.h @@ -296,11 +296,6 @@ extend_target(Widgets CONDITION MSVC AND (TEST_architecture_arch STREQUAL "i386" "/BASE:0x65000000" ) -extend_target(Widgets CONDITION APPLE - SOURCES - util/qscroller_mac.mm -) - extend_target(Widgets CONDITION APPLE_OSX SOURCES kernel/qmacgesturerecognizer.cpp kernel/qmacgesturerecognizer_p.h @@ -768,7 +763,6 @@ extend_target(Widgets CONDITION QT_FEATURE_graphicsview graphicsview/qgraphicsgridlayout.cpp graphicsview/qgraphicsgridlayout.h graphicsview/qgraphicsgridlayoutengine.cpp graphicsview/qgraphicsgridlayoutengine_p.h graphicsview/qgraphicsitem.cpp graphicsview/qgraphicsitem.h graphicsview/qgraphicsitem_p.h - graphicsview/qgraphicsitemanimation.cpp graphicsview/qgraphicsitemanimation.h graphicsview/qgraphicslayout.cpp graphicsview/qgraphicslayout.h graphicsview/qgraphicslayout_p.cpp graphicsview/qgraphicslayout_p.h graphicsview/qgraphicslayoutitem.cpp graphicsview/qgraphicslayoutitem.h graphicsview/qgraphicslayoutitem_p.h graphicsview/qgraphicslayoutstyleinfo.cpp graphicsview/qgraphicslayoutstyleinfo_p.h @@ -786,6 +780,11 @@ extend_target(Widgets CONDITION QT_FEATURE_graphicsview graphicsview/qsimplex_p.cpp graphicsview/qsimplex_p.h ) +extend_target(Widgets CONDITION QT_FEATURE_easingcurve AND QT_FEATURE_graphicsview + SOURCES + graphicsview/qgraphicsitemanimation.cpp graphicsview/qgraphicsitemanimation.h +) + extend_target(Widgets CONDITION QT_FEATURE_completer SOURCES util/qcompleter.cpp util/qcompleter.h util/qcompleter_p.h |