diff options
author | Tasuku Suzuki <tasuku.suzuki@qbc.io> | 2019-07-16 10:31:18 +0900 |
---|---|---|
committer | Tasuku Suzuki <tasuku.suzuki@qbc.io> | 2019-08-16 01:05:02 +0900 |
commit | 37bae591b7829cd8ac6a9c8556bbe6b96b365bc3 (patch) | |
tree | c9a8f19898bc4004b62248b7895a1374c06dae08 /src/corelib/tools | |
parent | d0e7be8b1c77dea752193dfb6df8bf8b467c6560 (diff) |
Introduce a new feature called easingcurve
features.animation and features.scroller depend on the feature.
In total, this saves around 180KB from QtCore and 75KB from QtWidgets.
Change-Id: I65aac3ec4d50d62424ee33f44b99f3cfb91121d6
Reviewed-by: Thomas Hartmann <thomas.hartmann@qt.io>
Reviewed-by: Jan Arve Sæther <jan-arve.saether@qt.io>
Reviewed-by: Edward Welbourne <edward.welbourne@qt.io>
Diffstat (limited to 'src/corelib/tools')
-rw-r--r-- | src/corelib/tools/qeasingcurve.h | 3 | ||||
-rw-r--r-- | src/corelib/tools/qtimeline.h | 4 | ||||
-rw-r--r-- | src/corelib/tools/tools.pri | 14 |
3 files changed, 17 insertions, 4 deletions
diff --git a/src/corelib/tools/qeasingcurve.h b/src/corelib/tools/qeasingcurve.h index 725ddd5dcc..d3a468bb22 100644 --- a/src/corelib/tools/qeasingcurve.h +++ b/src/corelib/tools/qeasingcurve.h @@ -41,6 +41,9 @@ #define QEASINGCURVE_H #include <QtCore/qglobal.h> + +QT_REQUIRE_CONFIG(easingcurve); + #include <QtCore/qobjectdefs.h> #include <QtCore/qvector.h> #if QT_DEPRECATED_SINCE(5, 0) diff --git a/src/corelib/tools/qtimeline.h b/src/corelib/tools/qtimeline.h index d9982bdb58..9a60cd679f 100644 --- a/src/corelib/tools/qtimeline.h +++ b/src/corelib/tools/qtimeline.h @@ -40,6 +40,10 @@ #ifndef QTIMELINE_H #define QTIMELINE_H +#include <QtCore/qglobal.h> + +QT_REQUIRE_CONFIG(easingcurve); + #include <QtCore/qeasingcurve.h> #include <QtCore/qobject.h> diff --git a/src/corelib/tools/tools.pri b/src/corelib/tools/tools.pri index a2236f90f2..40c84157cd 100644 --- a/src/corelib/tools/tools.pri +++ b/src/corelib/tools/tools.pri @@ -12,7 +12,6 @@ HEADERS += \ tools/qcontainerfwd.h \ tools/qcontainertools_impl.h \ tools/qcryptographichash.h \ - tools/qeasingcurve.h \ tools/qfreelist_p.h \ tools/qhash.h \ tools/qhashfunctions.h \ @@ -43,7 +42,6 @@ HEADERS += \ tools/qsimd_p.h \ tools/qsize.h \ tools/qstack.h \ - tools/qtimeline.h \ tools/qtools_p.h \ tools/qvarlengtharray.h \ tools/qvector.h \ @@ -54,7 +52,6 @@ SOURCES += \ tools/qarraydata.cpp \ tools/qbitarray.cpp \ tools/qcryptographichash.cpp \ - tools/qeasingcurve.cpp \ tools/qfreelist.cpp \ tools/qhash.cpp \ tools/qline.cpp \ @@ -72,7 +69,6 @@ SOURCES += \ tools/qsharedpointer.cpp \ tools/qsimd.cpp \ tools/qsize.cpp \ - tools/qtimeline.cpp \ tools/qversionnumber.cpp msvc: NO_PCH_SOURCES += tools/qvector_msvc.cpp @@ -104,6 +100,16 @@ qtConfig(system-doubleconversion) { include($$PWD/../../3rdparty/double-conversion/double-conversion.pri) } +qtConfig(easingcurve) { + HEADERS += \ + tools/qeasingcurve.h \ + tools/qtimeline.h + + SOURCES += \ + tools/qeasingcurve.cpp \ + tools/qtimeline.cpp +} + # Note: libm should be present by default becaue this is C++ unix:!macx-icc:!vxworks:!haiku:!integrity:!wasm: LIBS_PRIVATE += -lm |