diff options
| author | Debao Zhang <hello@debao.me> | 2015-03-23 23:32:23 +0800 |
|---|---|---|
| committer | Debao Zhang <hello@debao.me> | 2015-03-26 06:10:05 +0000 |
| commit | b798b53db718d0eb0dad31a3b9bfe81d4ec76af6 (patch) | |
| tree | 1e289f2452570252a00530bddf326e3473b988ed /src | |
| parent | 28295915bc43e07566cc1e5a5bee6f6d3b9e93d7 (diff) | |
Don't remove mnemonics and parentheses under non-Mac system.
SHA: 8e3aacf61bcfe036acdba8fac4d07d68ff0f5ab3 is a mac only patch, but
some code introduced by which is not wrapped with Q_OS_MAC. So add
the missing Q_OS_MAC here.
Change-Id: I748d46b977740e6116dab5659ad1e47d23262a0f
Reviewed-by: Friedemann Kleint <Friedemann.Kleint@theqtcompany.com>
Diffstat (limited to 'src')
| -rw-r--r-- | src/gui/painting/qpainter.cpp | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/src/gui/painting/qpainter.cpp b/src/gui/painting/qpainter.cpp index 6f00abfc5f..973c9da96c 100644 --- a/src/gui/painting/qpainter.cpp +++ b/src/gui/painting/qpainter.cpp @@ -7462,6 +7462,7 @@ start_lengthVariant: range.format.setFontUnderline(true); underlineFormats.append(range); } +#ifdef Q_OS_MAC } else if (hidemnmemonic && *cin == QLatin1Char('(') && l >= 4 && cin[1] == QLatin1Char('&') && cin[2] != QLatin1Char('&') && cin[3] == QLatin1Char(')')) { @@ -7473,6 +7474,7 @@ start_lengthVariant: length -= n + 4; l -= 4; continue; +#endif //Q_OS_MAC } *cout = *cin; ++cout; |