From b9445d5627bcd3d306346d7b7d418362f8f7f509 Mon Sep 17 00:00:00 2001 From: Cristian Adam Date: Thu, 10 Sep 2020 11:39:00 +0200 Subject: [PATCH] Clang 10 build fix 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 --- .../qml/qmlpuppet/instances/nodeinstanceclientproxy.cpp | 2 +- src/libs/clangsupport/connectionclient.cpp | 2 +- src/libs/clangsupport/connectionserver.h | 2 +- src/libs/qmldebug/qmldebugconnection.cpp | 2 +- src/plugins/boot2qt/device-detection/qdbwatcher.cpp | 2 +- 5 files changed, 5 insertions(+), 5 deletions(-) diff --git a/share/qtcreator/qml/qmlpuppet/instances/nodeinstanceclientproxy.cpp b/share/qtcreator/qml/qmlpuppet/instances/nodeinstanceclientproxy.cpp index 1f23d39d7d0..0138fcc9d85 100644 --- a/share/qtcreator/qml/qmlpuppet/instances/nodeinstanceclientproxy.cpp +++ b/share/qtcreator/qml/qmlpuppet/instances/nodeinstanceclientproxy.cpp @@ -77,7 +77,7 @@ namespace QmlDesigner { -constexpr void (QLocalSocket::*LocalSocketErrorFunction)(QLocalSocket::LocalSocketError) +void (QLocalSocket::*LocalSocketErrorFunction)(QLocalSocket::LocalSocketError) #if QT_VERSION < QT_VERSION_CHECK(5, 15, 0) = &QLocalSocket::error; #else diff --git a/src/libs/clangsupport/connectionclient.cpp b/src/libs/clangsupport/connectionclient.cpp index fe74c6ca1dc..ed9f4c53f45 100644 --- a/src/libs/clangsupport/connectionclient.cpp +++ b/src/libs/clangsupport/connectionclient.cpp @@ -324,7 +324,7 @@ void ConnectionClient::connectStandardOutputAndError(QProcess *process) 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) = &QLocalSocket::error; #else diff --git a/src/libs/clangsupport/connectionserver.h b/src/libs/clangsupport/connectionserver.h index 1196459c565..941423b0d15 100644 --- a/src/libs/clangsupport/connectionserver.h +++ b/src/libs/clangsupport/connectionserver.h @@ -81,7 +81,7 @@ public: private: 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) = &QLocalSocket::error; #else diff --git a/src/libs/qmldebug/qmldebugconnection.cpp b/src/libs/qmldebug/qmldebugconnection.cpp index cb31557d108..ad34bdddab1 100644 --- a/src/libs/qmldebug/qmldebugconnection.cpp +++ b/src/libs/qmldebug/qmldebugconnection.cpp @@ -392,7 +392,7 @@ void QmlDebugConnection::newConnection() connect(socket, &QLocalSocket::disconnected, this, &QmlDebugConnection::socketDisconnected, Qt::QueuedConnection); - constexpr void (QLocalSocket::*LocalSocketErrorFunction)(QLocalSocket::LocalSocketError) + void (QLocalSocket::*LocalSocketErrorFunction)(QLocalSocket::LocalSocketError) #if QT_VERSION < QT_VERSION_CHECK(5, 15, 0) = &QLocalSocket::error; #else diff --git a/src/plugins/boot2qt/device-detection/qdbwatcher.cpp b/src/plugins/boot2qt/device-detection/qdbwatcher.cpp index 2435dbaea7f..377c84f21ce 100644 --- a/src/plugins/boot2qt/device-detection/qdbwatcher.cpp +++ b/src/plugins/boot2qt/device-detection/qdbwatcher.cpp @@ -62,7 +62,7 @@ void QdbWatcher::start(RequestType requestType) void QdbWatcher::startPrivate() { - constexpr void (QLocalSocket::*LocalSocketErrorFunction)(QLocalSocket::LocalSocketError) + void (QLocalSocket::*LocalSocketErrorFunction)(QLocalSocket::LocalSocketError) #if QT_VERSION < QT_VERSION_CHECK(5, 15, 0) = &QLocalSocket::error; #else