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/corelib/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/corelib/configure.cmake')
| -rw-r--r-- | src/corelib/configure.cmake | 23 |
1 files changed, 22 insertions, 1 deletions
diff --git a/src/corelib/configure.cmake b/src/corelib/configure.cmake index 42ebab7773..631958b2d7 100644 --- a/src/corelib/configure.cmake +++ b/src/corelib/configure.cmake @@ -822,11 +822,16 @@ qt_feature("big_codecs" PUBLIC CONDITION QT_FEATURE_textcodec ) qt_feature_definition("big_codecs" "QT_NO_BIG_CODECS" NEGATE VALUE "1") +qt_feature("easingcurve" PUBLIC + SECTION "Utilities" + LABEL "Easing curve" + PURPOSE "Provides easing curve." +) qt_feature("animation" PUBLIC SECTION "Utilities" LABEL "Animation" PURPOSE "Provides a framework for animations." - CONDITION QT_FEATURE_properties + CONDITION QT_FEATURE_properties AND QT_FEATURE_easingcurve ) qt_feature_definition("animation" "QT_NO_ANIMATION" NEGATE VALUE "1") qt_feature("statemachine" PUBLIC @@ -851,6 +856,22 @@ qt_feature("sha3_fast" PRIVATE LABEL "Speed optimized SHA3" PURPOSE "Optimizes SHA3 for speed instead of size." ) +qt_feature("jalalicalendar" PUBLIC + SECTION "Utilities" + LABEL "QJalaliCalendar" + PURPOSE "Support the Jalali (Persian) calendar" +) +qt_feature("hijricalendar" PRIVATE + SECTION "Utilities" + LABEL "QHijriCalendar" + PURPOSE "Generic basis for Islamic calendars, providing shared locale data" +) +qt_feature("islamiccivilcalendar" PUBLIC + SECTION "Utilities" + LABEL "QIslamicCivilCalendar" + PURPOSE "Support the Islamic Civil calendar" + CONDITION QT_FEATURE_hijricalendar +) qt_feature("timezone" PUBLIC SECTION "Utilities" LABEL "QTimeZone" |