From 429cd0ee393ad2eef9cea253f7e4dc8940e0cad7 Mon Sep 17 00:00:00 2001 From: "Bradley T. Hughes" Date: Fri, 29 May 2009 09:35:51 +0200 Subject: Call the multitouch initialize and cleanup functions from cross-platform code --- src/gui/kernel/qapplication.cpp | 4 ++++ src/gui/kernel/qapplication_win.cpp | 2 -- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/src/gui/kernel/qapplication.cpp b/src/gui/kernel/qapplication.cpp index 27ac04a..876198e 100644 --- a/src/gui/kernel/qapplication.cpp +++ b/src/gui/kernel/qapplication.cpp @@ -901,6 +901,8 @@ void QApplicationPrivate::initialize() QApplicationPrivate::wheel_scroll_lines = 3; #endif #endif + + initializeMultitouch(); } /*! @@ -1051,6 +1053,8 @@ QApplication::~QApplication() delete QDragManager::self(); #endif + d->cleanupMultitouch(); + qt_cleanup(); if (QApplicationPrivate::widgetCount) diff --git a/src/gui/kernel/qapplication_win.cpp b/src/gui/kernel/qapplication_win.cpp index a0c1184..6f9abdb 100644 --- a/src/gui/kernel/qapplication_win.cpp +++ b/src/gui/kernel/qapplication_win.cpp @@ -873,8 +873,6 @@ void qt_init(QApplicationPrivate *priv, int) if (ptrUpdateLayeredWindow && !ptrUpdateLayeredWindowIndirect) ptrUpdateLayeredWindowIndirect = qt_updateLayeredWindowIndirect; #endif - - priv->initializeMultitouch(); } /***************************************************************************** -- cgit v0.12