summaryrefslogtreecommitdiffstats
path: root/src/gui/text/qtextengine.cpp
diff options
context:
space:
mode:
authorGiuseppe D'Angelo <giuseppe.dangelo@kdab.com>2017-04-03 20:53:17 +0100
committerGiuseppe D'Angelo <giuseppe.dangelo@kdab.com>2017-04-04 14:26:34 +0000
commitecceaec8581886e5215ab10c8f5c702e315cb397 (patch)
treeca3991dc5ba035479839d52ba1213697a676cd72 /src/gui/text/qtextengine.cpp
parent5b78fcd03b63241fa0382aa196afe789740fd5b6 (diff)
GCC 7: fix -Werror=implicit-fallthrough
More fallthrough-are-errors fixed. Change-Id: I9a6cb6efe988400ed3f9cb95d1e426dac317e6c4 Reviewed-by: Allan Sandfeld Jensen <allan.jensen@qt.io> Reviewed-by: Marc Mutz <marc.mutz@kdab.com>
Diffstat (limited to 'src/gui/text/qtextengine.cpp')
-rw-r--r--src/gui/text/qtextengine.cpp7
1 files changed, 6 insertions, 1 deletions
diff --git a/src/gui/text/qtextengine.cpp b/src/gui/text/qtextengine.cpp
index 67cafa53fe..4f052dafd7 100644
--- a/src/gui/text/qtextengine.cpp
+++ b/src/gui/text/qtextengine.cpp
@@ -579,12 +579,14 @@ static bool bidiItemize(QTextEngine *engine, QScriptAnalysis *analysis, QBidiCon
else
eor = current;
status.eor = QChar::DirEN;
- dir = QChar::DirAN; break;
+ dir = QChar::DirAN;
+ break;
case QChar::DirES:
case QChar::DirCS:
if(status.eor == QChar::DirEN || dir == QChar::DirAN) {
eor = current; break;
}
+ Q_FALLTHROUGH();
case QChar::DirBN:
case QChar::DirB:
case QChar::DirS:
@@ -614,11 +616,13 @@ static bool bidiItemize(QTextEngine *engine, QScriptAnalysis *analysis, QBidiCon
eor = current; status.eor = dirCurrent;
}
}
+ break;
default:
break;
}
break;
}
+ Q_FALLTHROUGH();
case QChar::DirAN:
hasBidi = true;
dirCurrent = QChar::DirAN;
@@ -642,6 +646,7 @@ static bool bidiItemize(QTextEngine *engine, QScriptAnalysis *analysis, QBidiCon
if(status.eor == QChar::DirAN) {
eor = current; break;
}
+ Q_FALLTHROUGH();
case QChar::DirES:
case QChar::DirET:
case QChar::DirBN: