diff options
| author | Ivan Solovev <ivan.solovev@qt.io> | 2025-01-07 12:20:45 +0100 |
|---|---|---|
| committer | Ivan Solovev <ivan.solovev@qt.io> | 2025-01-09 15:01:45 +0100 |
| commit | f4523a2a26dc976deaed93493a1285c907ddb3ea (patch) | |
| tree | 10e62c65e891b1056d8b0155538686bbf8ef478a /src/oauth/qoauthhttpserverreplyhandler.cpp | |
| parent | 89235593d5f6dff6c34d68dc2360c9f3996a1650 (diff) | |
QtNetworkAuth: simplify QT_NO_HTTP checks
The module cannot be built without HTTP support, so each and every file
had an `#ifndef QT_NO_HTTP` check.
However, commit d49f744968a237b751f0e520f8a9fff59dc283f5 already
disabled the module build at the toplevel CMakeLists.txt file if the
relevant feature is not found.
As a result, we can drop the checks from the private headers and
the .cpp files and also remove the QtNetwork/qtnetwork-config.h includes
that were added in order to provide access to QT_NO_HTTP definition.
This patch still keeps the QT_NO_HTTP check on public headers, because
it allows the user code like:
#include <QOAuth1> // unconditionally
...
#ifndef QT_NO_HTTP
QOAuth1 oauth;
// use oauth
#endif // QT_NO_HTTP
Pick-to: 6.9 6.8 6.5
Change-Id: I517aa1da90ed53a5fc013d28530aa1d41a946a79
Reviewed-by: Juha Vuolle <juha.vuolle@qt.io>
Reviewed-by: Marc Mutz <marc.mutz@qt.io>
Reviewed-by: Alexandru Croitor <alexandru.croitor@qt.io>
Diffstat (limited to 'src/oauth/qoauthhttpserverreplyhandler.cpp')
| -rw-r--r-- | src/oauth/qoauthhttpserverreplyhandler.cpp | 6 |
1 files changed, 0 insertions, 6 deletions
diff --git a/src/oauth/qoauthhttpserverreplyhandler.cpp b/src/oauth/qoauthhttpserverreplyhandler.cpp index 1bc505e..00191f5 100644 --- a/src/oauth/qoauthhttpserverreplyhandler.cpp +++ b/src/oauth/qoauthhttpserverreplyhandler.cpp @@ -1,10 +1,6 @@ // Copyright (C) 2017 The Qt Company Ltd. // SPDX-License-Identifier: LicenseRef-Qt-Commercial OR GPL-3.0-only -#include <QtNetwork/qtnetwork-config.h> - -#ifndef QT_NO_HTTP - #include <qabstractoauth.h> #include <qoauthhttpserverreplyhandler.h> #include "qabstractoauthreplyhandler_p.h" @@ -667,5 +663,3 @@ bool QOAuthHttpServerReplyHandler::isListening() const QT_END_NAMESPACE #include "moc_qoauthhttpserverreplyhandler.cpp" - -#endif // QT_NO_HTTP |