diff options
author | Eike Ziller <eike.ziller@qt.io> | 2019-06-28 12:50:03 +0200 |
---|---|---|
committer | Eike Ziller <eike.ziller@qt.io> | 2019-06-28 12:50:03 +0200 |
commit | 10098b2508abe6e8df59b7e27ea64e9483f1f8be (patch) | |
tree | b73815f1e8ca7aa12c347706b410050e3eb22caa /src/libs/languageserverprotocol/icontent.h | |
parent | 5dbfd46bcfe177b8308c70a66f7d404429249f6b (diff) | |
parent | a111f251261159b50e92d6866f2058c66b43e390 (diff) | |
download | qt-creator-10098b2508abe6e8df59b7e27ea64e9483f1f8be.tar.gz |
Merge remote-tracking branch 'origin/4.10'
Conflicts:
CMakeLists.txt
tests/unit/unittest/unittest.pro
Change-Id: I64296ad31502d9b35012da129a28e9277e9fcf8e
Diffstat (limited to 'src/libs/languageserverprotocol/icontent.h')
-rw-r--r-- | src/libs/languageserverprotocol/icontent.h | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/src/libs/languageserverprotocol/icontent.h b/src/libs/languageserverprotocol/icontent.h index af14604739..1b57165b2e 100644 --- a/src/libs/languageserverprotocol/icontent.h +++ b/src/libs/languageserverprotocol/icontent.h @@ -92,7 +92,7 @@ using ResponseHandler = std::function<void(const QByteArray &, QTextCodec *)>; using ResponseHandlers = std::function<void(MessageId, const QByteArray &, QTextCodec *)>; using MethodHandler = std::function<void(const QString, MessageId, const IContent *)>; -inline LANGUAGESERVERPROTOCOL_EXPORT uint qHash(const LanguageServerProtocol::MessageId &id) +inline uint qHash(const LanguageServerProtocol::MessageId &id) { if (Utils::holds_alternative<int>(id)) return QT_PREPEND_NAMESPACE(qHash(Utils::get<int>(id))); @@ -102,8 +102,7 @@ inline LANGUAGESERVERPROTOCOL_EXPORT uint qHash(const LanguageServerProtocol::Me } template <typename Error> -inline LANGUAGESERVERPROTOCOL_EXPORT QDebug operator<<(QDebug stream, - const LanguageServerProtocol::MessageId &id) +inline QDebug operator<<(QDebug stream, const LanguageServerProtocol::MessageId &id) { if (Utils::holds_alternative<int>(id)) stream << Utils::get<int>(id); |