projects
/
profile
/
ivi
/
qtbase.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
| inline |
side by side
(parent:
d7ec8bf
)
Fix QWidget::saveGeometry().
author
Friedemann Kleint
<Friedemann.Kleint@nokia.com>
Tue, 10 Jan 2012 14:58:31 +0000
(15:58 +0100)
committer
Qt by Nokia
<qt-info@nokia.com>
Tue, 10 Jan 2012 18:53:25 +0000
(19:53 +0100)
Bring back code that was accidentally removed.
Change-Id: Ie1a4d22caa206bc8bb8e678879935e79009e9622
Reviewed-by: Friedemann Kleint <Friedemann.Kleint@nokia.com>
src/widgets/kernel/qwidget.cpp
patch
|
blob
|
history
diff --git
a/src/widgets/kernel/qwidget.cpp
b/src/widgets/kernel/qwidget.cpp
index
ae0cbe4
..
a90d15c
100644
(file)
--- a/
src/widgets/kernel/qwidget.cpp
+++ b/
src/widgets/kernel/qwidget.cpp
@@
-6555,6
+6555,9
@@
QByteArray QWidget::saveGeometry() const
#ifdef Q_WS_MAC
<< newFramePosition
<< newNormalPosition
+#else
+ << frameGeometry()
+ << normalGeometry()
#endif // Q_WS_MAC
<< qint32(QApplication::desktop()->screenNumber(this))
<< quint8(windowState() & Qt::WindowMaximized)