From f472f05f888436bb3c39362ae8ad718c21b4d838 Mon Sep 17 00:00:00 2001 From: Jarkko Koivikko Date: Wed, 7 May 2014 12:38:03 +0300 Subject: Fix undefined qml type for EnterKeyAction.Id The actual type is enum but it cannot be used because there is an ambiguity in registering the enum used by the attached property (egg chicken dilemma). This problem is limited to Qt versions below 5.3. In Qt 5.3 it works with enum type too. Change-Id: Ic237b67fa10b7326e99b89204a189755ba2b7e6f Reviewed-by: Simon Hausmann Reviewed-by: Mitch Curtis --- src/virtualkeyboard/enterkeyactionattachedtype.h | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) (limited to 'src/virtualkeyboard/enterkeyactionattachedtype.h') diff --git a/src/virtualkeyboard/enterkeyactionattachedtype.h b/src/virtualkeyboard/enterkeyactionattachedtype.h index d04b240c..cf5b93b1 100644 --- a/src/virtualkeyboard/enterkeyactionattachedtype.h +++ b/src/virtualkeyboard/enterkeyactionattachedtype.h @@ -25,15 +25,15 @@ class EnterKeyActionAttachedType : public QObject { Q_OBJECT - Q_PROPERTY(EnterKeyAction::Id actionId READ actionId WRITE setActionId NOTIFY actionIdChanged) + Q_PROPERTY(int actionId READ actionId WRITE setActionId NOTIFY actionIdChanged) Q_PROPERTY(QString label READ label WRITE setLabel NOTIFY labelChanged) Q_PROPERTY(bool enabled READ enabled WRITE setEnabled NOTIFY enabledChanged) public: explicit EnterKeyActionAttachedType(QObject *parent); - EnterKeyAction::Id actionId() const; - void setActionId(EnterKeyAction::Id actionId); + int actionId() const; + void setActionId(int actionId); QString label() const; void setLabel(const QString& label); bool enabled() const; @@ -45,7 +45,7 @@ signals: void enabledChanged(); private: - EnterKeyAction::Id m_actionId; + int m_actionId; QString m_label; bool m_enabled; }; -- cgit v1.2.3