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 <simon.hausmann@digia.com>
Reviewed-by: Mitch Curtis <mitch.curtis@digia.com>

2 files changed, 6 insertions, 6 deletions

diff --git a/src/virtualkeyboard/enterkeyactionattachedtype.cpp b/src/virtualkeyboard/enterkeyactionattachedtype.cpp
index 23829eb1..a3f7bb1f 100644
--- a/src/virtualkeyboard/enterkeyactionattachedtype.cpp
+++ b/src/virtualkeyboard/enterkeyactionattachedtype.cpp
@@ -26,12 +26,12 @@ EnterKeyActionAttachedType::EnterKeyActionAttachedType(QObject *parent) :
 {
 }
 
-EnterKeyAction::Id EnterKeyActionAttachedType::actionId() const
+int EnterKeyActionAttachedType::actionId() const
 {
     return m_actionId;
 }
 
-void EnterKeyActionAttachedType::setActionId(EnterKeyAction::Id actionId)
+void EnterKeyActionAttachedType::setActionId(int actionId)
 {
     if (m_actionId != actionId) {
         m_actionId = actionId;
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;
 };