summaryrefslogtreecommitdiffstats
path: root/src/plugins/platforms/windows/qwindowscontext.h
diff options
context:
space:
mode:
authorFriedemann Kleint <Friedemann.Kleint@theqtcompany.com>2015-10-19 14:25:37 +0200
committerFriedemann Kleint <Friedemann.Kleint@theqtcompany.com>2015-10-28 09:23:46 +0000
commit7daae2c2c706fd5d1c1ae44ace6847bc297803a0 (patch)
tree43cbfb4876f0bd6acd37f13879f1872cb434b3c2 /src/plugins/platforms/windows/qwindowscontext.h
parenta91c40868bbdc1b2d2dd3b5f8b47aae9e8589a81 (diff)
Windows: Delay-initialize pluggable touch devices.
Move touch device initialization code to QWindowsContext and replace the assert on the touch device in QWindowsMouseHandler by a call to the initTouch(). Task-number: QTBUG-48849 Change-Id: If8573b8283ef94e7fd015f6edc626e3c8cc0b139 Reviewed-by: Joni Poikelin <joni.poikelin@theqtcompany.com> Reviewed-by: Oliver Wolff <oliver.wolff@theqtcompany.com> Reviewed-by: Andreas Holzammer <andreas.holzammer@kdab.com> Reviewed-by: Friedemann Kleint <Friedemann.Kleint@theqtcompany.com>
Diffstat (limited to 'src/plugins/platforms/windows/qwindowscontext.h')
-rw-r--r--src/plugins/platforms/windows/qwindowscontext.h3
1 files changed, 3 insertions, 0 deletions
diff --git a/src/plugins/platforms/windows/qwindowscontext.h b/src/plugins/platforms/windows/qwindowscontext.h
index d2a3481b28..641e3ed41f 100644
--- a/src/plugins/platforms/windows/qwindowscontext.h
+++ b/src/plugins/platforms/windows/qwindowscontext.h
@@ -170,6 +170,9 @@ public:
explicit QWindowsContext();
~QWindowsContext();
+ bool initTouch();
+ bool initTouch(unsigned integrationOptions); // For calls from QWindowsIntegration::QWindowsIntegration() only.
+
int defaultDPI() const;
QString registerWindowClass(const QWindow *w);