diff options
| author | Simon Hausmann <simon.hausmann@theqtcompany.com> | 2016-01-12 09:01:52 +0100 |
|---|---|---|
| committer | Simon Hausmann <simon.hausmann@theqtcompany.com> | 2016-01-12 11:07:56 +0100 |
| commit | 6b8c0a50585bb637c5cd33ca8ffde0cb9c4e3664 (patch) | |
| tree | 12647726671357a571e2b371b0e33199efb08156 /src/plugins/platforms/xcb/qxcbwindow.h | |
| parent | 66d94ea30be9c4c8cc81a52134022eb662bedd77 (diff) | |
| parent | ca7f1d2197f78ec3332cfd86ab9921730b6d4f23 (diff) | |
Merge remote-tracking branch 'origin/5.6' into dev
Change-Id: I5839bded07e23af65ced9491c4f50242f964dd31
Diffstat (limited to 'src/plugins/platforms/xcb/qxcbwindow.h')
| -rw-r--r-- | src/plugins/platforms/xcb/qxcbwindow.h | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/src/plugins/platforms/xcb/qxcbwindow.h b/src/plugins/platforms/xcb/qxcbwindow.h index 587be22915..8d3aef8e07 100644 --- a/src/plugins/platforms/xcb/qxcbwindow.h +++ b/src/plugins/platforms/xcb/qxcbwindow.h @@ -167,7 +167,6 @@ public: virtual void create(); virtual void destroy(); - QXcbScreen *screenForNativeGeometry(const QRect &newGeometry) const; public Q_SLOTS: void updateSyncRequestCounter(); |