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

 Conflicts:
	.qmake.conf

Change-Id: I6596d1a127cc93e53ec30cd881da1810cb8076d5

4 files changed, 24 insertions, 4 deletions

diff --git a/src/client/qwaylanddataoffer.cpp b/src/client/qwaylanddataoffer.cpp
index 35085a7f0..0c732c020 100644
--- a/src/client/qwaylanddataoffer.cpp
+++ b/src/client/qwaylanddataoffer.cpp
@@ -135,7 +135,7 @@ QVariant QWaylandMimeData::retrieveData_sys(const QString &mimeType, QVariant::T
     }
 
     int pipefd[2];
-    if (::pipe2(pipefd, O_CLOEXEC|O_NONBLOCK) == -1) {
+    if (qt_safe_pipe(pipefd, O_NONBLOCK) == -1) {
         qWarning("QWaylandMimeData: pipe2() failed");
         return QVariant();
     }
diff --git a/src/client/qwaylanddataoffer_p.h b/src/client/qwaylanddataoffer_p.h
index 3e88b8f4b..5412400a5 100644
--- a/src/client/qwaylanddataoffer_p.h
+++ b/src/client/qwaylanddataoffer_p.h
@@ -51,7 +51,7 @@
 // We mean it.
 //
 
-#include <QtGui/private/qdnd_p.h>
+#include <QtGui/private/qinternalmimedata_p.h>
 
 #include <QtWaylandClient/private/qtwaylandclientglobal_p.h>
 #include <QtWaylandClient/private/qwayland-wayland.h>
diff --git a/src/client/qwaylandintegration.cpp b/src/client/qwaylandintegration.cpp
index a3ae802ff..e935ef31f 100644
--- a/src/client/qwaylandintegration.cpp
+++ b/src/client/qwaylandintegration.cpp
@@ -52,7 +52,12 @@
 #include "qwaylandwindowmanagerintegration_p.h"
 #include "qwaylandscreen_p.h"
 
-#include <QtFontDatabaseSupport/private/qgenericunixfontdatabase_p.h>
+#if defined(Q_OS_MACOS)
+#  include <QtFontDatabaseSupport/private/qcoretextfontdatabase_p.h>
+#  include <QtFontDatabaseSupport/private/qfontengine_coretext_p.h>
+#else
+#  include <QtFontDatabaseSupport/private/qgenericunixfontdatabase_p.h>
+#endif
 #include <QtEventDispatcherSupport/private/qgenericunixeventdispatcher_p.h>
 #include <QtThemeSupport/private/qgenericunixthemes_p.h>
 
@@ -118,7 +123,11 @@ public:
 };
 
 QWaylandIntegration::QWaylandIntegration()
+#if defined(Q_OS_MACOS)
+    : mFontDb(new QCoreTextFontDatabaseEngineFactory<QCoreTextFontEngine>)
+#else
     : mFontDb(new QGenericUnixFontDatabase())
+#endif
     , mNativeInterface(new QWaylandNativeInterface(this))
 #if QT_CONFIG(accessibility)
     , mAccessibility(new QPlatformAccessibility())
diff --git a/src/client/qwaylandwindow.cpp b/src/client/qwaylandwindow.cpp
index ef49e8ea8..e07133063 100644
--- a/src/client/qwaylandwindow.cpp
+++ b/src/client/qwaylandwindow.cpp
@@ -282,7 +282,18 @@ void QWaylandWindow::setWindowTitle(const QString &title)
 {
     if (mShellSurface) {
         const QString separator = QString::fromUtf8(" \xe2\x80\x94 "); // unicode character U+2014, EM DASH
-        mShellSurface->setTitle(formatWindowTitle(title, separator));
+        const QString formatted = formatWindowTitle(title, separator);
+
+        const int libwaylandMaxBufferSize = 4096;
+        // Some parts of the buffer is used for metadata, so subtract 100 to be on the safe side
+        const int maxLength = libwaylandMaxBufferSize - 100;
+
+        auto truncated = QStringRef(&formatted).left(maxLength);
+        if (truncated.length() < formatted.length()) {
+            qCWarning(lcQpaWayland) << "Window titles longer than" << maxLength << "characters are not supported."
+                                    << "Truncating window title (from" << formatted.length() << "chars)";
+        }
+        mShellSurface->setTitle(truncated.toString());
     }
 
     if (mWindowDecoration && window()->isVisible())