summaryrefslogtreecommitdiffstats
path: root/src/gui/kernel
diff options
context:
space:
mode:
authorLiang Qi <liang.qi@digia.com>2013-04-11 17:11:36 +0200
committerThe Qt Project <gerrit-noreply@qt-project.org>2013-04-23 12:45:30 +0200
commit941f7a5283cf7331d8b079c6b0561ab6627cf108 (patch)
treec81594ededff0cc92205ddc1f33e3f90bb0283d5 /src/gui/kernel
parenta6e903299b8f7f5848991735645916387e29add2 (diff)
Make requestActivate() as a slot in QWindow
Then it could be used in QML world. Task-number: QTBUG-28667 Change-Id: Ib65ad3b271a07ba50d3ca50d61f486f829f69119 Reviewed-by: Gunnar Sletta <gunnar.sletta@digia.com>
Diffstat (limited to 'src/gui/kernel')
-rw-r--r--src/gui/kernel/qwindow.h4
1 files changed, 2 insertions, 2 deletions
diff --git a/src/gui/kernel/qwindow.h b/src/gui/kernel/qwindow.h
index 9b1ed2c702..8f32ff6813 100644
--- a/src/gui/kernel/qwindow.h
+++ b/src/gui/kernel/qwindow.h
@@ -170,8 +170,6 @@ public:
void setMask(const QRegion &region);
QRegion mask() const;
- void requestActivate();
-
bool isActive() const;
void reportContentOrientationChange(Qt::ScreenOrientation orientation);
@@ -264,6 +262,8 @@ public:
static QWindow *fromWinId(WId id);
public Q_SLOTS:
+ Q_REVISION(1) void requestActivate();
+
void setVisible(bool visible);
void show();