Merge remote-tracking branch 'origin/wip/qt6' into wip/cmake

Change-Id: I3a1d7673c3c20019ab12a2ea0a60f1619920a34c

1 files changed, 10 insertions, 4 deletions

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