From 7fbf8f5edc4c582418988828d5574222e9fd8c91 Mon Sep 17 00:00:00 2001
From: Davide Pesavento <pesa@gentoo.org>
Date: Sun, 23 Jun 2019 01:15:05 +0200
Subject: Respect QMAKE_LFLAGS set by the user

Change-Id: If0b411c734ddbb357843d6513a36a70d5c09a6fb
Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>
---
 src/lib/library.pri | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'src')

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 {
-- 
cgit v1.2.3


From 2ccf486ae72c862c9a2b38fddff8d1e43a2a7ea6 Mon Sep 17 00:00:00 2001
From: Christian Kandeler <christian.kandeler@qt.io>
Date: Thu, 27 Jun 2019 17:18:01 +0200
Subject: Add sanity check to socket launcher

As far as I can see, this shouldn't happen, but let's prevent a crash at
least in case it does.

Task-number: QTCREATORBUG-22539
Change-Id: I4bd36364ca3f8bb8cdbe445e5b14037758b1e1fc
Reviewed-by: Qbs CI Bot <travis-bot@weickelt.de>
Reviewed-by: Mitch Curtis <mitch.curtis@qt.io>
---
 src/lib/corelib/tools/launchersocket.cpp | 1 +
 1 file changed, 1 insertion(+)

(limited to 'src')

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);
-- 
cgit v1.2.3


From ddfa9a70ad02bc94d3178912b520b86506f9c08c Mon Sep 17 00:00:00 2001
From: hjk <hjk@qt.io>
Date: Wed, 26 Jun 2019 09:21:00 +0200
Subject: Adapt to upstream introduction of std::hash<QString>

Change-Id: If6671dd7c7a68ac3e1728fcb1790e6abf7c0b019
Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>
---
 src/lib/corelib/tools/qttools.h | 2 ++
 1 file changed, 2 insertions(+)

(limited to 'src')

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>>
 {
-- 
cgit v1.2.3