summaryrefslogtreecommitdiffstats
path: root/src/gui/kernel/qwindow.cpp
diff options
context:
space:
mode:
authorShawn Rutledge <shawn.rutledge@digia.com>2013-03-06 14:16:56 +0100
committerThe Qt Project <gerrit-noreply@qt-project.org>2013-03-13 19:11:18 +0100
commit463dac4e00b1dba0f44ab6178f035bcdd0ce4a81 (patch)
tree2a1954508ab60c2f6c8096ad52bee3b646d953ff /src/gui/kernel/qwindow.cpp
parent846cf1a13f80fe4590cc9ad4d9972d7a173accd6 (diff)
If a QWindow without a platform window is resized, emit changed signal
Needed as a consequence of I4f5e37480eef5d105e45ffd60362a57f13ec55f5 Otherwise a Window in QML doesn't get notified to update its layout after being mapped the first time, on Linux. Change-Id: I8b1291e16b11eb93ab045ac5c5ed6b478391cb21 Reviewed-by: Jan Arve Sæther <jan-arve.saether@digia.com>
Diffstat (limited to 'src/gui/kernel/qwindow.cpp')
-rw-r--r--src/gui/kernel/qwindow.cpp5
1 files changed, 5 insertions, 0 deletions
diff --git a/src/gui/kernel/qwindow.cpp b/src/gui/kernel/qwindow.cpp
index f4a2059d74..65530f676a 100644
--- a/src/gui/kernel/qwindow.cpp
+++ b/src/gui/kernel/qwindow.cpp
@@ -1259,7 +1259,12 @@ void QWindow::resize(const QSize &newSize)
if (d->platformWindow) {
d->platformWindow->setGeometry(QRect(position(), newSize));
} else {
+ const QSize oldSize = d->geometry.size();
d->geometry.setSize(newSize);
+ if (newSize.width() != oldSize.width())
+ emit widthChanged(newSize.width());
+ if (newSize.height() != oldSize.height())
+ emit heightChanged(newSize.height());
}
}