diff options
author | Alexandru Croitor <alexandru.croitor@qt.io> | 2021-04-27 16:23:05 +0200 |
---|---|---|
committer | Alexandru Croitor <alexandru.croitor@qt.io> | 2021-04-27 16:57:29 +0200 |
commit | 72521cc8e9d73514f5b65036965824919462db83 (patch) | |
tree | ee3403180c13a0ffa07c0b91b2a1565d6ce23197 /src/oauth/qoauthhttpserverreplyhandler.cpp | |
parent | b2c103532d606751963aeddaface8e56a84c7198 (diff) |
wasm: Work around compilation failures when FEATURE_http=OFF
Some of the header and source files incorrectly check for QT_NO_HTTP
without including the necessary QtNetwork/qtnetwork-config.h
header. Because CMake's AUTOGEN still runs moc on those files and then
includes them into mocs_compilation.cpp, this causes compilation
failures.
Work around the compilation failures by including the moc files
directly in the respective cpp files.
Note that this ensures archiving works in a static build, but results
in a an unusable library. This was the case for Qt 5.15 as well.
A follow up change will be done to clean up this state, but for now
this change unblocks adding the WebAssembly platform into CI.
Task-number: QTBUG-78647
Task-number: QTBUG-93243
Change-Id: I9b6657d5ae539fdb09a741637cc5a19e652c9272
Reviewed-by: Joerg Bornemann <joerg.bornemann@qt.io>
Diffstat (limited to 'src/oauth/qoauthhttpserverreplyhandler.cpp')
-rw-r--r-- | src/oauth/qoauthhttpserverreplyhandler.cpp | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/src/oauth/qoauthhttpserverreplyhandler.cpp b/src/oauth/qoauthhttpserverreplyhandler.cpp index 8f56c3f..f1a555a 100644 --- a/src/oauth/qoauthhttpserverreplyhandler.cpp +++ b/src/oauth/qoauthhttpserverreplyhandler.cpp @@ -339,4 +339,6 @@ bool QOAuthHttpServerReplyHandler::isListening() const QT_END_NAMESPACE +#include "moc_qoauthhttpserverreplyhandler.cpp" + #endif // QT_NO_HTTP |