Fix build with Qt 5.6 / qtcreator.qbs

Broke with:

  Introduce Q_FALLTHROUGH()
  commit f482270432761e72b87fb368c2a379cd59b169b3

Change-Id: I4f99f9a4d8a56ab1358be53f83aa0c449cff69a8
Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>
Reviewed-by: Orgad Shaneh <orgads@gmail.com>

7 files changed, 11 insertions, 7 deletions

diff --git a/src/libs/qmljs/parser/qmljslexer.cpp b/src/libs/qmljs/parser/qmljslexer.cpp
index 0fa9c74805..caa69df1a2 100644
--- a/src/libs/qmljs/parser/qmljslexer.cpp
+++ b/src/libs/qmljs/parser/qmljslexer.cpp
@@ -32,6 +32,8 @@
 #include <QtCore/qvarlengtharray.h>
 #include <QtCore/qdebug.h>
 
+#include <utils/qtcfallthrough.h>
+
 QT_BEGIN_NAMESPACE
 Q_CORE_EXPORT double qstrtod(const char *s00, char const **se, bool *ok);
 QT_END_NAMESPACE
diff --git a/src/libs/qmljs/qmljscodeformatter.cpp b/src/libs/qmljs/qmljscodeformatter.cpp
index 8c34cdc4ac..70c1709406 100644
--- a/src/libs/qmljs/qmljscodeformatter.cpp
+++ b/src/libs/qmljs/qmljscodeformatter.cpp
@@ -30,6 +30,8 @@
 #include <QTextBlock>
 #include <QTextDocument>
 
+#include <utils/qtcfallthrough.h>
+
 static Q_LOGGING_CATEGORY(formatterLog, "qtc.qmljs.formatter")
 
 namespace QmlJS {
diff --git a/src/libs/qmljs/qmljsevaluate.cpp b/src/libs/qmljs/qmljsevaluate.cpp
index 26ba2e56b5..44414e27b9 100644
--- a/src/libs/qmljs/qmljsevaluate.cpp
+++ b/src/libs/qmljs/qmljsevaluate.cpp
@@ -29,6 +29,8 @@
 #include "qmljsvalueowner.h"
 #include "parser/qmljsast_p.h"
 
+#include <utils/qtcfallthrough.h>
+
 using namespace QmlJS;
 
 /*!
diff --git a/src/libs/ssh/sshchannelmanager.cpp b/src/libs/ssh/sshchannelmanager.cpp
index 589cdab73b..364d1dcfe2 100644
--- a/src/libs/ssh/sshchannelmanager.cpp
+++ b/src/libs/ssh/sshchannelmanager.cpp
@@ -266,7 +266,7 @@ SshTcpIpForwardServer::Ptr SshChannelManager::createForwardServer(const QString
         switch (state) {
         case SshTcpIpForwardServer::Closing:
             m_listeningForwardServers.removeOne(server);
-            Q_FALLTHROUGH();
+            // fall through
         case SshTcpIpForwardServer::Initializing:
             m_waitingForwardServers.append(server);
             break;
diff --git a/src/libs/ssh/sshconnection.cpp b/src/libs/ssh/sshconnection.cpp
index efcded094c..e1f98da06d 100644
--- a/src/libs/ssh/sshconnection.cpp
+++ b/src/libs/ssh/sshconnection.cpp
@@ -519,7 +519,7 @@ void SshConnectionPrivate::handleServiceAcceptPacket()
     switch (m_connParams.authenticationType) {
     case SshConnectionParameters::AuthenticationTypeTryAllPasswordBasedMethods:
         m_triedAllPasswordBasedMethods = false;
-        Q_FALLTHROUGH();
+        // Fall-through.
     case SshConnectionParameters::AuthenticationTypePassword:
         m_sendFacility.sendUserAuthByPasswordRequestPacket(m_connParams.userName().toUtf8(),
                 SshCapabilities::SshConnectionService, m_connParams.password().toUtf8());
diff --git a/src/plugins/debugger/namedemangler/parsetreenodes.cpp b/src/plugins/debugger/namedemangler/parsetreenodes.cpp
index 1d706e6c9b..4981791f71 100644
--- a/src/plugins/debugger/namedemangler/parsetreenodes.cpp
+++ b/src/plugins/debugger/namedemangler/parsetreenodes.cpp
@@ -27,7 +27,7 @@
 
 #include "demanglerexceptions.h"
 
-#include <utils/qtcfallthrough.h>
+#include "../../../libs/utils/qtcfallthrough.h"
 
 #include <iostream>
 #include <cctype>
diff --git a/src/shared/json/json.cpp b/src/shared/json/json.cpp
index eab44f4659..579fd21649 100644
--- a/src/shared/json/json.cpp
+++ b/src/shared/json/json.cpp
@@ -51,8 +51,6 @@
 
 #include "json.h"
 
-#include "../../libs/utils/qtcfallthrough.h"
-
 //#define PARSER_DEBUG
 #ifdef PARSER_DEBUG
 static int indent = 0;
@@ -4844,7 +4842,7 @@ bool Value::isValid(const Base *b) const
     case JsonValue::Double:
         if (intValue)
             break;
-        Q_FALLTHROUGH();
+        // fall through
     case JsonValue::String:
     case JsonValue::Array:
     case JsonValue::Object:
@@ -4923,7 +4921,7 @@ uint32_t Value::valueToStore(const JsonValue &v, uint32_t offset)
         if (c != INT_MAX)
             return c;
     }
-        Q_FALLTHROUGH();
+        // fall through
     case JsonValue::String:
     case JsonValue::Array:
     case JsonValue::Object: