diff options
-rw-r--r-- | src/gui/kernel/qplatformscreen.cpp | 39 | ||||
-rw-r--r-- | src/gui/kernel/qplatformscreen.h | 4 | ||||
-rw-r--r-- | src/gui/kernel/qscreen.cpp | 36 | ||||
-rw-r--r-- | src/gui/kernel/qscreen.h | 7 |
4 files changed, 86 insertions, 0 deletions
diff --git a/src/gui/kernel/qplatformscreen.cpp b/src/gui/kernel/qplatformscreen.cpp index 1d519e84f9..bbe984bebe 100644 --- a/src/gui/kernel/qplatformscreen.cpp +++ b/src/gui/kernel/qplatformscreen.cpp @@ -280,6 +280,45 @@ QPlatformScreen * QPlatformScreen::platformScreenForWindow(const QWindow *window } /*! + Reimplement this function in subclass to return the manufacturer + of this screen. + + The default implementation returns an empty string. + + \since 5.9 +*/ +QString QPlatformScreen::manufacturer() const +{ + return QString(); +} + +/*! + Reimplement this function in subclass to return the model + of this screen. + + The default implementation returns an empty string. + + \since 5.9 +*/ +QString QPlatformScreen::model() const +{ + return QString(); +} + +/*! + Reimplement this function in subclass to return the serial number + of this screen. + + The default implementation returns an empty string. + + \since 5.9 +*/ +QString QPlatformScreen::serialNumber() const +{ + return QString(); +} + +/*! \class QPlatformScreen \since 4.8 \internal diff --git a/src/gui/kernel/qplatformscreen.h b/src/gui/kernel/qplatformscreen.h index 2d3cbaf170..aa32917b6c 100644 --- a/src/gui/kernel/qplatformscreen.h +++ b/src/gui/kernel/qplatformscreen.h @@ -129,6 +129,10 @@ public: virtual QString name() const { return QString(); } + virtual QString manufacturer() const; + virtual QString model() const; + virtual QString serialNumber() const; + virtual QPlatformCursor *cursor() const; virtual SubpixelAntialiasingType subpixelAntialiasingTypeHint() const; diff --git a/src/gui/kernel/qscreen.cpp b/src/gui/kernel/qscreen.cpp index 1dd8fb5e67..96f75f37eb 100644 --- a/src/gui/kernel/qscreen.cpp +++ b/src/gui/kernel/qscreen.cpp @@ -161,6 +161,42 @@ QString QScreen::name() const } /*! + \property QScreen::manufacturer + \brief the manufacturer of the screen + + \since 5.9 +*/ +QString QScreen::manufacturer() const +{ + Q_D(const QScreen); + return d->platformScreen->manufacturer(); +} + +/*! + \property QScreen::model + \brief the model of the screen + + \since 5.9 +*/ +QString QScreen::model() const +{ + Q_D(const QScreen); + return d->platformScreen->model(); +} + +/*! + \property QScreen::serialNumber + \brief the serial number of the screen + + \since 5.9 +*/ +QString QScreen::serialNumber() const +{ + Q_D(const QScreen); + return d->platformScreen->serialNumber(); +} + +/*! \property QScreen::depth \brief the color depth of the screen */ diff --git a/src/gui/kernel/qscreen.h b/src/gui/kernel/qscreen.h index 98e35aff43..8c9b16e08e 100644 --- a/src/gui/kernel/qscreen.h +++ b/src/gui/kernel/qscreen.h @@ -69,6 +69,9 @@ class Q_GUI_EXPORT QScreen : public QObject Q_DECLARE_PRIVATE(QScreen) Q_PROPERTY(QString name READ name CONSTANT) + Q_PROPERTY(QString manufacturer READ manufacturer CONSTANT) + Q_PROPERTY(QString model READ model CONSTANT) + Q_PROPERTY(QString serialNumber READ serialNumber CONSTANT) Q_PROPERTY(int depth READ depth CONSTANT) Q_PROPERTY(QSize size READ size NOTIFY geometryChanged) Q_PROPERTY(QSize availableSize READ availableSize NOTIFY availableGeometryChanged) @@ -97,6 +100,10 @@ public: QString name() const; + QString manufacturer() const; + QString model() const; + QString serialNumber() const; + int depth() const; QSize size() const; |