diff options
| author | Ivan Solovev <ivan.solovev@qt.io> | 2022-08-24 13:46:54 +0200 |
|---|---|---|
| committer | Ivan Solovev <ivan.solovev@qt.io> | 2022-08-31 10:19:47 +0200 |
| commit | e5fa1b1959509a9f8a4096e6c825379c0a12cc66 (patch) | |
| tree | c7fd7d3209c872d4e2cafe85a7a5f51d28484c25 /src/assistant | |
| parent | 000879433a80f85f8535c647b6c9bef997d272c3 (diff) | |
| download | qttools-e5fa1b1959509a9f8a4096e6c825379c0a12cc66.tar.gz | |
Assistant: temporary un-deprecate QHelpEngineCore APIs
That is needed to enable the builds with QT_DISABLE_DEPRECATED_UP_TO.
The APIs were deprecated in Qt 5.13, but the replacing code is not yet
complete.
Fixes: QTBUG-104968
Change-Id: I2f21250d5071b60dc5040ea4e186c66af2939e3c
Reviewed-by: Jarek Kobus <jaroslaw.kobus@qt.io>
Diffstat (limited to 'src/assistant')
| -rw-r--r-- | src/assistant/help/qhelpenginecore.h | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/src/assistant/help/qhelpenginecore.h b/src/assistant/help/qhelpenginecore.h index b2cf19af7..caf02fc16 100644 --- a/src/assistant/help/qhelpenginecore.h +++ b/src/assistant/help/qhelpenginecore.h @@ -50,7 +50,7 @@ public: QStringList registeredDocumentations() const; QByteArray fileData(const QUrl &url) const; -#if QT_DEPRECATED_SINCE(5,13) +// #if QT_DEPRECATED_SINCE(5,13) QStringList customFilters() const; bool removeCustomFilter(const QString &filterName); bool addCustomFilter(const QString &filterName, @@ -66,7 +66,7 @@ public: QList<QUrl> files(const QString namespaceName, const QStringList &filterAttributes, const QString &extensionFilter = QString()); -#endif +// #endif QList<QUrl> files(const QString namespaceName, const QString &filterName, @@ -99,10 +99,10 @@ Q_SIGNALS: void setupFinished(); void warning(const QString &msg); -#if QT_DEPRECATED_SINCE(5,13) +// #if QT_DEPRECATED_SINCE(5,13) void currentFilterChanged(const QString &newFilter); void readersAboutToBeInvalidated(); -#endif +// #endif protected: QHelpEngineCore(QHelpEngineCorePrivate *helpEngineCorePrivate, |