diff options
Diffstat (limited to 'src/plugins')
5 files changed, 11 insertions, 6 deletions
diff --git a/src/plugins/platforms/eglfs/api/qeglfsintegration.cpp b/src/plugins/platforms/eglfs/api/qeglfsintegration.cpp index 0aa7a65276..73110dba61 100644 --- a/src/plugins/platforms/eglfs/api/qeglfsintegration.cpp +++ b/src/plugins/platforms/eglfs/api/qeglfsintegration.cpp @@ -116,9 +116,9 @@ QEglFSIntegration::QEglFSIntegration() initResources(); } -void QEglFSIntegration::addScreen(QPlatformScreen *screen) +void QEglFSIntegration::addScreen(QPlatformScreen *screen, bool isPrimary) { - screenAdded(screen); + screenAdded(screen, isPrimary); } void QEglFSIntegration::removeScreen(QPlatformScreen *screen) diff --git a/src/plugins/platforms/eglfs/api/qeglfsintegration_p.h b/src/plugins/platforms/eglfs/api/qeglfsintegration_p.h index 080c8ed332..c288876678 100644 --- a/src/plugins/platforms/eglfs/api/qeglfsintegration_p.h +++ b/src/plugins/platforms/eglfs/api/qeglfsintegration_p.h @@ -103,7 +103,7 @@ public: QFbVtHandler *vtHandler() { return m_vtHandler.data(); } - void addScreen(QPlatformScreen *screen); + void addScreen(QPlatformScreen *screen, bool isPrimary = false); void removeScreen(QPlatformScreen *screen); private: diff --git a/src/plugins/platforms/eglfs/deviceintegration/eglfs_kms_support/qeglfskmsdevice.cpp b/src/plugins/platforms/eglfs/deviceintegration/eglfs_kms_support/qeglfskmsdevice.cpp index e99a6957a8..b073577797 100644 --- a/src/plugins/platforms/eglfs/deviceintegration/eglfs_kms_support/qeglfskmsdevice.cpp +++ b/src/plugins/platforms/eglfs/deviceintegration/eglfs_kms_support/qeglfskmsdevice.cpp @@ -51,13 +51,14 @@ QEglFSKmsDevice::QEglFSKmsDevice(QKmsScreenConfig *screenConfig, const QString & } void QEglFSKmsDevice::registerScreen(QPlatformScreen *screen, + bool isPrimary, const QPoint &virtualPos, const QList<QPlatformScreen *> &virtualSiblings) { QEglFSKmsScreen *s = static_cast<QEglFSKmsScreen *>(screen); s->setVirtualPosition(virtualPos); s->setVirtualSiblings(virtualSiblings); - static_cast<QEglFSIntegration *>(QGuiApplicationPrivate::platformIntegration())->addScreen(s); + static_cast<QEglFSIntegration *>(QGuiApplicationPrivate::platformIntegration())->addScreen(s, isPrimary); } QT_END_NAMESPACE diff --git a/src/plugins/platforms/eglfs/deviceintegration/eglfs_kms_support/qeglfskmsdevice.h b/src/plugins/platforms/eglfs/deviceintegration/eglfs_kms_support/qeglfskmsdevice.h index 1bbea250bb..fc83a620d9 100644 --- a/src/plugins/platforms/eglfs/deviceintegration/eglfs_kms_support/qeglfskmsdevice.h +++ b/src/plugins/platforms/eglfs/deviceintegration/eglfs_kms_support/qeglfskmsdevice.h @@ -52,6 +52,7 @@ public: QEglFSKmsDevice(QKmsScreenConfig *screenConfig, const QString &path); void registerScreen(QPlatformScreen *screen, + bool isPrimary, const QPoint &virtualPos, const QList<QPlatformScreen *> &virtualSiblings) override; }; diff --git a/src/plugins/platforms/linuxfb/qlinuxfbdrmscreen.cpp b/src/plugins/platforms/linuxfb/qlinuxfbdrmscreen.cpp index bdf2634642..2ca251c4af 100644 --- a/src/plugins/platforms/linuxfb/qlinuxfbdrmscreen.cpp +++ b/src/plugins/platforms/linuxfb/qlinuxfbdrmscreen.cpp @@ -106,6 +106,7 @@ private: void *nativeDisplay() const override; QPlatformScreen *createScreen(const QKmsOutput &output) override; void registerScreen(QPlatformScreen *screen, + bool isPrimary, const QPoint &virtualPos, const QList<QPlatformScreen *> &virtualSiblings) override; @@ -175,10 +176,12 @@ QPlatformScreen *QLinuxFbDevice::createScreen(const QKmsOutput &output) } void QLinuxFbDevice::registerScreen(QPlatformScreen *screen, - const QPoint &virtualPos, - const QList<QPlatformScreen *> &virtualSiblings) + bool isPrimary, + const QPoint &virtualPos, + const QList<QPlatformScreen *> &virtualSiblings) { Q_UNUSED(screen); + Q_UNUSED(isPrimary); Q_UNUSED(virtualPos); Q_UNUSED(virtualSiblings); Q_UNREACHABLE(); |