7 files changed, 32 insertions, 14 deletions
diff --git a/src/gui/kernel/qplatformintegration.cpp b/src/gui/kernel/qplatformintegration.cpp
index 866ce08a28..2aaa4c8510 100644
--- a/src/gui/kernel/qplatformintegration.cpp
+++ b/src/gui/kernel/qplatformintegration.cpp
@@ -265,7 +265,7 @@ QPlatformServices *QPlatformIntegration::services() const
 bool QPlatformIntegration::hasCapability(Capability cap) const
 {
     return cap == NonFullScreenWindows || cap == NativeWidgets || cap == WindowManagement
-        || cap == TopStackedNativeChildWindows;
+        || cap == TopStackedNativeChildWindows || cap == WindowActivation;
 }
 
 QPlatformPixmap *QPlatformIntegration::createPlatformPixmap(QPlatformPixmap::PixelType type) const
diff --git a/src/gui/kernel/qplatformintegration.h b/src/gui/kernel/qplatformintegration.h
index 37884e1f78..d88f818920 100644
--- a/src/gui/kernel/qplatformintegration.h
+++ b/src/gui/kernel/qplatformintegration.h
@@ -97,6 +97,7 @@ public:
         NonFullScreenWindows,
         NativeWidgets,
         WindowManagement,
+        WindowActivation, // whether requestActivate is supported
         SyncState,
         RasterGLSurface,
         AllGLFunctionsQueryable,
diff --git a/src/gui/text/qfont.cpp b/src/gui/text/qfont.cpp
index 220e89a0c4..c7fff266ad 100644
--- a/src/gui/text/qfont.cpp
+++ b/src/gui/text/qfont.cpp
@@ -1328,7 +1328,7 @@ QFont::StyleHint QFont::styleHint() const
            order to display them correctly. In some writing systems, such as Brahmic scripts, this is
            required in order for the text to be legible, but in e.g. Latin script, it is merely
            a cosmetic feature. The PreferNoShaping flag will disable all such features when they
-           are not required, which will improve performance in most cases.
+           are not required, which will improve performance in most cases (since Qt 5.10).
 
     Any of these may be OR-ed with one of these flags:
 
diff --git a/src/plugins/platforms/cocoa/qnsview.mm b/src/plugins/platforms/cocoa/qnsview.mm
index 21d9d9ee90..028e759ff4 100644
--- a/src/plugins/platforms/cocoa/qnsview.mm
+++ b/src/plugins/platforms/cocoa/qnsview.mm
@@ -1363,6 +1363,7 @@ static QTabletEvent::TabletDevice wacomTabletDevice(NSEvent *theEvent)
     // "isInverted": natural OS X scrolling, inverted from the Qt/other platform/Jens perspective.
     bool isInverted  = [theEvent isDirectionInvertedFromDevice];
 
+    qCDebug(lcQpaCocoaMouse) << "scroll wheel @ window pos" << qt_windowPoint << "delta px" << pixelDelta << "angle" << angleDelta << "phase" << ph << (isInverted ? "inverted" : "");
     QWindowSystemInterface::handleWheelEvent(m_platformWindow->window(), qt_timestamp, qt_windowPoint, qt_screenPoint, pixelDelta, angleDelta, currentWheelModifiers, ph, source, isInverted);
 }
 #endif // QT_CONFIG(wheelevent)
diff --git a/src/plugins/platforms/eglfs/deviceintegration/eglfs_openwfd/qeglfsopenwfdintegration.cpp b/src/plugins/platforms/eglfs/deviceintegration/eglfs_openwfd/qeglfsopenwfdintegration.cpp
index bb176a69d2..738c30c65a 100644
--- a/src/plugins/platforms/eglfs/deviceintegration/eglfs_openwfd/qeglfsopenwfdintegration.cpp
+++ b/src/plugins/platforms/eglfs/deviceintegration/eglfs_openwfd/qeglfsopenwfdintegration.cpp
@@ -46,7 +46,7 @@ QT_BEGIN_NAMESPACE
 
 #define MAX_NUM_OF_WFD_BUFFERS 3
 #define MAX_NUM_OF_WFD_DEVICES 4
-#define MAX_NUM_OF_WFD_PIPELINES 4
+#define MAX_NUM_OF_WFD_PIPELINES 16
 #define MAX_NUM_OF_WFD_PORT_MODES 64
 #define MAX_NUM_OF_WFD_PORTS 4
 
@@ -77,7 +77,17 @@ void QEglFSOpenWFDIntegration::platformInit()
         wfdEnumerateDevices(devIds, numDevs, nullptr);
 
     // Create device
