summaryrefslogtreecommitdiffstats
path: root/src/widgets/widgets/qworkspace.cpp
diff options
context:
space:
mode:
authorRohan McGovern <rohan.mcgovern@nokia.com>2012-02-29 09:18:59 +1000
committerRohan McGovern <rohan.mcgovern@nokia.com>2012-02-29 09:23:14 +1000
commit98dd1781d9256f68025d2a2db408f4f5947f3214 (patch)
treedbe1424abd90014edb5546c920ca585ed62b46e3 /src/widgets/widgets/qworkspace.cpp
parent6c1bdc1854a7700c2b3a345b95f6a2fdca84037d (diff)
parentfa1b9070af66edb81b2a3735c1951f78b22bd666 (diff)
Merge master -> api_changes
Includes fixes for tst_qfiledialog2, tst_qtextedit autotests on mac. Change-Id: I49cac26894d31291a8339ccc1eb80b6a940f0827
Diffstat (limited to 'src/widgets/widgets/qworkspace.cpp')
-rw-r--r--src/widgets/widgets/qworkspace.cpp11
1 files changed, 3 insertions, 8 deletions
diff --git a/src/widgets/widgets/qworkspace.cpp b/src/widgets/widgets/qworkspace.cpp
index be3f7836d5..5cc8e363f1 100644
--- a/src/widgets/widgets/qworkspace.cpp
+++ b/src/widgets/widgets/qworkspace.cpp
@@ -290,9 +290,6 @@ public:
QWorkspaceTitleBarPrivate()
:
lastControl(QStyle::SC_None),
-#ifndef QT_NO_TOOLTIP
- toolTip(0),
-#endif
act(0), window(0), movable(1), pressed(0), autoraise(0), moving(0)
{
}
@@ -301,9 +298,6 @@ public:
QStyle::SubControl buttonDown;
QStyle::SubControl lastControl;
QPoint moveOffset;
-#ifndef QT_NO_TOOLTIP
- QToolTip *toolTip;
-#endif
bool act :1;
QPointer<QWidget> window;
bool movable :1;
@@ -1085,7 +1079,8 @@ QWorkspacePrivate::init()
actions[QWorkspacePrivate::CloseAct] = new QAction(QIcon(q->style()->standardPixmap(QStyle::SP_TitleBarCloseButton, 0, q)),
QWorkspace::tr("&Close")
#ifndef QT_NO_SHORTCUT
- +QLatin1Char('\t')+(QString)QKeySequence(Qt::CTRL+Qt::Key_F4)
+ + QLatin1Char('\t')
+ + QKeySequence(Qt::CTRL+Qt::Key_F4).toString(QKeySequence::NativeText)
#endif
,q);
QObject::connect(actions[QWorkspacePrivate::CloseAct], SIGNAL(triggered()), q, SLOT(closeActiveWindow()));
@@ -3210,7 +3205,7 @@ QRect QWorkspacePrivate::updateWorkspace()
QWorkspaceChild *child = *it;
++it;
if (!child->isHidden())
- r = r.unite(child->geometry());
+ r = r.united(child->geometry());
}
vbar->blockSignals(true);
hbar->blockSignals(true);