Merge remote-tracking branch 'origin/dev' into wip/pointerhandler

Change-Id: I7962fd2282792c43af69784c8e98fb050fd928a7

4 files changed, 4 insertions, 4 deletions

diff --git a/src/imports/statemachine/signaltransition.cpp b/src/imports/statemachine/signaltransition.cpp
index 2e6381fc08..44fbf69431 100644
--- a/src/imports/statemachine/signaltransition.cpp
+++ b/src/imports/statemachine/signaltransition.cpp
@@ -127,7 +127,7 @@ void SignalTransition::setSignal(const QJSValue &signal)
         Q_ASSERT(sender);
         signalMethod = sender->metaObject()->method(signalObject->signalIndex());
     } else {
-        qmlInfo(this) << tr("Specified signal does not exist.");
+        qmlWarning(this) << tr("Specified signal does not exist.");
         return;
     }
 
diff --git a/src/imports/statemachine/state.cpp b/src/imports/statemachine/state.cpp
index 09d246cc1e..f1294b0de0 100644
--- a/src/imports/statemachine/state.cpp
+++ b/src/imports/statemachine/state.cpp
@@ -54,7 +54,7 @@ void State::componentComplete()
         static bool once = false;
         if (!once) {
             once = true;
-            qmlInfo(this) << "No top level StateMachine found.  Nothing will run without a StateMachine.";
+            qmlWarning(this) << "No top level StateMachine found.  Nothing will run without a StateMachine.";
         }
     }
 }
diff --git a/src/imports/statemachine/statemachine.cpp b/src/imports/statemachine/statemachine.cpp
index 76de01fe94..a9ea5f7a95 100644
--- a/src/imports/statemachine/statemachine.cpp
+++ b/src/imports/statemachine/statemachine.cpp
@@ -69,7 +69,7 @@ void StateMachine::setRunning(bool running)
 void StateMachine::componentComplete()
 {
     if (QStateMachine::initialState() == NULL && childMode() == QState::ExclusiveStates)
-         qmlInfo(this) << "No initial state set for StateMachine";
+         qmlWarning(this) << "No initial state set for StateMachine";
 
     // Everything is proper setup, now start the state-machine if we got
     // asked to do so.
diff --git a/src/imports/statemachine/timeouttransition.cpp b/src/imports/statemachine/timeouttransition.cpp
index 4bb1df3c28..0d208b919b 100644
--- a/src/imports/statemachine/timeouttransition.cpp
+++ b/src/imports/statemachine/timeouttransition.cpp
@@ -72,7 +72,7 @@ void TimeoutTransition::componentComplete()
 {
     QState *state = qobject_cast<QState*>(parent());
     if (!state) {
-        qmlInfo(this) << "Parent needs to be a State";
+        qmlWarning(this) << "Parent needs to be a State";
         return;
     }