Revert "Move QWindowSystemInterface out of qpa."
authorPaul Olav Tvete <paul.tvete@nokia.com>
Thu, 26 Jul 2012 11:23:28 +0000 (13:23 +0200)
committerQt by Nokia <qt-info@nokia.com>
Thu, 2 Aug 2012 22:38:09 +0000 (00:38 +0200)
commit3d0af143ca51af0a3cbd81a794e6726992f9a86b
tree76425c1863d878b016d4cb35e94d30df146b1e37
parent328550ff008da53d865f3a6f245aa4753d1b3527
Revert "Move QWindowSystemInterface out of qpa."

This reverts commit 784a877d3cd9a1a75aca9c83146389503a966071.

Conflicts:

src/plugins/platforms/cocoa/qcocoawindow.mm
src/testlib/qtestkeyboard.h
src/testlib/qtestmouse.h
src/testlib/qtesttouch.h

Change-Id: Iebfed179b3eb7f30e4c95edcae5a8ad6fd50330e
Reviewed-by: Lars Knoll <lars.knoll@nokia.com>
55 files changed:
src/gui/kernel/qguiapplication.cpp
src/gui/kernel/qguiapplication_p.h
src/gui/kernel/qplatformwindow.cpp
src/platformsupport/eventdispatchers/qunixeventdispatcher.cpp
src/platformsupport/input/evdevkeyboard/qevdevkeyboardhandler.cpp
src/platformsupport/input/evdevmouse/qevdevmousehandler.cpp
src/platformsupport/input/evdevmouse/qevdevmousemanager.cpp
src/platformsupport/input/evdevtablet/qevdevtablet.cpp
src/platformsupport/input/evdevtouch/qevdevtouch_p.h
src/plugins/generic/meego/qmeegointegration.cpp
src/plugins/generic/tslib/qtslib.cpp
src/plugins/platforms/cocoa/qcocoaapplicationdelegate.mm
src/plugins/platforms/cocoa/qcocoawindow.mm
src/plugins/platforms/cocoa/qmultitouch_mac_p.h
src/plugins/platforms/cocoa/qnsview.mm
src/plugins/platforms/cocoa/qnswindowdelegate.mm
src/plugins/platforms/directfb/qdirectfbinput.cpp
src/plugins/platforms/directfb/qdirectfbwindow.cpp
src/plugins/platforms/eglfs/qeglfscursor.cpp
src/plugins/platforms/eglfs/qeglfswindow.cpp
src/plugins/platforms/kms/qkmswindow.cpp
src/plugins/platforms/minimalegl/qminimaleglwindow.cpp
src/plugins/platforms/openwfd/qopenwfdwindow.cpp
src/plugins/platforms/qnx/qqnxeventdispatcher_blackberry.cpp
src/plugins/platforms/qnx/qqnxintegration.cpp
src/plugins/platforms/qnx/qqnxnavigatoreventhandler.cpp
src/plugins/platforms/qnx/qqnxscreen.cpp
src/plugins/platforms/qnx/qqnxscreeneventhandler.h
src/plugins/platforms/qnx/qqnxwindow.cpp
src/plugins/platforms/windows/qwindowscontext.cpp
src/plugins/platforms/windows/qwindowsdrag.cpp
src/plugins/platforms/windows/qwindowsguieventdispatcher.cpp
src/plugins/platforms/windows/qwindowsintegration.cpp
src/plugins/platforms/windows/qwindowskeymapper.cpp
src/plugins/platforms/windows/qwindowsmousehandler.cpp
src/plugins/platforms/windows/qwindowsscreen.cpp
src/plugins/platforms/windows/qwindowstheme.cpp
src/plugins/platforms/windows/qwindowswindow.cpp
src/plugins/platforms/xcb/qxcbconnection.h
src/plugins/platforms/xcb/qxcbconnection_maemo.cpp
src/plugins/platforms/xcb/qxcbconnection_xi2.cpp
src/plugins/platforms/xcb/qxcbdrag.cpp
src/plugins/platforms/xcb/qxcbkeyboard.cpp
src/plugins/platforms/xcb/qxcbscreen.cpp
src/plugins/platforms/xcb/qxcbwindow.cpp
src/widgets/kernel/qapplication_p.h
src/widgets/kernel/qapplication_qpa.cpp
sync.profile
tests/auto/gui/kernel/qguiapplication/tst_qguiapplication.cpp
tests/auto/gui/kernel/qscreen/tst_qscreen.cpp
tests/auto/gui/kernel/qtouchevent/tst_qtouchevent.cpp
tests/auto/gui/kernel/qwindow/tst_qwindow.cpp
tests/auto/other/gestures/tst_gestures.cpp
tests/auto/widgets/kernel/qapplication/tst_qapplication.cpp
tests/auto/widgets/util/qscroller/tst_qscroller.cpp