1berry/qtbase
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

QLocalSocket: fix inclusions in namespaced builds

Browse Source 
An include statement appeared after opening the Qt namespace, thus
injecting symbols in there. Move it outside.

Change-Id: I8e95e821b36ad4e4ceed5b0645bf8ebf7e531e06
Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
(cherry picked from commit 99e95a2cc6ddec5ebd7f69489811be2e9aef98b9)
Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
This commit is contained in:
Giuseppe D'Angelo 2021-04-28 23:45:07 +02:00 committed by Qt Cherry-pick Bot
parent 363c407587
commit 81c6597fc3
1 changed files with 4 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
src/network/socket/qlocalsocket.h
View File

@ -44,6 +44,10 @@
#include <QtCore/qiodevice.h> #include <QtCore/qiodevice.h>
#include <QtNetwork/qabstractsocket.h> #include <QtNetwork/qabstractsocket.h>
#ifndef QT_NO_DEBUG_STREAM
#include <QtCore/qdebug.h>
#endif
QT_REQUIRE_CONFIG(localserver); QT_REQUIRE_CONFIG(localserver);
QT_BEGIN_NAMESPACE QT_BEGIN_NAMESPACE
@ -143,7 +147,6 @@ private:
}; };
#ifndef QT_NO_DEBUG_STREAM #ifndef QT_NO_DEBUG_STREAM
#include <QtCore/qdebug.h>
Q_NETWORK_EXPORT QDebug operator<<(QDebug, QLocalSocket::LocalSocketError); Q_NETWORK_EXPORT QDebug operator<<(QDebug, QLocalSocket::LocalSocketError);
Q_NETWORK_EXPORT QDebug operator<<(QDebug, QLocalSocket::LocalSocketState); Q_NETWORK_EXPORT QDebug operator<<(QDebug, QLocalSocket::LocalSocketState);
#endif #endif