diff options
author | Liang Qi <liang.qi@qt.io> | 2017-04-12 09:38:34 +0200 |
---|---|---|
committer | Liang Qi <liang.qi@qt.io> | 2017-04-12 09:38:34 +0200 |
commit | 3a44e86cdceba7acc6b830274968b0dfa482f5a8 (patch) | |
tree | a79d85a9f3af64c874b87329a9045a41999f6f29 /src/xmlpatterns/functions | |
parent | befda75eb0adc1a4b39e7f8e0c78d667160a6c41 (diff) | |
parent | f799a226b1025bf7158bc00dff35ee060f57a137 (diff) | |
download | qtxmlpatterns-3a44e86cdceba7acc6b830274968b0dfa482f5a8.tar.gz |
Merge remote-tracking branch 'origin/5.8' into 5.9v5.9.0-beta2
Change-Id: Iad56858cfdc688957e7a8426f908ab0a641a3312
Diffstat (limited to 'src/xmlpatterns/functions')
-rw-r--r-- | src/xmlpatterns/functions/qerrorfn.cpp | 5 | ||||
-rw-r--r-- | src/xmlpatterns/functions/qsystempropertyfn.cpp | 3 |
2 files changed, 3 insertions, 5 deletions
diff --git a/src/xmlpatterns/functions/qerrorfn.cpp b/src/xmlpatterns/functions/qerrorfn.cpp index 19e9440..90f18c0 100644 --- a/src/xmlpatterns/functions/qerrorfn.cpp +++ b/src/xmlpatterns/functions/qerrorfn.cpp @@ -61,10 +61,11 @@ Item ErrorFN::evaluateSingleton(const DynamicContext::Ptr &context) const return Item(); } case 3: - /* Fallthrough, we don't use the 'error object' param. */ + /* Fallthrough, we don't use the 'error object' param. */ + Q_FALLTHROUGH(); case 2: msg = m_operands.at(1)->evaluateSingleton(context).stringValue(); - /* Fall through. */ + Q_FALLTHROUGH(); case 1: { const QNameValue::Ptr qName(m_operands.first()->evaluateSingleton(context).as<QNameValue>()); diff --git a/src/xmlpatterns/functions/qsystempropertyfn.cpp b/src/xmlpatterns/functions/qsystempropertyfn.cpp index 188a9a6..71a8d68 100644 --- a/src/xmlpatterns/functions/qsystempropertyfn.cpp +++ b/src/xmlpatterns/functions/qsystempropertyfn.cpp @@ -85,11 +85,8 @@ QString SystemPropertyFN::retrieveProperty(const QXmlName name) case StandardLocalNames::product_version: return QLatin1String("0.1"); case StandardLocalNames::is_schema_aware: - /* Fallthrough. */ case StandardLocalNames::supports_backwards_compatibility: - /* Fallthrough. */ case StandardLocalNames::supports_serialization: - /* Fallthrough. */ return QLatin1String("no"); default: return QString(); |