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/configure.cmake | |
| 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/configure.cmake')
| -rw-r--r-- | src/widgets/configure.cmake | 7 |
1 files changed, 1 insertions, 6 deletions
diff --git a/src/widgets/configure.cmake b/src/widgets/configure.cmake index 099414ae39..e07d023dad 100644 --- a/src/widgets/configure.cmake +++ b/src/widgets/configure.cmake @@ -342,6 +342,7 @@ qt_feature("scroller" PUBLIC SECTION "Widgets" LABEL "QScroller" PURPOSE "Enables kinetic scrolling for any scrolling widget or graphics item." + CONDITION QT_FEATURE_easingcurve ) qt_feature("graphicsview" PUBLIC SECTION "Widgets" @@ -519,12 +520,6 @@ qt_feature("columnview" PUBLIC CONDITION QT_FEATURE_listview ) qt_feature_definition("columnview" "QT_NO_COLUMNVIEW" NEGATE VALUE "1") -qt_feature("paint_debug" PUBLIC - SECTION "Painting" - LABEL "Painting Debug Utilities" - PURPOSE "Enabled debugging painting with the environment variables QT_FLUSH_UPDATE and QT_FLUSH_PAINT." -) -qt_feature_definition("paint_debug" "QT_NO_PAINT_DEBUG" NEGATE VALUE "1") qt_feature("completer" PUBLIC SECTION "Utilities" LABEL "QCompleter" |