From bfbeaffda89f475370094911f625db10baac72fc Mon Sep 17 00:00:00 2001
From: Rohan McGovern <rohan.mcgovern@nokia.com>
Date: Thu, 18 Oct 2012 11:14:57 +1000
Subject: [PATCH] Fix compile with -no-widgets

Remove more unnecessary references to QtWidgets in accessibility
implementation.

Disable accessibility tests (which rely on QtWidgets) when QtWidgets is
not available.

Change-Id: I57315537779d31af1245d42d1b4c49174016da54
Reviewed-by: Jens Bache-Wiig <jens.bache-wiig@digia.com>
Reviewed-by: Frederik Gladhorn <frederik.gladhorn@digia.com>
---
 src/platformsupport/linuxaccessibility/application.cpp  | 6 +++---
 src/platformsupport/linuxaccessibility/atspiadaptor.cpp | 1 -
 tests/auto/other/other.pro                              | 2 ++
 3 files changed, 5 insertions(+), 4 deletions(-)

diff --git a/src/platformsupport/linuxaccessibility/application.cpp b/src/platformsupport/linuxaccessibility/application.cpp
index 0b9f1ce2e5..c2049e536a 100644
--- a/src/platformsupport/linuxaccessibility/application.cpp
+++ b/src/platformsupport/linuxaccessibility/application.cpp
@@ -42,7 +42,7 @@
 
 #include "application_p.h"
 
-#include <QtWidgets/qapplication.h>
+#include <QtCore/qcoreapplication.h>
 #include <QtDBus/qdbuspendingreply.h>
 #include <qdebug.h>
 
@@ -204,7 +204,7 @@ void QSpiApplicationAdaptor::notifyKeyboardListenerCallback(const QDBusMessage&
         delete event.second;
     } else {
         QPair<QObject*, QKeyEvent*> event = keyEvents.dequeue();
-        QApplication::postEvent(event.first, event.second);
+        QCoreApplication::postEvent(event.first, event.second);
     }
 }
 
@@ -213,7 +213,7 @@ void QSpiApplicationAdaptor::notifyKeyboardListenerError(const QDBusError& error
     qWarning() << QStringLiteral("QSpiApplication::keyEventError ") << error.name() << error.message();
     while (!keyEvents.isEmpty()) {
         QPair<QObject*, QKeyEvent*> event = keyEvents.dequeue();
-        QApplication::postEvent(event.first, event.second);
+        QCoreApplication::postEvent(event.first, event.second);
     }
 }
 
diff --git a/src/platformsupport/linuxaccessibility/atspiadaptor.cpp b/src/platformsupport/linuxaccessibility/atspiadaptor.cpp
index 68c1f8ae4a..bea84d04fb 100644
--- a/src/platformsupport/linuxaccessibility/atspiadaptor.cpp
+++ b/src/platformsupport/linuxaccessibility/atspiadaptor.cpp
@@ -45,7 +45,6 @@
 #include <QtGui/qguiapplication.h>
 #include <qdbusmessage.h>
 #include <qdbusreply.h>
-#include <QtWidgets/qwidget.h>
 #include <qclipboard.h>
 
 #include <qdebug.h>
diff --git a/tests/auto/other/other.pro b/tests/auto/other/other.pro
index 0d96c7d0cd..eb6ed667a8 100644
--- a/tests/auto/other/other.pro
+++ b/tests/auto/other/other.pro
@@ -39,6 +39,8 @@ contains(QT_CONFIG, no-widgets): SUBDIRS -= \
    qnetworkaccessmanager_and_qprogressdialog \
    qsharedpointer_and_qwidget \
    windowsmobile \
+   qaccessibility \
+   qaccessibilitylinux \
 
 testcocoon: SUBDIRS -= headersclean