Merge remote-tracking branch 'origin/4.4'

Change-Id: I778acc044ac105a11054b314aecac5b1c2cfee6a
This commit is contained in:
Eike Ziller
2017-07-18 15:23:29 +02:00
78 changed files with 937 additions and 446 deletions

View File

@@ -27,6 +27,8 @@
#include "ObjectiveCTypeQualifiers.h"
#include "QtContextKeywords.h"
#include <utils/qtcfallthrough.h>
#include <unordered_map>
#include <utility>
@@ -442,7 +444,7 @@ bool Parser::skipUntilStatement()
case T_AT_THROW:
if (_languageFeatures.objCEnabled)
return true;
Q_FALLTHROUGH();
default:
consumeToken();
}