Fix build with Qt 5.6 / qtcreator.qbs

Broke with:

  Introduce Q_FALLTHROUGH()
  commit f482270432

Change-Id: I4f99f9a4d8a56ab1358be53f83aa0c449cff69a8
Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>
Reviewed-by: Orgad Shaneh <orgads@gmail.com>
This commit is contained in:
Nikolai Kosjar
2018-01-24 16:36:41 +01:00
committed by Orgad Shaneh
parent eb9172d1a0
commit e54c514984
7 changed files with 11 additions and 7 deletions

View File

@@ -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

View File

@@ -30,6 +30,8 @@
#include <QTextBlock>
#include <QTextDocument>
#include <utils/qtcfallthrough.h>
static Q_LOGGING_CATEGORY(formatterLog, "qtc.qmljs.formatter")
namespace QmlJS {

View File

@@ -29,6 +29,8 @@
#include "qmljsvalueowner.h"
#include "parser/qmljsast_p.h"
#include <utils/qtcfallthrough.h>
using namespace QmlJS;
/*!

View File

@@ -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;

View File

@@ -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());

View File

@@ -27,7 +27,7 @@
#include "demanglerexceptions.h"
#include <utils/qtcfallthrough.h>
#include "../../../libs/utils/qtcfallthrough.h"
#include <iostream>
#include <cctype>

View File

@@ -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: