diff options
| author | Ulf Hermann <ulf.hermann@qt.io> | 2019-09-10 11:02:53 +0200 |
|---|---|---|
| committer | Ulf Hermann <ulf.hermann@qt.io> | 2019-10-15 16:05:52 +0200 |
| commit | bccf872b94944dfa476ccedc1d1a45d380703e15 (patch) | |
| tree | 69044e2578015a94c1d2e1c92d76f2f0e2107a10 /src/quick/items/qquickscreen_p.h | |
| parent | 3d0bec491e6d823df510ba12dba38be820116e86 (diff) | |
Move type declarations for QtQuick.Window* into imports/window
We want only one URI per library or plugin, so that we can centrally
register the types.
Change-Id: Ibc7305f102503ce672f8751771779102be44e014
Reviewed-by: Simon Hausmann <simon.hausmann@qt.io>
Reviewed-by: Fabian Kosmale <fabian.kosmale@qt.io>
Diffstat (limited to 'src/quick/items/qquickscreen_p.h')
| -rw-r--r-- | src/quick/items/qquickscreen_p.h | 14 |
1 files changed, 4 insertions, 10 deletions
diff --git a/src/quick/items/qquickscreen_p.h b/src/quick/items/qquickscreen_p.h index 9d9f9a1567..61cbdf7387 100644 --- a/src/quick/items/qquickscreen_p.h +++ b/src/quick/items/qquickscreen_p.h @@ -54,7 +54,7 @@ #include <qqml.h> #include <QRect> #include <QSize> -#include <private/qqmlglobal_p.h> +#include <private/qtquickglobal_p.h> QT_BEGIN_NAMESPACE @@ -64,7 +64,7 @@ class QQuickWindow; class QScreen; -class Q_AUTOTEST_EXPORT QQuickScreenInfo : public QObject +class Q_QUICK_PRIVATE_EXPORT QQuickScreenInfo : public QObject { Q_OBJECT Q_PROPERTY(QString name READ name NOTIFY nameChanged) @@ -86,10 +86,6 @@ class Q_AUTOTEST_EXPORT QQuickScreenInfo : public QObject Q_PROPERTY(int virtualX READ virtualX NOTIFY virtualXChanged REVISION 3) Q_PROPERTY(int virtualY READ virtualY NOTIFY virtualYChanged REVISION 3) - QML_NAMED_ELEMENT(ScreenInfo) - QML_ADDED_IN_MINOR_VERSION(3) - QML_UNCREATABLE("ScreenInfo can only be used via the attached property.") - public: QQuickScreenInfo(QObject *parent = nullptr, QScreen *wrappedScreen = nullptr); @@ -132,7 +128,7 @@ protected: QPointer<QScreen> m_screen; }; -class Q_AUTOTEST_EXPORT QQuickScreenAttached : public QQuickScreenInfo +class Q_QUICK_PRIVATE_EXPORT QQuickScreenAttached : public QQuickScreenInfo { Q_OBJECT Q_PROPERTY(Qt::ScreenOrientations orientationUpdateMask READ orientationUpdateMask @@ -162,11 +158,9 @@ private: bool m_updateMaskSet; }; -class Q_AUTOTEST_EXPORT QQuickScreen : public QObject +class Q_QUICK_PRIVATE_EXPORT QQuickScreen : public QObject { Q_OBJECT - QML_NAMED_ELEMENT(Screen) - QML_UNCREATABLE("Screen can only be used via the attached property.") QML_ATTACHED(QQuickScreenAttached) public: |