diff options
Diffstat (limited to 'src/quick/items/qquickscreen_p.h')
| -rw-r--r-- | src/quick/items/qquickscreen_p.h | 42 |
1 files changed, 21 insertions, 21 deletions
diff --git a/src/quick/items/qquickscreen_p.h b/src/quick/items/qquickscreen_p.h index 059c33b0b7..02d33a1523 100644 --- a/src/quick/items/qquickscreen_p.h +++ b/src/quick/items/qquickscreen_p.h @@ -18,6 +18,8 @@ #include <QtQml/qqml.h> #include <QtQuick/private/qtquickglobal_p.h> +#include <QtCore/qpointer.h> + QT_BEGIN_NAMESPACE @@ -26,25 +28,25 @@ class QQuickWindow; class QScreen; -class Q_QUICK_PRIVATE_EXPORT QQuickScreenInfo : public QObject +class Q_QUICK_EXPORT QQuickScreenInfo : public QObject { Q_OBJECT - Q_PROPERTY(QString name READ name NOTIFY nameChanged) - Q_PROPERTY(QString manufacturer READ manufacturer NOTIFY manufacturerChanged REVISION(2, 10)) - Q_PROPERTY(QString model READ model NOTIFY modelChanged REVISION(2, 10)) - Q_PROPERTY(QString serialNumber READ serialNumber NOTIFY serialNumberChanged REVISION(2, 10)) - Q_PROPERTY(int width READ width NOTIFY widthChanged) - Q_PROPERTY(int height READ height NOTIFY heightChanged) - Q_PROPERTY(int desktopAvailableWidth READ desktopAvailableWidth NOTIFY desktopGeometryChanged) - Q_PROPERTY(int desktopAvailableHeight READ desktopAvailableHeight NOTIFY desktopGeometryChanged) - Q_PROPERTY(qreal logicalPixelDensity READ logicalPixelDensity NOTIFY logicalPixelDensityChanged) - Q_PROPERTY(qreal pixelDensity READ pixelDensity NOTIFY pixelDensityChanged) - Q_PROPERTY(qreal devicePixelRatio READ devicePixelRatio NOTIFY devicePixelRatioChanged) - Q_PROPERTY(Qt::ScreenOrientation primaryOrientation READ primaryOrientation NOTIFY primaryOrientationChanged) - Q_PROPERTY(Qt::ScreenOrientation orientation READ orientation NOTIFY orientationChanged) - - Q_PROPERTY(int virtualX READ virtualX NOTIFY virtualXChanged REVISION(2, 3)) - Q_PROPERTY(int virtualY READ virtualY NOTIFY virtualYChanged REVISION(2, 3)) + Q_PROPERTY(QString name READ name NOTIFY nameChanged FINAL) + Q_PROPERTY(QString manufacturer READ manufacturer NOTIFY manufacturerChanged REVISION(2, 10) FINAL) + Q_PROPERTY(QString model READ model NOTIFY modelChanged REVISION(2, 10) FINAL) + Q_PROPERTY(QString serialNumber READ serialNumber NOTIFY serialNumberChanged REVISION(2, 10) FINAL) + Q_PROPERTY(int width READ width NOTIFY widthChanged FINAL) + Q_PROPERTY(int height READ height NOTIFY heightChanged FINAL) + Q_PROPERTY(int desktopAvailableWidth READ desktopAvailableWidth NOTIFY desktopGeometryChanged FINAL) + Q_PROPERTY(int desktopAvailableHeight READ desktopAvailableHeight NOTIFY desktopGeometryChanged FINAL) + Q_PROPERTY(qreal logicalPixelDensity READ logicalPixelDensity NOTIFY logicalPixelDensityChanged FINAL) + Q_PROPERTY(qreal pixelDensity READ pixelDensity NOTIFY pixelDensityChanged FINAL) + Q_PROPERTY(qreal devicePixelRatio READ devicePixelRatio NOTIFY devicePixelRatioChanged FINAL) + Q_PROPERTY(Qt::ScreenOrientation primaryOrientation READ primaryOrientation NOTIFY primaryOrientationChanged FINAL) + Q_PROPERTY(Qt::ScreenOrientation orientation READ orientation NOTIFY orientationChanged FINAL) + + Q_PROPERTY(int virtualX READ virtualX NOTIFY virtualXChanged REVISION(2, 3) FINAL) + Q_PROPERTY(int virtualY READ virtualY NOTIFY virtualYChanged REVISION(2, 3) FINAL) QML_NAMED_ELEMENT(ScreenInfo) QML_ADDED_IN_VERSION(2, 3) QML_UNCREATABLE("ScreenInfo can only be used via the attached property.") @@ -91,7 +93,7 @@ protected: QPointer<QScreen> m_screen; }; -class Q_QUICK_PRIVATE_EXPORT QQuickScreenAttached : public QQuickScreenInfo +class Q_QUICK_EXPORT QQuickScreenAttached : public QQuickScreenInfo { Q_OBJECT @@ -114,7 +116,7 @@ private: QQuickItem* m_attachee; }; -class Q_QUICK_PRIVATE_EXPORT QQuickScreen : public QObject +class Q_QUICK_EXPORT QQuickScreen : public QObject { Q_OBJECT QML_ATTACHED(QQuickScreenAttached) @@ -128,6 +130,4 @@ public: QT_END_NAMESPACE -QML_DECLARE_TYPE(QQuickScreenInfo) - #endif |