Merge remote-tracking branch 'origin/5.8' into dev

Conflicts:
	mkspecs/features/mac/default_post.prf
	mkspecs/features/uikit/default_post.prf

Change-Id: I2a6f783451f2ac9eb4c1a050f605435d2dacf218

1 files changed, 6 insertions, 0 deletions

diff --git a/src/winmain/qtmain_winrt.cpp b/src/winmain/qtmain_winrt.cpp
index e49817ada4..b0e70608f9 100644
--- a/src/winmain/qtmain_winrt.cpp
+++ b/src/winmain/qtmain_winrt.cpp
@@ -110,7 +110,12 @@ static void devMessageHandler(QtMsgType type, const QMessageLogContext &context,
     if (!event)
         event = CreateEventEx(NULL, L"qdebug-event", 0, EVENT_ALL_ACCESS);
 
+    Q_ASSERT_X(shmem, Q_FUNC_INFO, "Could not create file mapping");
+    Q_ASSERT_X(event, Q_FUNC_INFO, "Could not create debug event");
+
     void *data = MapViewOfFileFromApp(shmem, FILE_MAP_WRITE, 0, 4096);
+    Q_ASSERT_X(data, Q_FUNC_INFO, "Could not map file");
+
     memset(data, quint32(type), sizeof(quint32));
     memcpy_s(static_cast<quint32 *>(data) + 1, 4096 - sizeof(quint32),
              message.data(), (message.length() + 1) * sizeof(wchar_t));
@@ -179,6 +184,7 @@ public:
             app->core->Exit();
             return res;
         }, this, CREATE_SUSPENDED, nullptr);
+        Q_ASSERT_X(mainThread, Q_FUNC_INFO, "Could not create Qt main thread");
 
         HRESULT hr;
         ComPtr<Xaml::IApplicationStatics> appStatics;