diff options
author | Friedemann Kleint <Friedemann.Kleint@qt.io> | 2022-09-09 08:04:39 +0200 |
---|---|---|
committer | Friedemann Kleint <Friedemann.Kleint@qt.io> | 2022-09-09 14:41:48 +0200 |
commit | 199f8994de53c88b2f1af0ae0d12e097b65db328 (patch) | |
tree | cc85588fd7849becd90c1138a4623ebc2290f195 | |
parent | a9964e611ed4d6416491ef3c57bd716c7ffc8493 (diff) |
Remove QtWinExtras
Task-number: QTBUG-89564
Change-Id: Iee2e2ac1acc608c746f84e9a28295b0016a4deed
Reviewed-by: Adrian Herrmann <adrian.herrmann@qt.io>
Reviewed-by: Christian Tismer <tismer@stackless.com>
5 files changed, 0 insertions, 87 deletions
diff --git a/sources/pyside6/PySide6/QtWinExtras/CMakeLists.txt b/sources/pyside6/PySide6/QtWinExtras/CMakeLists.txt deleted file mode 100644 index de86cc7c5..000000000 --- a/sources/pyside6/PySide6/QtWinExtras/CMakeLists.txt +++ /dev/null @@ -1,48 +0,0 @@ -project(QtWinExtras) - -set(QtWinExtras_SRC -${QtWinExtras_GEN_DIR}/qtwin_wrapper.cpp -${QtWinExtras_GEN_DIR}/qwincolorizationchangeevent_wrapper.cpp -${QtWinExtras_GEN_DIR}/qwincompositionchangeevent_wrapper.cpp -${QtWinExtras_GEN_DIR}/qwinevent_wrapper.cpp -${QtWinExtras_GEN_DIR}/qwinjumplist_wrapper.cpp -${QtWinExtras_GEN_DIR}/qwinjumplistcategory_wrapper.cpp -${QtWinExtras_GEN_DIR}/qwinjumplistitem_wrapper.cpp -#${QtWinExtras_GEN_DIR}/qwinmime_wrapper.cpp -${QtWinExtras_GEN_DIR}/qwintaskbarbutton_wrapper.cpp -${QtWinExtras_GEN_DIR}/qwintaskbarprogress_wrapper.cpp -${QtWinExtras_GEN_DIR}/qwinthumbnailtoolbar_wrapper.cpp -${QtWinExtras_GEN_DIR}/qwinthumbnailtoolbutton_wrapper.cpp - -# module is always needed -${QtWinExtras_GEN_DIR}/qtwinextras_module_wrapper.cpp -) - -configure_file("${QtWinExtras_SOURCE_DIR}/QtWinExtras_global.pre.h.in" - "${QtWinExtras_BINARY_DIR}/QtWinExtras_global.pre.h" @ONLY) - -set(QtWinExtras_include_dirs ${QtWinExtras_SOURCE_DIR} - ${QtWinExtras_BINARY_DIR} - ${Qt${QT_MAJOR_VERSION}WinExtras_INCLUDE_DIRS} - ${Qt${QT_MAJOR_VERSION}Core_INCLUDE_DIRS} - ${Qt${QT_MAJOR_VERSION}Gui_INCLUDE_DIRS} - ${Qt${QT_MAJOR_VERSION}Widgets_INCLUDE_DIRS} - ${QtCore_GEN_DIR} - ${QtGui_GEN_DIR} - ${QtWidgets_GEN_DIR} - ${libpyside_SOURCE_DIR}) - -set(QtWinExtras_libraries pyside6 - ${Qt${QT_MAJOR_VERSION}WinExtras_LIBRARIES} - ${Qt${QT_MAJOR_VERSION}Core_LIBRARIES} - ${Qt${QT_MAJOR_VERSION}Gui_LIBRARIES} - ${Qt${QT_MAJOR_VERSION}Widgets_LIBRARIES}) - -set(QtWinExtras_deps QtCore QtGui QtWidgets) - -create_pyside_module(NAME QtWinExtras - INCLUDE_DIRS QtWinExtras_include_dirs - LIBRARIES QtWinExtras_libraries - DEPS QtWinExtras_deps - TYPESYSTEM_PATH QtWinExtras_SOURCE_DIR - SOURCES QtWinExtras_SRC) diff --git a/sources/pyside6/PySide6/QtWinExtras/QtWinExtras_global.pre.h.in b/sources/pyside6/PySide6/QtWinExtras/QtWinExtras_global.pre.h.in deleted file mode 100644 index 21285e301..000000000 --- a/sources/pyside6/PySide6/QtWinExtras/QtWinExtras_global.pre.h.in +++ /dev/null @@ -1,5 +0,0 @@ -// QT_WIDGETS_LIB must be defined for the widget functions to become visible. - -#if @Qt6Widgets_FOUND@ -# define QT_WIDGETS_LIB -#endif diff --git a/sources/pyside6/PySide6/QtWinExtras/typesystem_winextras.xml b/sources/pyside6/PySide6/QtWinExtras/typesystem_winextras.xml deleted file mode 100644 index 2d3025bbb..000000000 --- a/sources/pyside6/PySide6/QtWinExtras/typesystem_winextras.xml +++ /dev/null @@ -1,30 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<!-- -// Copyright (C) 2017 The Qt Company Ltd. -// SPDX-License-Identifier: LicenseRef-Qt-Commercial OR LGPL-3.0-only OR GPL-2.0-only OR GPL-3.0-only ---> -<typesystem package="PySide6.QtWinExtras"> - <load-typesystem name="QtCore/typesystem_core.xml" generate="no"/> - <load-typesystem name="QtGui/typesystem_gui.xml" generate="no"/> - <load-typesystem name="QtWidgets/typesystem_widgets.xml" generate="no"/> - - <namespace-type name="QtWin"> - <enum-type name="HBitmapFormat"/> - <enum-type name="WindowFlip3DPolicy"/> - </namespace-type> - <object-type name="QWinEvent" since="5.2"/> - <object-type name="QWinColorizationChangeEvent" since="5.2"/> - <object-type name="QWinCompositionChangeEvent" since="5.2"/> - <object-type name="QWinJumpList" since="5.2"/> - <object-type name="QWinJumpListCategory" since="5.2"> - <enum-type name="Type"/> - </object-type> - <object-type name="QWinJumpListItem" since="5.2"> - <enum-type name="Type"/> - </object-type> - <!-- <object-type name="QWinMime" since="5.4"/> --> - <object-type name="QWinTaskbarButton" since="5.2"/> - <object-type name="QWinTaskbarProgress" since="5.2"/> - <object-type name="QWinThumbnailToolBar" since="5.2"/> - <object-type name="QWinThumbnailToolButton" since="5.2"/> -</typesystem> diff --git a/sources/pyside6/cmake/PySideHelpers.cmake b/sources/pyside6/cmake/PySideHelpers.cmake index de949ebf3..d2277be93 100644 --- a/sources/pyside6/cmake/PySideHelpers.cmake +++ b/sources/pyside6/cmake/PySideHelpers.cmake @@ -130,9 +130,6 @@ macro(collect_optional_modules) if (Qt${QT_MAJOR_VERSION}Core_VERSION VERSION_GREATER 6.0.2) list(APPEND ALL_OPTIONAL_MODULES 3DCore 3DRender 3DInput 3DLogic 3DAnimation 3DExtras) endif() - if(WIN32) - list(APPEND ALL_OPTIONAL_MODULES WinExtras) - endif() endmacro() macro(check_os) diff --git a/sources/pyside6/tests/QtWinExtras/CMakeLists.txt b/sources/pyside6/tests/QtWinExtras/CMakeLists.txt deleted file mode 100644 index 2f7cb08b9..000000000 --- a/sources/pyside6/tests/QtWinExtras/CMakeLists.txt +++ /dev/null @@ -1 +0,0 @@ -# Please add some tests, here |