diff options
| author | Christian Kandeler <christian.kandeler@qt.io> | 2019-07-05 13:46:41 +0200 |
|---|---|---|
| committer | Christian Kandeler <christian.kandeler@qt.io> | 2019-07-05 13:46:41 +0200 |
| commit | 886a98d6137692f89de80aab07278b7c6d9227d8 (patch) | |
| tree | 094ee7dda5babafd7536b0e95c7ae535a62eca74 /src | |
| parent | 590a58c3702de17ba7b44c9041dfe5d3e88bea31 (diff) | |
| parent | 27b78ea67f82fca051666599603273c12ecb403b (diff) | |
Merge 1.14 into master
Change-Id: I2796d53ca36ce90977f0a09ca5db089d8c85bd4e
Diffstat (limited to 'src')
| -rw-r--r-- | src/lib/corelib/tools/launchersocket.cpp | 1 | ||||
| -rw-r--r-- | src/lib/corelib/tools/qttools.h | 2 | ||||
| -rw-r--r-- | src/lib/library.pri | 2 |
3 files changed, 4 insertions, 1 deletions
diff --git a/src/lib/corelib/tools/launchersocket.cpp b/src/lib/corelib/tools/launchersocket.cpp index 948fbca4f..4373b10b8 100644 --- a/src/lib/corelib/tools/launchersocket.cpp +++ b/src/lib/corelib/tools/launchersocket.cpp @@ -135,6 +135,7 @@ void LauncherSocket::handleError(const QString &error) void LauncherSocket::handleRequests() { + QBS_ASSERT(isReady(), return); std::lock_guard<std::mutex> locker(m_requestsMutex); for (const QByteArray &request : qAsConst(m_requests)) m_socket->write(request); diff --git a/src/lib/corelib/tools/qttools.h b/src/lib/corelib/tools/qttools.h index 4cb39527e..b465e3d9e 100644 --- a/src/lib/corelib/tools/qttools.h +++ b/src/lib/corelib/tools/qttools.h @@ -50,9 +50,11 @@ class QProcessEnvironment; QT_END_NAMESPACE namespace std { +#if (QT_VERSION < QT_VERSION_CHECK(5, 14, 0)) template<> struct hash<QString> { std::size_t operator()(const QString &s) const { return qHash(s); } }; +#endif template<typename T1, typename T2> struct hash<std::pair<T1, T2>> { diff --git a/src/lib/library.pri b/src/lib/library.pri index 4ae171c93..11427b097 100644 --- a/src/lib/library.pri +++ b/src/lib/library.pri @@ -32,7 +32,7 @@ VERSION = $${QBS_VERSION} linux { # Turn off absurd qmake's soname "logic" and directly add the linker flag. QMAKE_LFLAGS_SONAME = - QMAKE_LFLAGS = -Wl,-soname=lib$${TARGET}.so.$${QBS_VERSION_MAJ}.$${QBS_VERSION_MIN} + QMAKE_LFLAGS += -Wl,-soname=lib$${TARGET}.so.$${QBS_VERSION_MAJ}.$${QBS_VERSION_MIN} } win32 { |