diff options
| author | Liang Qi <liang.qi@theqtcompany.com> | 2016-03-13 18:39:03 +0000 |
|---|---|---|
| committer | The Qt Project <gerrit-noreply@qt-project.org> | 2016-03-13 19:27:21 +0000 |
| commit | 59a3ca679ede2cb9b6a162edf8eba5cf6d9af4a9 (patch) | |
| tree | 0d0f76caa042db299cddaa84c14c28e4c80b2ffd /src/plugins/platforms/xcb/qxcbscreen.h | |
| parent | 447a508d003ce487f2be69af9ab05aeec272e64d (diff) | |
| parent | 50d0f57b77b8088875d7185c5906b5f57985d5fb (diff) | |
Merge "Merge remote-tracking branch 'origin/5.6' into 5.7" into refs/staging/5.7
Diffstat (limited to 'src/plugins/platforms/xcb/qxcbscreen.h')
| -rw-r--r-- | src/plugins/platforms/xcb/qxcbscreen.h | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/src/plugins/platforms/xcb/qxcbscreen.h b/src/plugins/platforms/xcb/qxcbscreen.h index e97631e2af..30c5073459 100644 --- a/src/plugins/platforms/xcb/qxcbscreen.h +++ b/src/plugins/platforms/xcb/qxcbscreen.h @@ -139,6 +139,7 @@ public: bool isPrimary() const { return m_primary; } int screenNumber() const { return m_virtualDesktop->number(); } + static int virtualDesktopNumberStatic(const QScreen *screen); xcb_screen_t *screen() const { return m_virtualDesktop->screen(); } xcb_window_t root() const { return screen()->root; } |