diff options
| author | Alan Alpert <aalpert@blackberry.com> | 2014-07-10 18:50:02 -0700 |
|---|---|---|
| committer | Alan Alpert <aalpert@blackberry.com> | 2014-07-29 03:26:14 +0200 |
| commit | 7ceca6ac0535a957e9f87f789119c288f6d93837 (patch) | |
| tree | ae0de9c67f4a7eb3a772f80a8edbb143d2bfe1a0 | |
| parent | 9098b291d7db40fe84688bef8adf79506d0265e9 (diff) | |
Remove metaobject revisioning for QQuickScreenAttached
Attached property versioning is not currently fully supported. Initial
approach was to add the version tags and not enforce them until you
could version attached properties. However the QML engine is currently
erroring on this. Specific error example:
""Screen.onNameChanged" is not available due to component versioning "
Workaround recommended in the JIRA task is to just not version them,
until attached property versioning is fully implemented.
Task-number: QTBUG-35569
Change-Id: I5ded7eb223ec00f70d847b3fac09ec240d5d7901
Reviewed-by: Shawn Rutledge <shawn.rutledge@digia.com>
| -rw-r--r-- | src/quick/items/qquickscreen_p.h | 18 |
1 files changed, 9 insertions, 9 deletions
diff --git a/src/quick/items/qquickscreen_p.h b/src/quick/items/qquickscreen_p.h index a155ff1843..25a1805a44 100644 --- a/src/quick/items/qquickscreen_p.h +++ b/src/quick/items/qquickscreen_p.h @@ -58,13 +58,13 @@ class Q_AUTOTEST_EXPORT QQuickScreenAttached : public QObject { Q_OBJECT - Q_PROPERTY(QString name READ name NOTIFY nameChanged REVISION 1); + Q_PROPERTY(QString name READ name NOTIFY nameChanged); Q_PROPERTY(int width READ width NOTIFY widthChanged) Q_PROPERTY(int height READ height NOTIFY heightChanged) - Q_PROPERTY(int desktopAvailableWidth READ desktopAvailableWidth NOTIFY desktopGeometryChanged REVISION 1) - Q_PROPERTY(int desktopAvailableHeight READ desktopAvailableHeight NOTIFY desktopGeometryChanged REVISION 1) - Q_PROPERTY(qreal logicalPixelDensity READ logicalPixelDensity NOTIFY logicalPixelDensityChanged REVISION 1) - Q_PROPERTY(qreal pixelDensity READ pixelDensity NOTIFY pixelDensityChanged REVISION 2) + 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(Qt::ScreenOrientation primaryOrientation READ primaryOrientation NOTIFY primaryOrientationChanged) Q_PROPERTY(Qt::ScreenOrientation orientation READ orientation NOTIFY orientationChanged) @@ -87,12 +87,12 @@ public: void windowChanged(QQuickWindow*); Q_SIGNALS: - Q_REVISION(1) void nameChanged(); + void nameChanged(); void widthChanged(); void heightChanged(); - Q_REVISION(1) void desktopGeometryChanged(); - Q_REVISION(1) void logicalPixelDensityChanged(); - Q_REVISION(2) void pixelDensityChanged(); + void desktopGeometryChanged(); + void logicalPixelDensityChanged(); + void pixelDensityChanged(); void primaryOrientationChanged(); void orientationChanged(); |