Merge branch 'lighthouse' of scm.dev.nokia.troll.no:qt/qt-lighthouse into lighthouse

6 files changed, 33 insertions, 2 deletions

diff --git a/src/gui/kernel/qwidget_lite.cpp b/src/gui/kernel/qwidget_lite.cpp
index 5a629c0c34..8601855bf4 100644
--- a/src/gui/kernel/qwidget_lite.cpp
+++ b/src/gui/kernel/qwidget_lite.cpp
@@ -187,8 +187,13 @@ void QWidgetPrivate::updateCursor() const
 
 void QWidgetPrivate::setWindowTitle_sys(const QString &caption)
 {
-    Q_UNUSED(caption);
-    // XXX
+    Q_Q(QWidget);
+    if (!q->isWindow())
+        return;
+
+    if (QWindowSurface *surface = q->windowSurface())
+        surface->setWindowTitle(caption);
+
 }
 
 void QWidgetPrivate::setWindowIcon_sys(bool /*forceReset*/)
diff --git a/src/gui/painting/qwindowsurface_p.h b/src/gui/painting/qwindowsurface_p.h
index 5e95d80842..1c0334c866 100644
--- a/src/gui/painting/qwindowsurface_p.h
+++ b/src/gui/painting/qwindowsurface_p.h
@@ -95,6 +95,7 @@ public:
     virtual Qt::WindowFlags windowFlags() const;
     virtual WId winId() const;
 
+    virtual void setWindowTitle(const QString &) {}
     virtual void raise() { qWarning("This plugin does not support raise()"); }
     virtual void lower() { qWarning("This plugin does not support lower()"); }
 #endif
diff --git a/src/plugins/graphicssystems/testlite/qwindowsurface_testlite.cpp b/src/plugins/graphicssystems/testlite/qwindowsurface_testlite.cpp
index 495b572464..13dbae1649 100644
--- a/src/plugins/graphicssystems/testlite/qwindowsurface_testlite.cpp
+++ b/src/plugins/graphicssystems/testlite/qwindowsurface_testlite.cpp
@@ -590,6 +590,10 @@ void QTestLiteWindowSurface::lower()
     XLowerWindow(mGraphicsSystem->xd->display, window);
 }
 
+void QTestLiteWindowSurface::setWindowTitle(const QString &title)
+{
+    xw->setWindowTitle(title);
+}
 
 void QTestLiteWindowSurface::setCursor(Qt::CursorShape shape)
 {
diff --git a/src/plugins/graphicssystems/testlite/qwindowsurface_testlite.h b/src/plugins/graphicssystems/testlite/qwindowsurface_testlite.h
index cedd66c87f..43d1b233b2 100644
--- a/src/plugins/graphicssystems/testlite/qwindowsurface_testlite.h
+++ b/src/plugins/graphicssystems/testlite/qwindowsurface_testlite.h
@@ -81,6 +81,7 @@ public:
     WId winId() const;
     void raise();
     void lower();
+    void setWindowTitle(const QString &title);
 
     void setCursor(Qt::CursorShape shape);
 
diff --git a/src/plugins/graphicssystems/testlite/x11util.cpp b/src/plugins/graphicssystems/testlite/x11util.cpp
index e2fbd62fe5..8c0b6c1669 100644
--- a/src/plugins/graphicssystems/testlite/x11util.cpp
+++ b/src/plugins/graphicssystems/testlite/x11util.cpp
@@ -397,6 +397,24 @@ MyWindow::MyWindow(MyDisplay *display, int x, int y, int w, int h)
 			   wmProtocolsAtom,
 			   XA_ATOM, 32, PropModeAppend,
 			   (unsigned char *) &wmDeleteWindowAtom, 1);
+
+
+    setWindowTitle(QLatin1String("Qt Lighthouse"));
+
+}
+
+
+void MyWindow::setWindowTitle(const QString &title)
+
+{
+    QByteArray ba = title.toLatin1(); //We're not making a general solution here...
+    XTextProperty windowName;
+    windowName.value    = (unsigned char *)ba.constData();
+    windowName.encoding = XA_STRING;
+    windowName.format   = 8;
+    windowName.nitems   = ba.length();
+
+    XSetWMName(xd->display, window, &windowName);
 }
 
 MyWindow::~MyWindow()
diff --git a/src/plugins/graphicssystems/testlite/x11util.h b/src/plugins/graphicssystems/testlite/x11util.h
index e9d4c7b678..fc88297f1b 100644
--- a/src/plugins/graphicssystems/testlite/x11util.h
+++ b/src/plugins/graphicssystems/testlite/x11util.h
@@ -111,6 +111,8 @@ public:
     void setVisible(bool visible);
     void setCursorShape(int cshape);
 
+    void setWindowTitle(const QString &title);
+
 public: //###
 
     int xpos, ypos;