Implement QSystemTrayIcon for Windows.

No longer base the implementation on a QWidget which is not
necessary when all that is required is a message window listening
to task-tray messages. Export a service function creating a message
window from the Windows native interface and use that.

Task-number: QTBUG-20978

Change-Id: I01d0faeac777df4eee802c51d2bc722fce814080
Reviewed-by: Friedemann Kleint <Friedemann.Kleint@nokia.com>

1 files changed, 22 insertions, 0 deletions

diff --git a/src/plugins/platforms/windows/qwindowsintegration.cpp b/src/plugins/platforms/windows/qwindowsintegration.cpp
index b43362c045..d03abe1d93 100644
--- a/src/plugins/platforms/windows/qwindowsintegration.cpp
+++ b/src/plugins/platforms/windows/qwindowsintegration.cpp
@@ -84,12 +84,17 @@ QT_BEGIN_NAMESPACE
 
 class QWindowsNativeInterface : public QPlatformNativeInterface
 {
+    Q_OBJECT
 public:
     virtual void *nativeResourceForContext(const QByteArray &resource, QOpenGLContext *context);
     virtual void *nativeResourceForWindow(const QByteArray &resource, QWindow *window);
     virtual void *nativeResourceForBackingStore(const QByteArray &resource, QBackingStore *bs);
     virtual EventFilter setEventFilter(const QByteArray &eventType, EventFilter filter)
         { return QWindowsContext::instance()->setEventFilter(eventType, filter); }
+
+    Q_INVOKABLE void *createMessageWindow(const QString &classNameTemplate,
+                                          const QString &windowName,
+                                          void *eventProc) const;
 };
 
 void *QWindowsNativeInterface::nativeResourceForWindow(const QByteArray &resource, QWindow *window)
@@ -141,6 +146,21 @@ void *QWindowsNativeInterface::nativeResourceForContext(const QByteArray &resour
 }
 
 /*!
+    \brief Creates a non-visible window handle for filtering messages.
+*/
+
+void *QWindowsNativeInterface::createMessageWindow(const QString &classNameTemplate,
+                                                   const QString &windowName,
+                                                   void *eventProc) const
+{
+    QWindowsContext *ctx = QWindowsContext::instance();
+    const HWND hwnd = ctx->createDummyWindow(classNameTemplate,
+                                             (wchar_t*)windowName.utf16(),
+                                             (WNDPROC)eventProc);
+    return hwnd;
+}
+
+/*!
     \class QWindowsIntegration
     \brief QPlatformIntegration implementation for Windows.
     \ingroup qt-lighthouse-win
@@ -347,3 +367,5 @@ QPlatformServices *QWindowsIntegration::services() const
 }
 
 QT_END_NAMESPACE
+
+#include "qwindowsintegration.moc"