diff options
| author | Bradley T. Hughes <bradley.hughes@nokia.com> | 2009-05-29 07:35:51 (GMT) |
|---|---|---|
| committer | Bradley T. Hughes <bradley.hughes@nokia.com> | 2009-05-29 07:35:51 (GMT) |
| commit | 429cd0ee393ad2eef9cea253f7e4dc8940e0cad7 (patch) | |
| tree | 5fac6b1ae23735f745c7662bbe5ae011879ad887 /src/gui/kernel | |
| parent | b70ebe8e9c26e7d53a3d42600b946dbd7eb7bc45 (diff) | |
| download | Qt-429cd0ee393ad2eef9cea253f7e4dc8940e0cad7.zip Qt-429cd0ee393ad2eef9cea253f7e4dc8940e0cad7.tar.gz Qt-429cd0ee393ad2eef9cea253f7e4dc8940e0cad7.tar.bz2 | |
Call the multitouch initialize and cleanup functions from cross-platform code
Diffstat (limited to 'src/gui/kernel')
| -rw-r--r-- | src/gui/kernel/qapplication.cpp | 4 | ||||
| -rw-r--r-- | 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(); } /***************************************************************************** |