-    mDevice = wfdCreateDevice(WFD_DEFAULT_DEVICE_ID, nullptr);
+    WFDint dev_attribs[3] = {WFD_DEVICE_CLIENT_TYPE,
+                              WFD_CLIENT_ID_CLUSTER,
+                              WFD_NONE};
+
+    bool ok;
+    WFDint clientType = qgetenv("QT_OPENWFD_CLIENT_ID").toInt(&ok, 16);
+
+    if (ok)
+        dev_attribs[1] = clientType;
+
+    mDevice = wfdCreateDevice(WFD_DEFAULT_DEVICE_ID, dev_attribs);
 
     if (WFD_INVALID_HANDLE == mDevice)
         qFatal( "Failed to create wfd device");
@@ -138,9 +148,13 @@ EGLNativeWindowType QEglFSOpenWFDIntegration::createNativeWindow(QPlatformWindow
     WFDint pipelineIds[MAX_NUM_OF_WFD_PIPELINES];
     wfdEnumeratePipelines(mDevice, pipelineIds, numPipelines, nullptr);
 
-    WFDint testId = 0;
-    testId = pipelineIds[0];
-    WFDPipeline pipeline = wfdCreatePipeline(mDevice, testId, nullptr);
+    bool ok;
+    WFDint pipelineId = qgetenv("QT_OPENWFD_PIPELINE_ID").toInt(&ok);
+
+    if (!ok)
+        pipelineId = pipelineIds[0];
+
+    WFDPipeline pipeline = wfdCreatePipeline(mDevice, pipelineId, nullptr);
     if (WFD_INVALID_HANDLE == pipeline)
         qFatal("Failed to create wfd pipeline");
 
diff --git a/src/tools/uic/cpp/cppwriteincludes.cpp b/src/tools/uic/cpp/cppwriteincludes.cpp
index 0ba9d28642..d51fddffea 100644
--- a/src/tools/uic/cpp/cppwriteincludes.cpp
+++ b/src/tools/uic/cpp/cppwriteincludes.cpp
@@ -150,6 +150,8 @@ void WriteIncludes::acceptProperty(DomProperty *node)
         add(QLatin1String("QDate"));
     if (node->kind() == DomProperty::Locale)
         add(QLatin1String("QLocale"));
+    if (node->kind() == DomProperty::IconSet)
+        add(QLatin1String("QIcon"));
     TreeWalker::acceptProperty(node);
 }
 
diff --git a/src/tools/uic/qclass_lib_map.h b/src/tools/uic/qclass_lib_map.h
index 810b326b30..8e1afa0878 100644
--- a/src/tools/uic/qclass_lib_map.h
+++ b/src/tools/uic/qclass_lib_map.h
@@ -628,13 +628,13 @@ QT_CLASS_LIB(QGraphicsRotation, QtWidgets, qgraphicstransform.h)
 QT_CLASS_LIB(QGraphicsView, QtWidgets, qgraphicsview.h)
 QT_CLASS_LIB(QGraphicsWidget, QtWidgets, qgraphicswidget.h)
 QT_CLASS_LIB(QBitmap, QtGui, qbitmap.h)
-QT_CLASS_LIB(QIcon, QtWidgets, qicon.h)
-QT_CLASS_LIB(QIconEngine, QtWidgets, qiconengine.h)
-QT_CLASS_LIB(QIconEngineV2, QtWidgets, qiconengine.h)
-QT_CLASS_LIB(QIconEngineFactoryInterface, QtWidgets, qiconengineplugin.h)
-QT_CLASS_LIB(QIconEnginePlugin, QtWidgets, qiconengineplugin.h)
-QT_CLASS_LIB(QIconEngineFactoryInterfaceV2, QtWidgets, qiconengineplugin.h)
-QT_CLASS_LIB(QIconEnginePluginV2, QtWidgets, qiconengineplugin.h)
+QT_CLASS_LIB(QIcon, QtGui, qicon.h)
+QT_CLASS_LIB(QIconEngine, QtGui, qiconengine.h)
+QT_CLASS_LIB(QIconEngineV2, QtGui, qiconengine.h)
+QT_CLASS_LIB(QIconEngineFactoryInterface, QtGui, qiconengineplugin.h)
+QT_CLASS_LIB(QIconEnginePlugin, QtGui, qiconengineplugin.h)
+QT_CLASS_LIB(QIconEngineFactoryInterfaceV2, QtGui, qiconengineplugin.h)
+QT_CLASS_LIB(QIconEnginePluginV2, QtGui, qiconengineplugin.h)
 QT_CLASS_LIB(QImageTextKeyLang, QtGui, qimage.h)
 QT_CLASS_LIB(QImage, QtGui, qimage.h)
 QT_CLASS_LIB(QImageIOHandler, QtGui, qimageiohandler.h)