Move the Windows Event Dispatcher into QtGui
Task-number: QTBUG-83255 Change-Id: Ida86f27d7f52b9be48fbea909979320866ff8dae Reviewed-by: Oliver Wolff <oliver.wolff@qt.io>
This commit is contained in:
parent
15456efa20
commit
bc84b7d046
@ -303,6 +303,7 @@ qt_extend_target(Gui CONDITION WIN32
|
|||||||
SOURCES
|
SOURCES
|
||||||
image/qpixmap_win.cpp
|
image/qpixmap_win.cpp
|
||||||
kernel/qwindowdefs_win.h
|
kernel/qwindowdefs_win.h
|
||||||
|
platform/windows/qwindowsguieventdispatcher.cpp platform/windows/qwindowsguieventdispatcher_p.h
|
||||||
rhi/qrhid3d11.cpp rhi/qrhid3d11_p.h
|
rhi/qrhid3d11.cpp rhi/qrhid3d11_p.h
|
||||||
rhi/qrhid3d11_p_p.h
|
rhi/qrhid3d11_p_p.h
|
||||||
PUBLIC_LIBRARIES
|
PUBLIC_LIBRARIES
|
||||||
|
@ -392,6 +392,7 @@ qt_extend_target(Gui CONDITION WIN32
|
|||||||
SOURCES
|
SOURCES
|
||||||
image/qpixmap_win.cpp
|
image/qpixmap_win.cpp
|
||||||
kernel/qwindowdefs_win.h
|
kernel/qwindowdefs_win.h
|
||||||
|
platform/windows/qwindowsguieventdispatcher.cpp platform/windows/qwindowsguieventdispatcher_p.h
|
||||||
rhi/qrhid3d11.cpp rhi/qrhid3d11_p.h
|
rhi/qrhid3d11.cpp rhi/qrhid3d11_p.h
|
||||||
rhi/qrhid3d11_p_p.h
|
rhi/qrhid3d11_p_p.h
|
||||||
PUBLIC_LIBRARIES
|
PUBLIC_LIBRARIES
|
||||||
|
@ -1,2 +1,3 @@
|
|||||||
wasm:include(wasm/wasm.pri)
|
wasm:include(wasm/wasm.pri)
|
||||||
darwin:include(darwin/darwin.pri)
|
darwin:include(darwin/darwin.pri)
|
||||||
|
win32:include(windows/windows.pri)
|
||||||
|
@ -52,10 +52,11 @@
|
|||||||
//
|
//
|
||||||
|
|
||||||
#include <QtCore/private/qeventdispatcher_win_p.h>
|
#include <QtCore/private/qeventdispatcher_win_p.h>
|
||||||
|
#include <QtGui/qtguiglobal.h>
|
||||||
|
|
||||||
QT_BEGIN_NAMESPACE
|
QT_BEGIN_NAMESPACE
|
||||||
|
|
||||||
class QWindowsGuiEventDispatcher : public QEventDispatcherWin32
|
class Q_GUI_EXPORT QWindowsGuiEventDispatcher : public QEventDispatcherWin32
|
||||||
{
|
{
|
||||||
Q_OBJECT
|
Q_OBJECT
|
||||||
public:
|
public:
|
2
src/gui/platform/windows/windows.pri
Normal file
2
src/gui/platform/windows/windows.pri
Normal file
@ -0,0 +1,2 @@
|
|||||||
|
HEADERS += platform/windows/qwindowsguieventdispatcher_p.h
|
||||||
|
SOURCES += platform/windows/qwindowsguieventdispatcher.cpp
|
@ -29,11 +29,6 @@ qt_extend_target(EventDispatcherSupport CONDITION UNIX
|
|||||||
qunixeventdispatcher_qpa_p.h
|
qunixeventdispatcher_qpa_p.h
|
||||||
)
|
)
|
||||||
|
|
||||||
qt_extend_target(EventDispatcherSupport CONDITION WIN32
|
|
||||||
SOURCES
|
|
||||||
qwindowsguieventdispatcher.cpp qwindowsguieventdispatcher_p.h
|
|
||||||
)
|
|
||||||
|
|
||||||
qt_extend_target(EventDispatcherSupport CONDITION QT_FEATURE_glib
|
qt_extend_target(EventDispatcherSupport CONDITION QT_FEATURE_glib
|
||||||
SOURCES
|
SOURCES
|
||||||
qeventdispatcher_glib.cpp qeventdispatcher_glib_p.h
|
qeventdispatcher_glib.cpp qeventdispatcher_glib_p.h
|
||||||
|
@ -31,11 +31,6 @@ qt_extend_target(EventDispatcherSupport CONDITION UNIX
|
|||||||
qunixeventdispatcher_qpa_p.h
|
qunixeventdispatcher_qpa_p.h
|
||||||
)
|
)
|
||||||
|
|
||||||
qt_extend_target(EventDispatcherSupport CONDITION WIN32
|
|
||||||
SOURCES
|
|
||||||
qwindowsguieventdispatcher.cpp qwindowsguieventdispatcher_p.h
|
|
||||||
)
|
|
||||||
|
|
||||||
qt_extend_target(EventDispatcherSupport CONDITION QT_FEATURE_glib
|
qt_extend_target(EventDispatcherSupport CONDITION QT_FEATURE_glib
|
||||||
SOURCES
|
SOURCES
|
||||||
qeventdispatcher_glib.cpp qeventdispatcher_glib_p.h
|
qeventdispatcher_glib.cpp qeventdispatcher_glib_p.h
|
||||||
|
@ -15,12 +15,6 @@ unix {
|
|||||||
HEADERS += \
|
HEADERS += \
|
||||||
qunixeventdispatcher_qpa_p.h \
|
qunixeventdispatcher_qpa_p.h \
|
||||||
qgenericunixeventdispatcher_p.h
|
qgenericunixeventdispatcher_p.h
|
||||||
} else {
|
|
||||||
SOURCES += \
|
|
||||||
qwindowsguieventdispatcher.cpp
|
|
||||||
|
|
||||||
HEADERS += \
|
|
||||||
qwindowsguieventdispatcher_p.h
|
|
||||||
}
|
}
|
||||||
|
|
||||||
qtConfig(glib) {
|
qtConfig(glib) {
|
||||||
|
@ -2,7 +2,6 @@ TARGET = qdirect2d
|
|||||||
|
|
||||||
QT += \
|
QT += \
|
||||||
core-private gui-private \
|
core-private gui-private \
|
||||||
eventdispatcher_support-private \
|
|
||||||
fontdatabase_support-private
|
fontdatabase_support-private
|
||||||
|
|
||||||
LIBS += -ldwmapi -lversion -ld3d11 -ldxgi -ldxguid
|
LIBS += -ldwmapi -lversion -ld3d11 -ldxgi -ldxguid
|
||||||
|
@ -16,7 +16,6 @@ qt_internal_add_plugin(QMinimalIntegrationPlugin
|
|||||||
PUBLIC_LIBRARIES
|
PUBLIC_LIBRARIES
|
||||||
Qt::Core
|
Qt::Core
|
||||||
Qt::CorePrivate
|
Qt::CorePrivate
|
||||||
Qt::EventDispatcherSupportPrivate
|
|
||||||
Qt::Gui
|
Qt::Gui
|
||||||
Qt::GuiPrivate
|
Qt::GuiPrivate
|
||||||
)
|
)
|
||||||
@ -27,6 +26,11 @@ qt_internal_add_plugin(QMinimalIntegrationPlugin
|
|||||||
## Scopes:
|
## Scopes:
|
||||||
#####################################################################
|
#####################################################################
|
||||||
|
|
||||||
|
qt_extend_target(QMinimalIntegrationPlugin CONDITION UNIX
|
||||||
|
PUBLIC_LIBRARIES
|
||||||
|
Qt::EventDispatcherSupportPrivate
|
||||||
|
)
|
||||||
|
|
||||||
qt_extend_target(QMinimalIntegrationPlugin CONDITION NOT APPLE
|
qt_extend_target(QMinimalIntegrationPlugin CONDITION NOT APPLE
|
||||||
PUBLIC_LIBRARIES
|
PUBLIC_LIBRARIES
|
||||||
Qt::FontDatabaseSupportPrivate
|
Qt::FontDatabaseSupportPrivate
|
||||||
@ -37,5 +41,5 @@ qt_extend_target(QMinimalIntegrationPlugin CONDITION QT_FEATURE_freetype
|
|||||||
WrapFreetype::WrapFreetype
|
WrapFreetype::WrapFreetype
|
||||||
)
|
)
|
||||||
|
|
||||||
#### Keys ignored in scope 4:.:.:minimal.pro:NOT TARGET___equals____ss_QT_DEFAULT_QPA_PLUGIN:
|
#### Keys ignored in scope 5:.:.:minimal.pro:NOT TARGET___equals____ss_QT_DEFAULT_QPA_PLUGIN:
|
||||||
# PLUGIN_EXTENDS = "-"
|
# PLUGIN_EXTENDS = "-"
|
||||||
|
@ -19,7 +19,6 @@ qt_internal_add_plugin(QMinimalIntegrationPlugin
|
|||||||
PUBLIC_LIBRARIES
|
PUBLIC_LIBRARIES
|
||||||
Qt::Core
|
Qt::Core
|
||||||
Qt::CorePrivate
|
Qt::CorePrivate
|
||||||
Qt::EventDispatcherSupportPrivate
|
|
||||||
Qt::Gui
|
Qt::Gui
|
||||||
Qt::GuiPrivate
|
Qt::GuiPrivate
|
||||||
)
|
)
|
||||||
@ -30,6 +29,11 @@ qt_internal_add_plugin(QMinimalIntegrationPlugin
|
|||||||
## Scopes:
|
## Scopes:
|
||||||
#####################################################################
|
#####################################################################
|
||||||
|
|
||||||
|
qt_extend_target(QMinimalIntegrationPlugin CONDITION UNIX
|
||||||
|
PUBLIC_LIBRARIES
|
||||||
|
Qt::EventDispatcherSupportPrivate
|
||||||
|
)
|
||||||
|
|
||||||
qt_extend_target(QMinimalIntegrationPlugin CONDITION NOT APPLE
|
qt_extend_target(QMinimalIntegrationPlugin CONDITION NOT APPLE
|
||||||
PUBLIC_LIBRARIES
|
PUBLIC_LIBRARIES
|
||||||
Qt::FontDatabaseSupportPrivate
|
Qt::FontDatabaseSupportPrivate
|
||||||
@ -40,5 +44,5 @@ qt_extend_target(QMinimalIntegrationPlugin CONDITION QT_FEATURE_freetype
|
|||||||
WrapFreetype::WrapFreetype
|
WrapFreetype::WrapFreetype
|
||||||
)
|
)
|
||||||
|
|
||||||
#### Keys ignored in scope 4:.:.:minimal.pro:NOT TARGET___equals____ss_QT_DEFAULT_QPA_PLUGIN:
|
#### Keys ignored in scope 5:.:.:minimal.pro:NOT TARGET___equals____ss_QT_DEFAULT_QPA_PLUGIN:
|
||||||
# PLUGIN_EXTENDS = "-"
|
# PLUGIN_EXTENDS = "-"
|
||||||
|
@ -1,9 +1,9 @@
|
|||||||
TARGET = qminimal
|
TARGET = qminimal
|
||||||
|
|
||||||
QT += \
|
QT += \
|
||||||
core-private gui-private \
|
core-private gui-private
|
||||||
eventdispatcher_support-private
|
|
||||||
|
|
||||||
|
!win32: QT += eventdispatcher_support-private
|
||||||
!darwin: QT += fontdatabase_support-private
|
!darwin: QT += fontdatabase_support-private
|
||||||
|
|
||||||
DEFINES += QT_NO_FOREACH
|
DEFINES += QT_NO_FOREACH
|
||||||
|
@ -17,7 +17,6 @@ qt_internal_add_plugin(QOffscreenIntegrationPlugin
|
|||||||
PUBLIC_LIBRARIES
|
PUBLIC_LIBRARIES
|
||||||
Qt::Core
|
Qt::Core
|
||||||
Qt::CorePrivate
|
Qt::CorePrivate
|
||||||
Qt::EventDispatcherSupportPrivate
|
|
||||||
Qt::Gui
|
Qt::Gui
|
||||||
Qt::GuiPrivate
|
Qt::GuiPrivate
|
||||||
)
|
)
|
||||||
@ -28,6 +27,11 @@ qt_internal_add_plugin(QOffscreenIntegrationPlugin
|
|||||||
## Scopes:
|
## Scopes:
|
||||||
#####################################################################
|
#####################################################################
|
||||||
|
|
||||||
|
qt_extend_target(QOffscreenIntegrationPlugin CONDITION UNIX
|
||||||
|
PUBLIC_LIBRARIES
|
||||||
|
Qt::EventDispatcherSupportPrivate
|
||||||
|
)
|
||||||
|
|
||||||
qt_extend_target(QOffscreenIntegrationPlugin CONDITION NOT APPLE
|
qt_extend_target(QOffscreenIntegrationPlugin CONDITION NOT APPLE
|
||||||
PUBLIC_LIBRARIES
|
PUBLIC_LIBRARIES
|
||||||
Qt::FontDatabaseSupportPrivate
|
Qt::FontDatabaseSupportPrivate
|
||||||
@ -40,5 +44,5 @@ qt_extend_target(QOffscreenIntegrationPlugin CONDITION QT_FEATURE_opengl AND QT_
|
|||||||
Qt::GlxSupportPrivate
|
Qt::GlxSupportPrivate
|
||||||
)
|
)
|
||||||
|
|
||||||
#### Keys ignored in scope 4:.:.:offscreen.pro:NOT TARGET___equals____ss_QT_DEFAULT_QPA_PLUGIN:
|
#### Keys ignored in scope 5:.:.:offscreen.pro:NOT TARGET___equals____ss_QT_DEFAULT_QPA_PLUGIN:
|
||||||
# PLUGIN_EXTENDS = "-"
|
# PLUGIN_EXTENDS = "-"
|
||||||
|
@ -18,7 +18,6 @@ qt_internal_add_plugin(QOffscreenIntegrationPlugin
|
|||||||
PUBLIC_LIBRARIES
|
PUBLIC_LIBRARIES
|
||||||
Qt::Core
|
Qt::Core
|
||||||
Qt::CorePrivate
|
Qt::CorePrivate
|
||||||
Qt::EventDispatcherSupportPrivate
|
|
||||||
Qt::Gui
|
Qt::Gui
|
||||||
Qt::GuiPrivate
|
Qt::GuiPrivate
|
||||||
)
|
)
|
||||||
@ -29,6 +28,11 @@ qt_internal_add_plugin(QOffscreenIntegrationPlugin
|
|||||||
## Scopes:
|
## Scopes:
|
||||||
#####################################################################
|
#####################################################################
|
||||||
|
|
||||||
|
qt_extend_target(QOffscreenIntegrationPlugin CONDITION UNIX
|
||||||
|
PUBLIC_LIBRARIES
|
||||||
|
Qt::EventDispatcherSupportPrivate
|
||||||
|
)
|
||||||
|
|
||||||
qt_extend_target(QOffscreenIntegrationPlugin CONDITION NOT APPLE
|
qt_extend_target(QOffscreenIntegrationPlugin CONDITION NOT APPLE
|
||||||
PUBLIC_LIBRARIES
|
PUBLIC_LIBRARIES
|
||||||
Qt::FontDatabaseSupportPrivate
|
Qt::FontDatabaseSupportPrivate
|
||||||
@ -41,5 +45,5 @@ qt_extend_target(QOffscreenIntegrationPlugin CONDITION QT_FEATURE_opengl AND QT_
|
|||||||
Qt::GlxSupportPrivate
|
Qt::GlxSupportPrivate
|
||||||
)
|
)
|
||||||
|
|
||||||
#### Keys ignored in scope 4:.:.:offscreen.pro:NOT TARGET___equals____ss_QT_DEFAULT_QPA_PLUGIN:
|
#### Keys ignored in scope 5:.:.:offscreen.pro:NOT TARGET___equals____ss_QT_DEFAULT_QPA_PLUGIN:
|
||||||
# PLUGIN_EXTENDS = "-"
|
# PLUGIN_EXTENDS = "-"
|
||||||
|
@ -1,9 +1,9 @@
|
|||||||
TARGET = qoffscreen
|
TARGET = qoffscreen
|
||||||
|
|
||||||
QT += \
|
QT += \
|
||||||
core-private gui-private \
|
core-private gui-private
|
||||||
eventdispatcher_support-private
|
|
||||||
|
|
||||||
|
!win32: QT += eventdispatcher_support-private
|
||||||
!darwin: QT += fontdatabase_support-private
|
!darwin: QT += fontdatabase_support-private
|
||||||
|
|
||||||
DEFINES += QT_NO_FOREACH
|
DEFINES += QT_NO_FOREACH
|
||||||
|
@ -50,11 +50,9 @@ qt_internal_add_plugin(QWindowsIntegrationPlugin
|
|||||||
PUBLIC_LIBRARIES
|
PUBLIC_LIBRARIES
|
||||||
Qt::Core
|
Qt::Core
|
||||||
Qt::CorePrivate
|
Qt::CorePrivate
|
||||||
Qt::EventDispatcherSupportPrivate
|
|
||||||
Qt::FontDatabaseSupportPrivate
|
Qt::FontDatabaseSupportPrivate
|
||||||
Qt::Gui
|
Qt::Gui
|
||||||
Qt::GuiPrivate
|
Qt::GuiPrivate
|
||||||
Qt::ThemeSupportPrivate
|
|
||||||
dwmapi
|
dwmapi
|
||||||
imm32
|
imm32
|
||||||
oleaut32
|
oleaut32
|
||||||
@ -93,38 +91,13 @@ qt_extend_target(QWindowsIntegrationPlugin CONDITION QT_FEATURE_opengl
|
|||||||
Qt::OpenGLPrivate
|
Qt::OpenGLPrivate
|
||||||
)
|
)
|
||||||
|
|
||||||
qt_extend_target(QWindowsIntegrationPlugin CONDITION QT_FEATURE_accessibility
|
|
||||||
SOURCES
|
|
||||||
uiautomation/qwindowsuiaaccessibility.cpp uiautomation/qwindowsuiaaccessibility.h
|
|
||||||
uiautomation/qwindowsuiabaseprovider.cpp uiautomation/qwindowsuiabaseprovider.h
|
|
||||||
uiautomation/qwindowsuiaexpandcollapseprovider.cpp uiautomation/qwindowsuiaexpandcollapseprovider.h
|
|
||||||
uiautomation/qwindowsuiagriditemprovider.cpp uiautomation/qwindowsuiagriditemprovider.h
|
|
||||||
uiautomation/qwindowsuiagridprovider.cpp uiautomation/qwindowsuiagridprovider.h
|
|
||||||
uiautomation/qwindowsuiainvokeprovider.cpp uiautomation/qwindowsuiainvokeprovider.h
|
|
||||||
uiautomation/qwindowsuiamainprovider.cpp uiautomation/qwindowsuiamainprovider.h
|
|
||||||
uiautomation/qwindowsuiaprovidercache.cpp uiautomation/qwindowsuiaprovidercache.h
|
|
||||||
uiautomation/qwindowsuiarangevalueprovider.cpp uiautomation/qwindowsuiarangevalueprovider.h
|
|
||||||
uiautomation/qwindowsuiaselectionitemprovider.cpp uiautomation/qwindowsuiaselectionitemprovider.h
|
|
||||||
uiautomation/qwindowsuiaselectionprovider.cpp uiautomation/qwindowsuiaselectionprovider.h
|
|
||||||
uiautomation/qwindowsuiatableitemprovider.cpp uiautomation/qwindowsuiatableitemprovider.h
|
|
||||||
uiautomation/qwindowsuiatableprovider.cpp uiautomation/qwindowsuiatableprovider.h
|
|
||||||
uiautomation/qwindowsuiatextprovider.cpp uiautomation/qwindowsuiatextprovider.h
|
|
||||||
uiautomation/qwindowsuiatextrangeprovider.cpp uiautomation/qwindowsuiatextrangeprovider.h
|
|
||||||
uiautomation/qwindowsuiatoggleprovider.cpp uiautomation/qwindowsuiatoggleprovider.h
|
|
||||||
uiautomation/qwindowsuiautils.cpp uiautomation/qwindowsuiautils.h
|
|
||||||
uiautomation/qwindowsuiavalueprovider.cpp uiautomation/qwindowsuiavalueprovider.h
|
|
||||||
uiautomation/qwindowsuiawindowprovider.cpp uiautomation/qwindowsuiawindowprovider.h
|
|
||||||
PUBLIC_LIBRARIES
|
|
||||||
Qt::AccessibilitySupportPrivate
|
|
||||||
)
|
|
||||||
|
|
||||||
qt_extend_target(QWindowsIntegrationPlugin CONDITION QT_FEATURE_directwrite3
|
qt_extend_target(QWindowsIntegrationPlugin CONDITION QT_FEATURE_directwrite3
|
||||||
DEFINES
|
DEFINES
|
||||||
QT_USE_DIRECTWRITE2
|
QT_USE_DIRECTWRITE2
|
||||||
QT_USE_DIRECTWRITE3
|
QT_USE_DIRECTWRITE3
|
||||||
)
|
)
|
||||||
|
|
||||||
#### Keys ignored in scope 5:.:.:windows.pro:NOT TARGET___equals____ss_QT_DEFAULT_QPA_PLUGIN:
|
#### Keys ignored in scope 4:.:.:windows.pro:NOT TARGET___equals____ss_QT_DEFAULT_QPA_PLUGIN:
|
||||||
# PLUGIN_EXTENDS = "-"
|
# PLUGIN_EXTENDS = "-"
|
||||||
|
|
||||||
qt_extend_target(QWindowsIntegrationPlugin CONDITION QT_FEATURE_opengl AND NOT QT_FEATURE_dynamicgl
|
qt_extend_target(QWindowsIntegrationPlugin CONDITION QT_FEATURE_opengl AND NOT QT_FEATURE_dynamicgl
|
||||||
@ -203,6 +176,29 @@ if(QT_FEATURE_imageformat_png)
|
|||||||
)
|
)
|
||||||
endif()
|
endif()
|
||||||
|
|
||||||
|
qt_extend_target(QWindowsIntegrationPlugin CONDITION QT_FEATURE_accessibility
|
||||||
|
SOURCES
|
||||||
|
uiautomation/qwindowsuiaaccessibility.cpp uiautomation/qwindowsuiaaccessibility.h
|
||||||
|
uiautomation/qwindowsuiabaseprovider.cpp uiautomation/qwindowsuiabaseprovider.h
|
||||||
|
uiautomation/qwindowsuiaexpandcollapseprovider.cpp uiautomation/qwindowsuiaexpandcollapseprovider.h
|
||||||
|
uiautomation/qwindowsuiagriditemprovider.cpp uiautomation/qwindowsuiagriditemprovider.h
|
||||||
|
uiautomation/qwindowsuiagridprovider.cpp uiautomation/qwindowsuiagridprovider.h
|
||||||
|
uiautomation/qwindowsuiainvokeprovider.cpp uiautomation/qwindowsuiainvokeprovider.h
|
||||||
|
uiautomation/qwindowsuiamainprovider.cpp uiautomation/qwindowsuiamainprovider.h
|
||||||
|
uiautomation/qwindowsuiaprovidercache.cpp uiautomation/qwindowsuiaprovidercache.h
|
||||||
|
uiautomation/qwindowsuiarangevalueprovider.cpp uiautomation/qwindowsuiarangevalueprovider.h
|
||||||
|
uiautomation/qwindowsuiaselectionitemprovider.cpp uiautomation/qwindowsuiaselectionitemprovider.h
|
||||||
|
uiautomation/qwindowsuiaselectionprovider.cpp uiautomation/qwindowsuiaselectionprovider.h
|
||||||
|
uiautomation/qwindowsuiatableitemprovider.cpp uiautomation/qwindowsuiatableitemprovider.h
|
||||||
|
uiautomation/qwindowsuiatableprovider.cpp uiautomation/qwindowsuiatableprovider.h
|
||||||
|
uiautomation/qwindowsuiatextprovider.cpp uiautomation/qwindowsuiatextprovider.h
|
||||||
|
uiautomation/qwindowsuiatextrangeprovider.cpp uiautomation/qwindowsuiatextrangeprovider.h
|
||||||
|
uiautomation/qwindowsuiatoggleprovider.cpp uiautomation/qwindowsuiatoggleprovider.h
|
||||||
|
uiautomation/qwindowsuiautils.cpp uiautomation/qwindowsuiautils.h
|
||||||
|
uiautomation/qwindowsuiavalueprovider.cpp uiautomation/qwindowsuiavalueprovider.h
|
||||||
|
uiautomation/qwindowsuiawindowprovider.cpp uiautomation/qwindowsuiawindowprovider.h
|
||||||
|
)
|
||||||
|
|
||||||
qt_extend_target(QWindowsIntegrationPlugin CONDITION MINGW AND QT_FEATURE_accessibility
|
qt_extend_target(QWindowsIntegrationPlugin CONDITION MINGW AND QT_FEATURE_accessibility
|
||||||
PUBLIC_LIBRARIES
|
PUBLIC_LIBRARIES
|
||||||
uuid
|
uuid
|
||||||
|
@ -51,7 +51,6 @@ qt_internal_add_plugin(QWindowsIntegrationPlugin
|
|||||||
PUBLIC_LIBRARIES
|
PUBLIC_LIBRARIES
|
||||||
Qt::Core
|
Qt::Core
|
||||||
Qt::CorePrivate
|
Qt::CorePrivate
|
||||||
Qt::EventDispatcherSupportPrivate
|
|
||||||
Qt::FontDatabaseSupportPrivate
|
Qt::FontDatabaseSupportPrivate
|
||||||
Qt::Gui
|
Qt::Gui
|
||||||
Qt::GuiPrivate
|
Qt::GuiPrivate
|
||||||
@ -93,36 +92,13 @@ qt_extend_target(QWindowsIntegrationPlugin CONDITION QT_FEATURE_opengl
|
|||||||
Qt::OpenGLPrivate
|
Qt::OpenGLPrivate
|
||||||
)
|
)
|
||||||
|
|
||||||
qt_extend_target(QWindowsIntegrationPlugin CONDITION QT_FEATURE_accessibility
|
|
||||||
SOURCES
|
|
||||||
uiautomation/qwindowsuiaaccessibility.cpp uiautomation/qwindowsuiaaccessibility.h
|
|
||||||
uiautomation/qwindowsuiabaseprovider.cpp uiautomation/qwindowsuiabaseprovider.h
|
|
||||||
uiautomation/qwindowsuiaexpandcollapseprovider.cpp uiautomation/qwindowsuiaexpandcollapseprovider.h
|
|
||||||
uiautomation/qwindowsuiagriditemprovider.cpp uiautomation/qwindowsuiagriditemprovider.h
|
|
||||||
uiautomation/qwindowsuiagridprovider.cpp uiautomation/qwindowsuiagridprovider.h
|
|
||||||
uiautomation/qwindowsuiainvokeprovider.cpp uiautomation/qwindowsuiainvokeprovider.h
|
|
||||||
uiautomation/qwindowsuiamainprovider.cpp uiautomation/qwindowsuiamainprovider.h
|
|
||||||
uiautomation/qwindowsuiaprovidercache.cpp uiautomation/qwindowsuiaprovidercache.h
|
|
||||||
uiautomation/qwindowsuiarangevalueprovider.cpp uiautomation/qwindowsuiarangevalueprovider.h
|
|
||||||
uiautomation/qwindowsuiaselectionitemprovider.cpp uiautomation/qwindowsuiaselectionitemprovider.h
|
|
||||||
uiautomation/qwindowsuiaselectionprovider.cpp uiautomation/qwindowsuiaselectionprovider.h
|
|
||||||
uiautomation/qwindowsuiatableitemprovider.cpp uiautomation/qwindowsuiatableitemprovider.h
|
|
||||||
uiautomation/qwindowsuiatableprovider.cpp uiautomation/qwindowsuiatableprovider.h
|
|
||||||
uiautomation/qwindowsuiatextprovider.cpp uiautomation/qwindowsuiatextprovider.h
|
|
||||||
uiautomation/qwindowsuiatextrangeprovider.cpp uiautomation/qwindowsuiatextrangeprovider.h
|
|
||||||
uiautomation/qwindowsuiatoggleprovider.cpp uiautomation/qwindowsuiatoggleprovider.h
|
|
||||||
uiautomation/qwindowsuiautils.cpp uiautomation/qwindowsuiautils.h
|
|
||||||
uiautomation/qwindowsuiavalueprovider.cpp uiautomation/qwindowsuiavalueprovider.h
|
|
||||||
uiautomation/qwindowsuiawindowprovider.cpp uiautomation/qwindowsuiawindowprovider.h
|
|
||||||
)
|
|
||||||
|
|
||||||
qt_extend_target(QWindowsIntegrationPlugin CONDITION QT_FEATURE_directwrite3
|
qt_extend_target(QWindowsIntegrationPlugin CONDITION QT_FEATURE_directwrite3
|
||||||
DEFINES
|
DEFINES
|
||||||
QT_USE_DIRECTWRITE2
|
QT_USE_DIRECTWRITE2
|
||||||
QT_USE_DIRECTWRITE3
|
QT_USE_DIRECTWRITE3
|
||||||
)
|
)
|
||||||
|
|
||||||
#### Keys ignored in scope 5:.:.:windows.pro:NOT TARGET___equals____ss_QT_DEFAULT_QPA_PLUGIN:
|
#### Keys ignored in scope 4:.:.:windows.pro:NOT TARGET___equals____ss_QT_DEFAULT_QPA_PLUGIN:
|
||||||
# PLUGIN_EXTENDS = "-"
|
# PLUGIN_EXTENDS = "-"
|
||||||
|
|
||||||
qt_extend_target(QWindowsIntegrationPlugin CONDITION QT_FEATURE_opengl AND NOT QT_FEATURE_dynamicgl
|
qt_extend_target(QWindowsIntegrationPlugin CONDITION QT_FEATURE_opengl AND NOT QT_FEATURE_dynamicgl
|
||||||
@ -201,6 +177,29 @@ if(QT_FEATURE_imageformat_png)
|
|||||||
)
|
)
|
||||||
endif()
|
endif()
|
||||||
|
|
||||||
|
qt_extend_target(QWindowsIntegrationPlugin CONDITION QT_FEATURE_accessibility
|
||||||
|
SOURCES
|
||||||
|
uiautomation/qwindowsuiaaccessibility.cpp uiautomation/qwindowsuiaaccessibility.h
|
||||||
|
uiautomation/qwindowsuiabaseprovider.cpp uiautomation/qwindowsuiabaseprovider.h
|
||||||
|
uiautomation/qwindowsuiaexpandcollapseprovider.cpp uiautomation/qwindowsuiaexpandcollapseprovider.h
|
||||||
|
uiautomation/qwindowsuiagriditemprovider.cpp uiautomation/qwindowsuiagriditemprovider.h
|
||||||
|
uiautomation/qwindowsuiagridprovider.cpp uiautomation/qwindowsuiagridprovider.h
|
||||||
|
uiautomation/qwindowsuiainvokeprovider.cpp uiautomation/qwindowsuiainvokeprovider.h
|
||||||
|
uiautomation/qwindowsuiamainprovider.cpp uiautomation/qwindowsuiamainprovider.h
|
||||||
|
uiautomation/qwindowsuiaprovidercache.cpp uiautomation/qwindowsuiaprovidercache.h
|
||||||
|
uiautomation/qwindowsuiarangevalueprovider.cpp uiautomation/qwindowsuiarangevalueprovider.h
|
||||||
|
uiautomation/qwindowsuiaselectionitemprovider.cpp uiautomation/qwindowsuiaselectionitemprovider.h
|
||||||
|
uiautomation/qwindowsuiaselectionprovider.cpp uiautomation/qwindowsuiaselectionprovider.h
|
||||||
|
uiautomation/qwindowsuiatableitemprovider.cpp uiautomation/qwindowsuiatableitemprovider.h
|
||||||
|
uiautomation/qwindowsuiatableprovider.cpp uiautomation/qwindowsuiatableprovider.h
|
||||||
|
uiautomation/qwindowsuiatextprovider.cpp uiautomation/qwindowsuiatextprovider.h
|
||||||
|
uiautomation/qwindowsuiatextrangeprovider.cpp uiautomation/qwindowsuiatextrangeprovider.h
|
||||||
|
uiautomation/qwindowsuiatoggleprovider.cpp uiautomation/qwindowsuiatoggleprovider.h
|
||||||
|
uiautomation/qwindowsuiautils.cpp uiautomation/qwindowsuiautils.h
|
||||||
|
uiautomation/qwindowsuiavalueprovider.cpp uiautomation/qwindowsuiavalueprovider.h
|
||||||
|
uiautomation/qwindowsuiawindowprovider.cpp uiautomation/qwindowsuiawindowprovider.h
|
||||||
|
)
|
||||||
|
|
||||||
qt_extend_target(QWindowsIntegrationPlugin CONDITION MINGW AND QT_FEATURE_accessibility
|
qt_extend_target(QWindowsIntegrationPlugin CONDITION MINGW AND QT_FEATURE_accessibility
|
||||||
PUBLIC_LIBRARIES
|
PUBLIC_LIBRARIES
|
||||||
uuid
|
uuid
|
||||||
|
@ -54,7 +54,7 @@
|
|||||||
#include <QtCore/qvariant.h>
|
#include <QtCore/qvariant.h>
|
||||||
#include <QtCore/qurl.h>
|
#include <QtCore/qurl.h>
|
||||||
|
|
||||||
#include <QtEventDispatcherSupport/private/qwindowsguieventdispatcher_p.h>
|
#include <QtGui/private/qwindowsguieventdispatcher_p.h>
|
||||||
|
|
||||||
QT_BEGIN_NAMESPACE
|
QT_BEGIN_NAMESPACE
|
||||||
|
|
||||||
|
@ -84,7 +84,7 @@
|
|||||||
#include <QtCore/private/qsystemlibrary_p.h>
|
#include <QtCore/private/qsystemlibrary_p.h>
|
||||||
#include <QtCore/private/qwinregistry_p.h>
|
#include <QtCore/private/qwinregistry_p.h>
|
||||||
|
|
||||||
#include <QtEventDispatcherSupport/private/qwindowsguieventdispatcher_p.h>
|
#include <QtGui/private/qwindowsguieventdispatcher_p.h>
|
||||||
|
|
||||||
#include <stdlib.h>
|
#include <stdlib.h>
|
||||||
#include <stdio.h>
|
#include <stdio.h>
|
||||||
|
@ -77,7 +77,7 @@
|
|||||||
#include <QtGui/qpa/qplatforminputcontextfactory_p.h>
|
#include <QtGui/qpa/qplatforminputcontextfactory_p.h>
|
||||||
#include <QtGui/qpa/qplatformcursor.h>
|
#include <QtGui/qpa/qplatformcursor.h>
|
||||||
|
|
||||||
#include <QtEventDispatcherSupport/private/qwindowsguieventdispatcher_p.h>
|
#include <QtGui/private/qwindowsguieventdispatcher_p.h>
|
||||||
|
|
||||||
#include <QtCore/qdebug.h>
|
#include <QtCore/qdebug.h>
|
||||||
#include <QtCore/qvariant.h>
|
#include <QtCore/qvariant.h>
|
||||||
|
@ -49,7 +49,7 @@
|
|||||||
#include <private/qguiapplication_p.h>
|
#include <private/qguiapplication_p.h>
|
||||||
#include <private/qhighdpiscaling_p.h>
|
#include <private/qhighdpiscaling_p.h>
|
||||||
#include <QtGui/qevent.h>
|
#include <QtGui/qevent.h>
|
||||||
#include <QtEventDispatcherSupport/private/qwindowsguieventdispatcher_p.h>
|
#include <QtGui/private/qwindowsguieventdispatcher_p.h>
|
||||||
#include <QtCore/private/qdebug_p.h>
|
#include <QtCore/private/qdebug_p.h>
|
||||||
|
|
||||||
#if defined(WM_APPCOMMAND)
|
#if defined(WM_APPCOMMAND)
|
||||||
|
@ -2,7 +2,6 @@ TARGET = qwindows
|
|||||||
|
|
||||||
QT += \
|
QT += \
|
||||||
core-private gui-private \
|
core-private gui-private \
|
||||||
eventdispatcher_support-private \
|
|
||||||
fontdatabase_support-private
|
fontdatabase_support-private
|
||||||
|
|
||||||
qtConfig(opengl): QT += opengl-private
|
qtConfig(opengl): QT += opengl-private
|
||||||
|
Loading…
x
Reference in New Issue
Block a user