feedc0de/qt-creator
1
0
Fork 0
forked from qt-creator/qt-creator
Code Pull Requests Activity

Clang 10 build fix

Browse Source 
Qt Creator 4.13's code model and Clang 10 compiler complain like:

error: constexpr variable 'LocalSocketErrorFunction' must be initialized
by a constant expression

Change-Id: I9c0160823f9f3708253ebea398caae680eacab11
Reviewed-by: Alessandro Portale <alessandro.portale@qt.io>
This commit is contained in:
Cristian Adam
2020-09-10 11:39:00 +02:00
parent b6e4c9e133
commit b9445d5627
5 changed files with 5 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
share/qtcreator/qml/qmlpuppet/instances/nodeinstanceclientproxy.cpp
View File

@@ -77,7 +77,7 @@
namespace QmlDesigner { namespace QmlDesigner {
constexpr void (QLocalSocket::*LocalSocketErrorFunction)(QLocalSocket::LocalSocketError) void (QLocalSocket::*LocalSocketErrorFunction)(QLocalSocket::LocalSocketError)
#if QT_VERSION < QT_VERSION_CHECK(5, 15, 0) #if QT_VERSION < QT_VERSION_CHECK(5, 15, 0)
= &QLocalSocket::error; = &QLocalSocket::error;
#else #else

2
src/libs/clangsupport/connectionclient.cpp
View File

@@ -324,7 +324,7 @@ void ConnectionClient::connectStandardOutputAndError(QProcess *process) const
void ConnectionClient::connectLocalSocketError() const void ConnectionClient::connectLocalSocketError() const
{ {
constexpr void (QLocalSocket::*LocalSocketErrorFunction)(QLocalSocket::LocalSocketError) void (QLocalSocket::*LocalSocketErrorFunction)(QLocalSocket::LocalSocketError)
#if QT_VERSION < QT_VERSION_CHECK(5, 15, 0) #if QT_VERSION < QT_VERSION_CHECK(5, 15, 0)
= &QLocalSocket::error; = &QLocalSocket::error;
#else #else

2
src/libs/clangsupport/connectionserver.h
View File

@@ -81,7 +81,7 @@ public:
private: private:
void connectToLocalServer(const QString &connectionName) void connectToLocalServer(const QString &connectionName)
{ {
constexpr void (QLocalSocket::*LocalSocketErrorFunction)(QLocalSocket::LocalSocketError) void (QLocalSocket::*LocalSocketErrorFunction)(QLocalSocket::LocalSocketError)
#if QT_VERSION < QT_VERSION_CHECK(5, 15, 0) #if QT_VERSION < QT_VERSION_CHECK(5, 15, 0)
= &QLocalSocket::error; = &QLocalSocket::error;
#else #else

2
src/libs/qmldebug/qmldebugconnection.cpp
View File

@@ -392,7 +392,7 @@ void QmlDebugConnection::newConnection()
connect(socket, &QLocalSocket::disconnected, this, &QmlDebugConnection::socketDisconnected, connect(socket, &QLocalSocket::disconnected, this, &QmlDebugConnection::socketDisconnected,
Qt::QueuedConnection); Qt::QueuedConnection);
constexpr void (QLocalSocket::*LocalSocketErrorFunction)(QLocalSocket::LocalSocketError) void (QLocalSocket::*LocalSocketErrorFunction)(QLocalSocket::LocalSocketError)
#if QT_VERSION < QT_VERSION_CHECK(5, 15, 0) #if QT_VERSION < QT_VERSION_CHECK(5, 15, 0)
= &QLocalSocket::error; = &QLocalSocket::error;
#else #else

2
src/plugins/boot2qt/device-detection/qdbwatcher.cpp
View File

@@ -62,7 +62,7 @@ void QdbWatcher::start(RequestType requestType)
void QdbWatcher::startPrivate() void QdbWatcher::startPrivate()
{ {
constexpr void (QLocalSocket::*LocalSocketErrorFunction)(QLocalSocket::LocalSocketError) void (QLocalSocket::*LocalSocketErrorFunction)(QLocalSocket::LocalSocketError)
#if QT_VERSION < QT_VERSION_CHECK(5, 15, 0) #if QT_VERSION < QT_VERSION_CHECK(5, 15, 0)
= &QLocalSocket::error; = &QLocalSocket::error;
#else #else