From 7cd3e83fbc73a6442aaf761da94b0326e04bf5a7 Mon Sep 17 00:00:00 2001 From: Alessio Morale Date: Mon, 13 Jan 2014 01:48:33 +0100 Subject: [PATCH] OP-1150/OP-1068 Fix signal name in wizardmodel --- .../src/plugins/config/calibration/wizardmodel.h | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/ground/openpilotgcs/src/plugins/config/calibration/wizardmodel.h b/ground/openpilotgcs/src/plugins/config/calibration/wizardmodel.h index 1f3052d03..7978753ba 100644 --- a/ground/openpilotgcs/src/plugins/config/calibration/wizardmodel.h +++ b/ground/openpilotgcs/src/plugins/config/calibration/wizardmodel.h @@ -31,12 +31,13 @@ #include #include #include "wizardstate.h" +#include class WizardModel : public QStateMachine { Q_OBJECT Q_PROPERTY(QQmlListProperty steps READ steps CONSTANT) - Q_PROPERTY(QString instructions READ instructions NOTIFY instructionChanged) + Q_PROPERTY(QString instructions READ instructions NOTIFY instructionsChanged) Q_PROPERTY(WizardState* currentState READ currentState NOTIFY currentStateChanged) public: explicit WizardModel(QObject *parent = 0); @@ -51,7 +52,7 @@ public: void setInstructions(QString instructions){ m_instructions = instructions; - emit instructionChanged(); + emit instructionsChanged(instructions); } WizardState *currentState(); protected: @@ -59,8 +60,8 @@ protected: private: QString m_instructions; signals: - void instructionChanged(); - void currentStateChanged(); + void instructionsChanged(QString status); + void currentStateChanged(WizardState *status); public slots: };