diff options
| author | Friedemann Kleint <Friedemann.Kleint@qt.io> | 2020-12-10 16:40:54 +0100 |
|---|---|---|
| committer | Qt Cherry-pick Bot <cherrypick_bot@qt-project.org> | 2020-12-11 13:33:19 +0000 |
| commit | 820a12f45ae820f2857ae5a1ffbe3bcadae2a74f (patch) | |
| tree | 387354a6c4e4afcf35e7a91f92fb934ac3b808a5 /sources/pyside6/PySide6/QtCore/typesystem_core_common.xml | |
| parent | 1ea8cbad5cda99447c377647944fb8ff33c57768 (diff) | |
Move QKeyCombination from QtGui to QtCore
It was mistakenly added to QtGui, but it lives in
QtCore.
Change-Id: I398eb9735b4a4d6e570b054d288b1ef7ffa0478d
Reviewed-by: Christian Tismer <tismer@stackless.com>
Reviewed-by: Cristian Maureira-Fredes <cristian.maureira-fredes@qt.io>
(cherry picked from commit 6ccb3f64575696c8327aeb7c12f8f0ff99bdecf0)
Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
Diffstat (limited to 'sources/pyside6/PySide6/QtCore/typesystem_core_common.xml')
| -rw-r--r-- | sources/pyside6/PySide6/QtCore/typesystem_core_common.xml | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/sources/pyside6/PySide6/QtCore/typesystem_core_common.xml b/sources/pyside6/PySide6/QtCore/typesystem_core_common.xml index e865691dc..4baa5656b 100644 --- a/sources/pyside6/PySide6/QtCore/typesystem_core_common.xml +++ b/sources/pyside6/PySide6/QtCore/typesystem_core_common.xml @@ -352,6 +352,8 @@ </conversion-rule> </primitive-type> + <value-type name="QKeyCombination"/> + <value-type name="QMetaType"> <enum-type name="Type"/> <enum-type name="TypeFlag" flags="TypeFlags"/> |