diff options
| author | Jeremy Katz <jeremy.katz@nokia.com> | 2009-11-27 13:13:51 +0100 |
|---|---|---|
| committer | Jeremy Katz <jeremy.katz@nokia.com> | 2009-11-27 13:13:51 +0100 |
| commit | afc403f3c04c6ef995ed7272b277c0f62c24d5e5 (patch) | |
| tree | 16a55244cf670099017ba7fc49eadd7adc732714 /src/gui | |
| parent | 55fc5c3bbb6c1f7d16f26459f66922af7961642d (diff) | |
| parent | de3fbd3316797e73a67fbd1a0f7191c66ab88233 (diff) | |
Merge branch 'lighthouse' of scm.dev.nokia.troll.no:qt/qt-lighthouse into lighthouse
Diffstat (limited to 'src/gui')
| -rw-r--r-- | src/gui/kernel/qwidget_lite.cpp | 9 | ||||
| -rw-r--r-- | src/gui/painting/qwindowsurface_p.h | 1 |
2 files changed, 8 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 |