forked from qt-creator/qt-creator
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:
committed by
Orgad Shaneh
parent
eb9172d1a0
commit
e54c514984
@@ -32,6 +32,8 @@
|
|||||||
#include <QtCore/qvarlengtharray.h>
|
#include <QtCore/qvarlengtharray.h>
|
||||||
#include <QtCore/qdebug.h>
|
#include <QtCore/qdebug.h>
|
||||||
|
|
||||||
|
#include <utils/qtcfallthrough.h>
|
||||||
|
|
||||||
QT_BEGIN_NAMESPACE
|
QT_BEGIN_NAMESPACE
|
||||||
Q_CORE_EXPORT double qstrtod(const char *s00, char const **se, bool *ok);
|
Q_CORE_EXPORT double qstrtod(const char *s00, char const **se, bool *ok);
|
||||||
QT_END_NAMESPACE
|
QT_END_NAMESPACE
|
||||||
|
|||||||
@@ -30,6 +30,8 @@
|
|||||||
#include <QTextBlock>
|
#include <QTextBlock>
|
||||||
#include <QTextDocument>
|
#include <QTextDocument>
|
||||||
|
|
||||||
|
#include <utils/qtcfallthrough.h>
|
||||||
|
|
||||||
static Q_LOGGING_CATEGORY(formatterLog, "qtc.qmljs.formatter")
|
static Q_LOGGING_CATEGORY(formatterLog, "qtc.qmljs.formatter")
|
||||||
|
|
||||||
namespace QmlJS {
|
namespace QmlJS {
|
||||||
|
|||||||
@@ -29,6 +29,8 @@
|
|||||||
#include "qmljsvalueowner.h"
|
#include "qmljsvalueowner.h"
|
||||||
#include "parser/qmljsast_p.h"
|
#include "parser/qmljsast_p.h"
|
||||||
|
|
||||||
|
#include <utils/qtcfallthrough.h>
|
||||||
|
|
||||||
using namespace QmlJS;
|
using namespace QmlJS;
|
||||||
|
|
||||||
/*!
|
/*!
|
||||||
|
|||||||
@@ -266,7 +266,7 @@ SshTcpIpForwardServer::Ptr SshChannelManager::createForwardServer(const QString
|
|||||||
switch (state) {
|
switch (state) {
|
||||||
case SshTcpIpForwardServer::Closing:
|
case SshTcpIpForwardServer::Closing:
|
||||||
m_listeningForwardServers.removeOne(server);
|
m_listeningForwardServers.removeOne(server);
|
||||||
Q_FALLTHROUGH();
|
// fall through
|
||||||
case SshTcpIpForwardServer::Initializing:
|
case SshTcpIpForwardServer::Initializing:
|
||||||
m_waitingForwardServers.append(server);
|
m_waitingForwardServers.append(server);
|
||||||
break;
|
break;
|
||||||
|
|||||||
@@ -519,7 +519,7 @@ void SshConnectionPrivate::handleServiceAcceptPacket()
|
|||||||
switch (m_connParams.authenticationType) {
|
switch (m_connParams.authenticationType) {
|
||||||
case SshConnectionParameters::AuthenticationTypeTryAllPasswordBasedMethods:
|
case SshConnectionParameters::AuthenticationTypeTryAllPasswordBasedMethods:
|
||||||
m_triedAllPasswordBasedMethods = false;
|
m_triedAllPasswordBasedMethods = false;
|
||||||
Q_FALLTHROUGH();
|
// Fall-through.
|
||||||
case SshConnectionParameters::AuthenticationTypePassword:
|
case SshConnectionParameters::AuthenticationTypePassword:
|
||||||
m_sendFacility.sendUserAuthByPasswordRequestPacket(m_connParams.userName().toUtf8(),
|
m_sendFacility.sendUserAuthByPasswordRequestPacket(m_connParams.userName().toUtf8(),
|
||||||
SshCapabilities::SshConnectionService, m_connParams.password().toUtf8());
|
SshCapabilities::SshConnectionService, m_connParams.password().toUtf8());
|
||||||
|
|||||||
@@ -27,7 +27,7 @@
|
|||||||
|
|
||||||
#include "demanglerexceptions.h"
|
#include "demanglerexceptions.h"
|
||||||
|
|
||||||
#include <utils/qtcfallthrough.h>
|
#include "../../../libs/utils/qtcfallthrough.h"
|
||||||
|
|
||||||
#include <iostream>
|
#include <iostream>
|
||||||
#include <cctype>
|
#include <cctype>
|
||||||
|
|||||||
@@ -51,8 +51,6 @@
|
|||||||
|
|
||||||
#include "json.h"
|
#include "json.h"
|
||||||
|
|
||||||
#include "../../libs/utils/qtcfallthrough.h"
|
|
||||||
|
|
||||||
//#define PARSER_DEBUG
|
//#define PARSER_DEBUG
|
||||||
#ifdef PARSER_DEBUG
|
#ifdef PARSER_DEBUG
|
||||||
static int indent = 0;
|
static int indent = 0;
|
||||||
@@ -4844,7 +4842,7 @@ bool Value::isValid(const Base *b) const
|
|||||||
case JsonValue::Double:
|
case JsonValue::Double:
|
||||||
if (intValue)
|
if (intValue)
|
||||||
break;
|
break;
|
||||||
Q_FALLTHROUGH();
|
// fall through
|
||||||
case JsonValue::String:
|
case JsonValue::String:
|
||||||
case JsonValue::Array:
|
case JsonValue::Array:
|
||||||
case JsonValue::Object:
|
case JsonValue::Object:
|
||||||
@@ -4923,7 +4921,7 @@ uint32_t Value::valueToStore(const JsonValue &v, uint32_t offset)
|
|||||||
if (c != INT_MAX)
|
if (c != INT_MAX)
|
||||||
return c;
|
return c;
|
||||||
}
|
}
|
||||||
Q_FALLTHROUGH();
|
// fall through
|
||||||
case JsonValue::String:
|
case JsonValue::String:
|
||||||
case JsonValue::Array:
|
case JsonValue::Array:
|
||||||
case JsonValue::Object:
|
case JsonValue::Object:
|
||||||
|
|||||||
Reference in New Issue
Block a user