diff options
| author | Alexandru Croitor <alexandru.croitor@qt.io> | 2019-11-26 20:09:56 +0100 |
|---|---|---|
| committer | Alexandru Croitor <alexandru.croitor@qt.io> | 2019-11-27 10:38:43 +0000 |
| commit | 2a1fc7b835bc2fc90e129e58a8a9e7831cd3b994 (patch) | |
| tree | b581aaa3075198b465ebbfda3ed5a9b3511d0ac3 /src/network/socket/qabstractsocketengine.cpp | |
| parent | a2fd94f055f98c5f0dd22e740fd54b699f110519 (diff) | |
Fix build of tests in static builds
tests/auto/corelib/kernel/qsocketnotifier includes cpp files from
src/network, and this blows up at the linking step in a static build,
due to duplicate symbols when linking the mocs_compilation of network
and the test.
Include the moc file in the .cpp file as we usually did in other cases,
to prevent duplicate symbols.
Change-Id: I2fb15058cb4477201af7bd053407e20970a947bb
Reviewed-by: Qt CMake Build Bot
Reviewed-by: Leander Beernaert <leander.beernaert@qt.io>
Reviewed-by: Alexandru Croitor <alexandru.croitor@qt.io>
Diffstat (limited to 'src/network/socket/qabstractsocketengine.cpp')
| -rw-r--r-- | src/network/socket/qabstractsocketengine.cpp | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/src/network/socket/qabstractsocketengine.cpp b/src/network/socket/qabstractsocketengine.cpp index 3fffff6d5a..db3a8280bd 100644 --- a/src/network/socket/qabstractsocketengine.cpp +++ b/src/network/socket/qabstractsocketengine.cpp @@ -274,3 +274,5 @@ int QAbstractSocketEngine::outboundStreamCount() const } QT_END_NAMESPACE + +#include "moc_qabstractsocketengine_p.cpp" |