2011-08-24 10:13:20 +00:00
|
|
|
TEMPLATE=subdirs
|
|
|
|
|
SUBDIRS=\
|
|
|
|
|
qflags \
|
|
|
|
|
q_func_info \
|
|
|
|
|
qgetputenv \
|
|
|
|
|
qglobal \
|
|
|
|
|
qnumeric \
|
2013-06-23 00:43:46 +00:00
|
|
|
qfloat16 \
|
Long live QKeyCombination!
C++20 via P1120 is deprecating arithmetic operations between
unrelated enumeration types, and GCC 10 is already complaining.
Hence, these operations might become illegal in C++23 or C++26 at
the latest.
A case of this that affects Qt is in key combinations: a
QKeySequence can be constructed by summing / ORing modifiers and a
key, for instance:
Qt::CTRL + Qt::Key_A
Qt::SHIFT | Qt::CTRL | Qt::Key_G (recommended, see below)
The problem is that the modifiers and the key belong to different
enumerations (and there's 2 enumerations for the modifier, and one
for the key).
To solve this: add a dedicated class to represent a combination of
keys, and operators between those enumerations to build instances
of this class.
I would've simply defined operator|, but again docs and pre-existing
code use operator+ as well, so added both to at least tackle simple
cases (modifier + key).
Multiple modifiers create a problem: operator+ between them yields
int, not the corresponding flags type (because operator+ is not
overloaded for this use case):
Qt::CTRL + Qt::SHIFT + Qt::Key_A
\__________________/ /
int /
\______________/
int
Not only this loses track of the datatypes involved, but it would
also then "add" the key (with NO warnings, now its int + enum, so
it's not mixing enums!) and yielding int again.
I don't want to special-case this; the point of the class is
that int is the wrong datatype. Everything works just fine when
using operator| instead:
Qt::CTRL | Qt::SHIFT | Qt::Key_A
\__________________/ /
Qt::Modifiers /
\______________/
QKeyCombination
So I'm defining operator+ so that the simple cases still work,
but also deprecating it.
Port some code around Qt to the new class. In certain cases,
it's a huge win for clarity. In some others, I've just added
the necessary casts to make it still compile without warnings,
without attempting refactorings.
[ChangeLog][QtCore][QKeyCombination] New class to represent
a combination of a key and zero or more modifiers, to be used
when defining shortcuts or similar.
[ChangeLog][Potentially Source-Incompatible Changes] A keyboard
modifier (such as Qt::CTRL, Qt::AltModifier, etc.) should be
combined with a key (such as Qt::Key_A, Qt::Key_F1, etc.) by using
operator|, not operator+. The result is now an object of type
QKeyCombination, that stores the key and the modifiers.
Change-Id: I657a3a328232f059023fff69c5031ee31cc91dd6
Reviewed-by: Volker Hilsheimer <volker.hilsheimer@qt.io>
2020-04-19 17:56:18 +00:00
|
|
|
qkeycombination \
|
2017-04-13 07:16:07 +00:00
|
|
|
qrandomgenerator \
|
2012-03-21 17:09:09 +00:00
|
|
|
qlogging \
|
2013-01-23 12:27:49 +00:00
|
|
|
qtendian \
|
|
|
|
|
qglobalstatic \
|
2020-11-05 10:03:12 +00:00
|
|
|
qhooks \
|
|
|
|
|
qoperatingsystemversion
|
2019-09-27 11:36:38 +00:00
|
|
|
|
2020-06-05 07:24:37 +00:00
|
|
|
win32: SUBDIRS += \
|
2019-09-27 11:36:38 +00:00
|
|
|
qwinregistry
|
