summaryrefslogtreecommitdiffstats
path: root/src/gui/kernel
diff options
context:
space:
mode:
authorFrederik Gladhorn <frederik.gladhorn@digia.com>2013-06-10 10:00:34 +0200
committerFrederik Gladhorn <frederik.gladhorn@digia.com>2013-06-10 10:00:34 +0200
commit0eff16611f65c1459ab73bde1ad2175614dd84eb (patch)
tree3eec6162b3f9fd283c1fb675c7d437baf6c37565 /src/gui/kernel
parent9095210c0b57f75fe2fecf7289fabbdfdf64e198 (diff)
parentebea15cb33da8063a630867e38eacf7857b0b936 (diff)
Merge remote-tracking branch 'origin/release' into stable
Diffstat (limited to 'src/gui/kernel')
-rw-r--r--src/gui/kernel/qguiapplication.cpp4
1 files changed, 2 insertions, 2 deletions
diff --git a/src/gui/kernel/qguiapplication.cpp b/src/gui/kernel/qguiapplication.cpp
index 2a1d7e3bcc..29a7e87d46 100644
--- a/src/gui/kernel/qguiapplication.cpp
+++ b/src/gui/kernel/qguiapplication.cpp
@@ -2251,8 +2251,8 @@ void QGuiApplicationPrivate::processExposeEvent(QWindowSystemInterfacePrivate::E
if (!p->receivedExpose) {
if (p->resizeEventPending) {
// as a convenience for plugins, send a resize event before the first expose event if they haven't done so
- QSize size = p->geometry.size();
- QResizeEvent e(size, size);
+ // window->geometry() should have a valid size as soon as a handle exists.
+ QResizeEvent e(window->geometry().size(), p->geometry.size());
QGuiApplication::sendSpontaneousEvent(window, &e);
p->resizeEventPending = false;