diff options
author | Frederik Gladhorn <frederik.gladhorn@digia.com> | 2014-03-17 12:17:42 +0100 |
---|---|---|
committer | Frederik Gladhorn <frederik.gladhorn@digia.com> | 2014-03-17 12:29:11 +0100 |
commit | a2850e54d5ec7bc02c265459e3b8c8958df2e595 (patch) | |
tree | 2a1e9940ad96387b8731d15d04ca6ae21892f091 /src/gui/text | |
parent | 8212e0cfad754d65146a21c95f38deaac8ffe8e1 (diff) | |
parent | f15d9e6ccd006a2b47b50ae755fbe9534748a2eb (diff) |
Merge remote-tracking branch 'origin/release' into stable
Conflicts:
src/gui/painting/qdrawhelper.cpp
src/gui/painting/qdrawhelper_avx.cpp
src/gui/painting/qdrawhelper_x86_p.h
Change-Id: I09352d05119f6fd000319074a2705b38361b2c90
Diffstat (limited to 'src/gui/text')
-rw-r--r-- | src/gui/text/qcssparser_p.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/gui/text/qcssparser_p.h b/src/gui/text/qcssparser_p.h index b087a2384a..123a53c5cc 100644 --- a/src/gui/text/qcssparser_p.h +++ b/src/gui/text/qcssparser_p.h @@ -508,7 +508,7 @@ const quint64 PseudoClass_EditFocus = Q_UINT64_C(0x0000080000000000); const quint64 PseudoClass_Alternate = Q_UINT64_C(0x0000100000000000); // The Any specifier is never generated, but can be used as a wildcard in searches. const quint64 PseudoClass_Any = Q_UINT64_C(0x0000ffffffffffff); -const int NumPseudos = 46; +const int NumPseudos = 45; struct Pseudo { |