diff options
| author | Qt Forward Merge Bot <qt_forward_merge_bot@qt-project.org> | 2018-08-08 08:41:14 +0200 |
|---|---|---|
| committer | Tor Arne Vestbø <tor.arne.vestbo@qt.io> | 2018-08-08 11:20:22 +0200 |
| commit | 577654047a0bb2810d789fb2fbc550ccfee47029 (patch) | |
| tree | 51e70099313464f7ed3c4ba563e2aa2bc5f762b8 /src/gui/kernel/qguiapplication_p.h | |
| parent | 634e5dd9f2e03198a06269087ad3dd9b59ac87f1 (diff) | |
| parent | bedf50a5bb9656a64ec609536366f90929a63c39 (diff) | |
Merge remote-tracking branch 'origin/5.11' into dev
Conflicts:
src/plugins/platforms/cocoa/qcocoabackingstore.mm
src/plugins/platforms/cocoa/qcocoascreen.mm
Change-Id: Iac965aea4867059dbf7bc401b71e8e8b5b259afb
Diffstat (limited to 'src/gui/kernel/qguiapplication_p.h')
| -rw-r--r-- | src/gui/kernel/qguiapplication_p.h | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/src/gui/kernel/qguiapplication_p.h b/src/gui/kernel/qguiapplication_p.h index 145e764244..79c1a1c820 100644 --- a/src/gui/kernel/qguiapplication_p.h +++ b/src/gui/kernel/qguiapplication_p.h @@ -139,10 +139,10 @@ public: static void updateFilteredScreenOrientation(QScreen *screen); static void reportScreenOrientationChange(QScreen *screen); - static void reportScreenOrientationChange(QWindowSystemInterfacePrivate::ScreenOrientationEvent *e); - static void reportGeometryChange(QWindowSystemInterfacePrivate::ScreenGeometryEvent *e); - static void reportLogicalDotsPerInchChange(QWindowSystemInterfacePrivate::ScreenLogicalDotsPerInchEvent *e); - static void reportRefreshRateChange(QWindowSystemInterfacePrivate::ScreenRefreshRateEvent *e); + static void processScreenOrientationChange(QWindowSystemInterfacePrivate::ScreenOrientationEvent *e); + static void processScreenGeometryChange(QWindowSystemInterfacePrivate::ScreenGeometryEvent *e); + static void processScreenLogicalDotsPerInchChange(QWindowSystemInterfacePrivate::ScreenLogicalDotsPerInchEvent *e); + static void processScreenRefreshRateChange(QWindowSystemInterfacePrivate::ScreenRefreshRateEvent *e); static void processThemeChanged(QWindowSystemInterfacePrivate::ThemeChangeEvent *tce); static void processExposeEvent(QWindowSystemInterfacePrivate::ExposeEvent *e); |