1berry/qtbase
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Add missing notify signal for the QWindow::title property

Browse Source 
Similary to QWidget's windowTitleChanged, QWindow should also have a
windowTitleChanges signal that's emitted when the title changed and declared
as notify signal for the title property, so that QML bindings can be written
against it.

Change-Id: I6f107c6f0b43d6a959bc2ef96492e1f3e4c28bfe
Reviewed-by: Paul Olav Tvete <paul.tvete@digia.com>
This commit is contained in:
Simon Hausmann 2014-02-27 14:12:39 +01:00 committed by The Qt Project
parent 01a1f87368
commit d2cb81f8d9
2 changed files with 9 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
src/gui/kernel/qwindow.cpp
View File

@ -727,9 +727,15 @@ Qt::WindowType QWindow::type() const
void QWindow::setTitle(const QString &title) void QWindow::setTitle(const QString &title)
{ {
Q_D(QWindow); Q_D(QWindow);
d->windowTitle = title; bool changed = false;
if (d->windowTitle != title) {
d->windowTitle = title;
changed = true;
}
if (d->platformWindow) if (d->platformWindow)
d->platformWindow->setWindowTitle(title); d->platformWindow->setWindowTitle(title);
if (changed)
emit windowTitleChanged(title);
} }
QString QWindow::title() const QString QWindow::title() const

3
src/gui/kernel/qwindow.h
View File

@ -103,7 +103,7 @@ class Q_GUI_EXPORT QWindow : public QObject, public QSurface
// C++ properties in qwindow.cpp AND as QML properties in qquickwindow.cpp. // C++ properties in qwindow.cpp AND as QML properties in qquickwindow.cpp.
// http://qt-project.org/doc/qt-5.0/qtqml/qtqml-cppintegration-definetypes.html#type-revisions-and-versions // http://qt-project.org/doc/qt-5.0/qtqml/qtqml-cppintegration-definetypes.html#type-revisions-and-versions
Q_PROPERTY(QString title READ title WRITE setTitle) Q_PROPERTY(QString title READ title WRITE setTitle NOTIFY windowTitleChanged)
Q_PROPERTY(Qt::WindowModality modality READ modality WRITE setModality NOTIFY modalityChanged) Q_PROPERTY(Qt::WindowModality modality READ modality WRITE setModality NOTIFY modalityChanged)
Q_PROPERTY(Qt::WindowFlags flags READ flags WRITE setFlags) Q_PROPERTY(Qt::WindowFlags flags READ flags WRITE setFlags)
Q_PROPERTY(int x READ x WRITE setX NOTIFY xChanged) Q_PROPERTY(int x READ x WRITE setX NOTIFY xChanged)
@ -297,6 +297,7 @@ Q_SIGNALS:
void screenChanged(QScreen *screen); void screenChanged(QScreen *screen);
void modalityChanged(Qt::WindowModality modality); void modalityChanged(Qt::WindowModality modality);
void windowStateChanged(Qt::WindowState windowState); void windowStateChanged(Qt::WindowState windowState);
void windowTitleChanged(const QString &title);
void xChanged(int arg); void xChanged(int arg);
void yChanged(int arg); void yChanged(int arg);