diff options
Diffstat (limited to 'src/corelib')
| -rw-r--r-- | src/corelib/kernel/qbasictimer.cpp | 2 | ||||
| -rw-r--r-- | src/corelib/mimetypes/qmimetype.h | 2 |
2 files changed, 3 insertions, 1 deletions
diff --git a/src/corelib/kernel/qbasictimer.cpp b/src/corelib/kernel/qbasictimer.cpp index b16833b34c..ea8f8e2c77 100644 --- a/src/corelib/kernel/qbasictimer.cpp +++ b/src/corelib/kernel/qbasictimer.cpp @@ -105,6 +105,7 @@ QT_BEGIN_NAMESPACE \sa stop(), isActive(), swap() */ +#if QT_DEPRECATED_SINCE(5, 14) #if QT_VERSION < QT_VERSION_CHECK(6, 0, 0) /*! \internal @@ -125,6 +126,7 @@ QBasicTimer &QBasicTimer::operator=(const QBasicTimer &other) return *this; } #endif +#endif /*! \fn QBasicTimer::~QBasicTimer() diff --git a/src/corelib/mimetypes/qmimetype.h b/src/corelib/mimetypes/qmimetype.h index 6d6f9eb488..df1b60f2ce 100644 --- a/src/corelib/mimetypes/qmimetype.h +++ b/src/corelib/mimetypes/qmimetype.h @@ -48,11 +48,11 @@ QT_REQUIRE_CONFIG(mimetype); #include <QtCore/qobjectdefs.h> #include <QtCore/qshareddata.h> #include <QtCore/qstring.h> +#include <QtCore/qstringlist.h> QT_BEGIN_NAMESPACE class QMimeTypePrivate; -class QStringList; class QMimeType; Q_CORE_EXPORT uint qHash(const QMimeType &key, uint seed = 0) noexcept; |