aboutsummaryrefslogtreecommitdiffstats
path: root/plugins
diff options
context:
space:
mode:
authorDominik Holland <dominik.holland@pelagicore.com>2016-08-30 17:41:37 +0200
committerDominik Holland <dominik.holland@pelagicore.com>2016-09-01 08:47:38 +0000
commitdae966c9ed509bab775a30e85364a64b77290081 (patch)
tree162dcf907ee7153401a2b37c93f6230009d9c0d1 /plugins
parentdc7f8ff7c14e25f109990dd0cd42776e40d389b0 (diff)
Moved the cluster detection into the AutoConfig.qml
This is needed as also the multi-process applications need to know whether to display the cluster widget and how big it can be rendered Change-Id: I589439f50fa3aa60630dd7b1fb6e4008a3d1b8c2 Reviewed-by: Nedim Hadzic <nedim.hadzic@pelagicore.com>
Diffstat (limited to 'plugins')
-rw-r--r--plugins/screenManager/screenmanager.cpp8
-rw-r--r--plugins/screenManager/screenmanager.h4
2 files changed, 8 insertions, 4 deletions
diff --git a/plugins/screenManager/screenmanager.cpp b/plugins/screenManager/screenmanager.cpp
index 72a6bba..660c770 100644
--- a/plugins/screenManager/screenmanager.cpp
+++ b/plugins/screenManager/screenmanager.cpp
@@ -55,7 +55,11 @@ void ScreenManager::setScreen(QWindow *window, int screen)
}
}
-QList<QScreen *> ScreenManager::availableScreens() const
+QList<QObject *> ScreenManager::availableScreens() const
{
- return QGuiApplication::screens();
+ QList<QObject *> list;
+ for (QScreen *screen : QGuiApplication::screens())
+ list.append(screen);
+
+ return list;
}
diff --git a/plugins/screenManager/screenmanager.h b/plugins/screenManager/screenmanager.h
index e9f6af8..3b92b01 100644
--- a/plugins/screenManager/screenmanager.h
+++ b/plugins/screenManager/screenmanager.h
@@ -39,14 +39,14 @@ class ScreenManager : public QObject
{
Q_OBJECT
- Q_PROPERTY(QList<QScreen*> availableScreens READ availableScreens NOTIFY availableScreensChanged)
+ Q_PROPERTY(QList<QObject*> availableScreens READ availableScreens NOTIFY availableScreensChanged)
public:
explicit ScreenManager(QObject *parent = 0);
Q_INVOKABLE int screenCount() const;
Q_INVOKABLE void setScreen(QWindow * window, int screen);
- QList<QScreen*> availableScreens() const;
+ QList<QObject*> availableScreens() const;
signals:
void availableScreensChanged();