summaryrefslogtreecommitdiffstats
path: root/src/corelib/compat/removed_api.cpp
diff options
context:
space:
mode:
Diffstat (limited to 'src/corelib/compat/removed_api.cpp')
-rw-r--r--src/corelib/compat/removed_api.cpp21
1 files changed, 3 insertions, 18 deletions
diff --git a/src/corelib/compat/removed_api.cpp b/src/corelib/compat/removed_api.cpp
index dec623d3ff..adf59111dd 100644
--- a/src/corelib/compat/removed_api.cpp
+++ b/src/corelib/compat/removed_api.cpp
@@ -173,24 +173,6 @@ QCalendar::QCalendar(QLatin1StringView name)
#include "qcollator.h" // inline function compare(ptr, n, ptr, n) (for MSVC)
-#if QT_CONFIG(future)
-
-#include "qfutureinterface.h"
-#include "private/qfutureinterface_p.h"
-
-void QFutureInterfaceBase::cleanContinuation()
-{
- if (!d)
- return;
-
- // This was called when the associated QPromise was being destroyed,
- // but isn't used anymore.
- QMutexLocker lock(&d->continuationMutex);
- d->continuation = nullptr;
-}
-
-#endif // QT_CONFIG(future)
-
#include "qhashfunctions.h"
size_t qHash(const QByteArray &key, size_t seed) noexcept
@@ -212,6 +194,8 @@ void QObject::setObjectName(const QString &name)
#include "qlocale.h" // uses QT_CORE_INLINE_SINCE
+#if QT_CONFIG(settings)
+
#include "qsettings.h"
void QSettings::beginGroup(const QString &prefix)
@@ -254,6 +238,7 @@ QVariant QSettings::value(const QString &key) const
return value(qToAnyStringViewIgnoringNull(key));
}
+#endif // QT_CONFIG(settings)
#include "qversionnumber.h"