diff options
| author | Liang Qi <liang.qi@qt.io> | 2017-05-29 10:06:10 +0200 |
|---|---|---|
| committer | Liang Qi <liang.qi@qt.io> | 2017-05-29 10:54:41 +0200 |
| commit | 6a772fd201ac738dc86e71bd82e98f65158e6335 (patch) | |
| tree | 674007720f41d27b251bbcffd7a368a93f88eb96 /src/gui/kernel | |
| parent | 40206a9f6d7635bb19305d1c8d74908808e3529e (diff) | |
| parent | 4c346b6e2bfab976bc9b16275b8382aee38aefa4 (diff) | |
Merge remote-tracking branch 'origin/5.9' into dev
Conflicts:
.qmake.conf
mkspecs/common/msvc-desktop.conf
mkspecs/win32-g++/qmake.conf
mkspecs/win32-icc/qmake.conf
src/platformsupport/fontdatabases/mac/coretext.pri
src/plugins/platforms/cocoa/qcocoawindow.h
src/plugins/platforms/cocoa/qcocoawindow.mm
Change-Id: I74a6f7705c9547ed8bbac7260eb4645543e32655
Diffstat (limited to 'src/gui/kernel')
| -rw-r--r-- | src/gui/kernel/qguiapplication.cpp | 13 | ||||
| -rw-r--r-- | src/gui/kernel/qwindowsysteminterface.cpp | 3 |
2 files changed, 15 insertions, 1 deletions
diff --git a/src/gui/kernel/qguiapplication.cpp b/src/gui/kernel/qguiapplication.cpp index 808f3ad166..7e62ebf161 100644 --- a/src/gui/kernel/qguiapplication.cpp +++ b/src/gui/kernel/qguiapplication.cpp @@ -641,6 +641,18 @@ QGuiApplication::~QGuiApplication() QGuiApplicationPrivate::m_inputDeviceManager = 0; delete QGuiApplicationPrivate::desktopFileName; QGuiApplicationPrivate::desktopFileName = 0; + QGuiApplicationPrivate::mouse_buttons = Qt::NoButton; + QGuiApplicationPrivate::modifier_buttons = Qt::NoModifier; + QGuiApplicationPrivate::lastCursorPosition = {qInf(), qInf()}; + QGuiApplicationPrivate::currentMousePressWindow = QGuiApplicationPrivate::currentMouseWindow = nullptr; + QGuiApplicationPrivate::applicationState = Qt::ApplicationInactive; + QGuiApplicationPrivate::highDpiScalingUpdated = false; + QGuiApplicationPrivate::tabletDevicePoints.clear(); +#ifndef QT_NO_SESSIONMANAGER + QGuiApplicationPrivate::is_fallback_session_management_enabled = true; +#endif + QGuiApplicationPrivate::mousePressTime = 0; + QGuiApplicationPrivate::mousePressX = QGuiApplicationPrivate::mousePressY = 0; } QGuiApplicationPrivate::QGuiApplicationPrivate(int &argc, char **argv, int flags) @@ -1538,6 +1550,7 @@ QGuiApplicationPrivate::~QGuiApplicationPrivate() delete m_a32ColorProfile.load(); window_list.clear(); + screen_list.clear(); } #if 0 diff --git a/src/gui/kernel/qwindowsysteminterface.cpp b/src/gui/kernel/qwindowsysteminterface.cpp index 974391d3a4..f1f74e1342 100644 --- a/src/gui/kernel/qwindowsysteminterface.cpp +++ b/src/gui/kernel/qwindowsysteminterface.cpp @@ -215,7 +215,8 @@ bool QWindowSystemEventHandler::sendEvent(QWindowSystemInterfacePrivate::WindowS QT_DEFINE_QPA_EVENT_HANDLER(void, handleEnterEvent, QWindow *window, const QPointF &local, const QPointF &global) { if (window) { - QWindowSystemInterfacePrivate::EnterEvent *e = new QWindowSystemInterfacePrivate::EnterEvent(window, local, global); + QWindowSystemInterfacePrivate::EnterEvent *e + = new QWindowSystemInterfacePrivate::EnterEvent(window, QHighDpi::fromNativeLocalPosition(local, window), QHighDpi::fromNativePixels(global, window)); QWindowSystemInterfacePrivate::handleWindowSystemEvent<Delivery>(e); } } |