diff options
Diffstat (limited to 'src/plugins/platforms/minimal')
-rw-r--r-- | src/plugins/platforms/minimal/qminimalbackingstore.cpp | 3 | ||||
-rw-r--r-- | src/plugins/platforms/minimal/qminimalintegration.cpp | 7 | ||||
-rw-r--r-- | src/plugins/platforms/minimal/qminimalintegration.h | 9 |
3 files changed, 5 insertions, 14 deletions
diff --git a/src/plugins/platforms/minimal/qminimalbackingstore.cpp b/src/plugins/platforms/minimal/qminimalbackingstore.cpp index bd4f04dfcd..08281405a4 100644 --- a/src/plugins/platforms/minimal/qminimalbackingstore.cpp +++ b/src/plugins/platforms/minimal/qminimalbackingstore.cpp @@ -41,6 +41,7 @@ #include "qminimalbackingstore.h" +#include "qscreen.h" #include <QtCore/qdebug.h> #include <private/qguiapplication_p.h> @@ -77,7 +78,7 @@ void QMinimalBackingStore::flush(QWindow *window, const QRegion ®ion, const Q void QMinimalBackingStore::resize(const QSize &size, const QRegion &) { //qDebug() << "QMinimalBackingStore::setGeometry:" << (long)this << rect; - QImage::Format format = QGuiApplicationPrivate::platformIntegration()->screens().first()->format(); + QImage::Format format = QGuiApplication::primaryScreen()->handle()->format(); if (mImage.size() != size) mImage = QImage(size, format); } diff --git a/src/plugins/platforms/minimal/qminimalintegration.cpp b/src/plugins/platforms/minimal/qminimalintegration.cpp index 71bdda73aa..8d8e5e7f06 100644 --- a/src/plugins/platforms/minimal/qminimalintegration.cpp +++ b/src/plugins/platforms/minimal/qminimalintegration.cpp @@ -58,7 +58,7 @@ QMinimalIntegration::QMinimalIntegration() mPrimaryScreen->mDepth = 32; mPrimaryScreen->mFormat = QImage::Format_ARGB32_Premultiplied; - mScreens.append(mPrimaryScreen); + screenAdded(mPrimaryScreen); } bool QMinimalIntegration::hasCapability(QPlatformIntegration::Capability cap) const @@ -69,11 +69,6 @@ bool QMinimalIntegration::hasCapability(QPlatformIntegration::Capability cap) co } } -QPlatformPixmap *QMinimalIntegration::createPlatformPixmap(QPlatformPixmap::PixelType type) const -{ - return new QRasterPlatformPixmap(type); -} - QPlatformWindow *QMinimalIntegration::createPlatformWindow(QWindow *window) const { Q_UNUSED(window); diff --git a/src/plugins/platforms/minimal/qminimalintegration.h b/src/plugins/platforms/minimal/qminimalintegration.h index 52e4c0a6f3..d64932c5e6 100644 --- a/src/plugins/platforms/minimal/qminimalintegration.h +++ b/src/plugins/platforms/minimal/qminimalintegration.h @@ -71,15 +71,10 @@ public: bool hasCapability(QPlatformIntegration::Capability cap) const; - QPlatformPixmap *createPlatformPixmap(QPlatformPixmap::PixelType type) const; QPlatformWindow *createPlatformWindow(QWindow *window) const; - QPlatformBackingStore *createPlatformBackingStore(QWindow *window) const; - QAbstractEventDispatcher *createEventDispatcher() const; - - QList<QPlatformScreen *> screens() const { return mScreens; } + QPlatformBackingStore *createPlatformBackingStore(QWindow *window) const; -private: - QList<QPlatformScreen *> mScreens; + QAbstractEventDispatcher *createEventDispatcher() const; }; QT_END_NAMESPACE |