diff options
Diffstat (limited to 'src/platforms/mirserver/mirserverintegration.cpp')
-rw-r--r-- | src/platforms/mirserver/mirserverintegration.cpp | 17 |
1 files changed, 0 insertions, 17 deletions
diff --git a/src/platforms/mirserver/mirserverintegration.cpp b/src/platforms/mirserver/mirserverintegration.cpp index ad33caa..28c8c9d 100644 --- a/src/platforms/mirserver/mirserverintegration.cpp +++ b/src/platforms/mirserver/mirserverintegration.cpp @@ -31,11 +31,6 @@ #include <QCoreApplication> #include <QOpenGLContext> - -#if QT_VERSION < QT_VERSION_CHECK(5, 2, 0) -#include <private/qguiapplication_p.h> -#endif - #include <QDebug> // Mir @@ -59,9 +54,6 @@ MirServerIntegration::MirServerIntegration() : m_accessibility(new QPlatformAccessibility()) , m_fontDb(new QGenericUnixFontDatabase()) , m_services(new Services) -#if QT_VERSION < QT_VERSION_CHECK(5, 2, 0) - , m_eventDispatcher(createUnixEventDispatcher()) -#endif , m_mirServer(new QMirServer(QCoreApplication::arguments())) , m_display(nullptr) , m_nativeInterface(nullptr) @@ -82,11 +74,6 @@ MirServerIntegration::MirServerIntegration() QObject::connect(m_mirServer.data(), &QMirServer::stopped, QCoreApplication::instance(), &QCoreApplication::quit); -#if QT_VERSION < QT_VERSION_CHECK(5, 2, 0) - QGuiApplicationPrivate::instance()->setEventDispatcher(eventDispatcher_); - initialize(); -#endif - m_inputContext = QPlatformInputContextFactory::create(); } @@ -105,10 +92,8 @@ bool MirServerIntegration::hasCapability(QPlatformIntegration::Capability cap) c case SharedGraphicsCache: return true; case BufferQueueingOpenGL: return true; case MultipleWindows: return false; // multi-monitor support -#if QT_VERSION >= QT_VERSION_CHECK(5, 2, 0) case WindowManagement: return false; // platform has no WM, as this implements the WM! case NonFullScreenWindows: return false; -#endif default: return QPlatformIntegration::hasCapability(cap); } } @@ -158,12 +143,10 @@ QPlatformOpenGLContext *MirServerIntegration::createPlatformOpenGLContext(QOpenG return new MirOpenGLContext(m_mirServer->mirServer(), context->format()); } -#if QT_VERSION >= QT_VERSION_CHECK(5, 2, 0) QAbstractEventDispatcher *MirServerIntegration::createEventDispatcher() const { return createUnixEventDispatcher(); } -#endif void MirServerIntegration::initialize() { |