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 | |
| 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')
4 files changed, 3 insertions, 2 deletions
diff --git a/sources/pyside6/PySide6/QtCore/CMakeLists.txt b/sources/pyside6/PySide6/QtCore/CMakeLists.txt index df332da58..064e0688d 100644 --- a/sources/pyside6/PySide6/QtCore/CMakeLists.txt +++ b/sources/pyside6/PySide6/QtCore/CMakeLists.txt @@ -76,6 +76,7 @@ ${QtCore_GEN_DIR}/qjsonarray_wrapper.cpp ${QtCore_GEN_DIR}/qjsondocument_wrapper.cpp ${QtCore_GEN_DIR}/qjsonparseerror_wrapper.cpp ${QtCore_GEN_DIR}/qjsonvalue_wrapper.cpp +${QtCore_GEN_DIR}/qkeycombination_wrapper.cpp ${QtCore_GEN_DIR}/qlibraryinfo_wrapper.cpp ${QtCore_GEN_DIR}/qline_wrapper.cpp ${QtCore_GEN_DIR}/qlinef_wrapper.cpp 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"/> diff --git a/sources/pyside6/PySide6/QtGui/CMakeLists.txt b/sources/pyside6/PySide6/QtGui/CMakeLists.txt index 8e4601c4f..43f136abf 100644 --- a/sources/pyside6/PySide6/QtGui/CMakeLists.txt +++ b/sources/pyside6/PySide6/QtGui/CMakeLists.txt @@ -76,7 +76,6 @@ ${QtGui_GEN_DIR}/qinputmethodevent_attribute_wrapper.cpp ${QtGui_GEN_DIR}/qinputmethodevent_wrapper.cpp ${QtGui_GEN_DIR}/qinputmethodqueryevent_wrapper.cpp ${QtGui_GEN_DIR}/qintvalidator_wrapper.cpp -${QtGui_GEN_DIR}/qkeycombination_wrapper.cpp ${QtGui_GEN_DIR}/qkeyevent_wrapper.cpp ${QtGui_GEN_DIR}/qkeysequence_wrapper.cpp ${QtGui_GEN_DIR}/qlineargradient_wrapper.cpp diff --git a/sources/pyside6/PySide6/QtGui/typesystem_gui_common.xml b/sources/pyside6/PySide6/QtGui/typesystem_gui_common.xml index f6a03a79a..888c71e09 100644 --- a/sources/pyside6/PySide6/QtGui/typesystem_gui_common.xml +++ b/sources/pyside6/PySide6/QtGui/typesystem_gui_common.xml @@ -343,7 +343,6 @@ <object-type name="QInputMethod"> <enum-type name="Action"/> </object-type> - <value-type name="QKeyCombination"/> <value-type name="QKeySequence"> <enum-type name="SequenceFormat"/> <enum-type name="SequenceMatch"/> |