Move QtPlatformCompositorSupport into QtOpenGL
Task-number: QTBUG-83255 Change-Id: Id9ea654db8efb00b487d53aea03d7f23a7ab1a54 Reviewed-by: Laszlo Agocs <laszlo.agocs@qt.io>
This commit is contained in:
parent
d80a98d525
commit
7172b5112e
@ -31,6 +31,8 @@ qt_add_module(OpenGL
|
|||||||
qopenglvertexarrayobject.cpp qopenglvertexarrayobject.h
|
qopenglvertexarrayobject.cpp qopenglvertexarrayobject.h
|
||||||
qopenglwindow.cpp qopenglwindow.h
|
qopenglwindow.cpp qopenglwindow.h
|
||||||
qtopenglglobal.h
|
qtopenglglobal.h
|
||||||
|
qplatformbackingstoreopenglsupport.cpp qplatformbackingstoreopenglsupport.h
|
||||||
|
|
||||||
DEFINES
|
DEFINES
|
||||||
QT_NO_FOREACH
|
QT_NO_FOREACH
|
||||||
QT_NO_USING_NAMESPACE
|
QT_NO_USING_NAMESPACE
|
||||||
@ -92,6 +94,12 @@ qt_extend_target(OpenGL CONDITION QT_FEATURE_vulkan
|
|||||||
Vulkan::Vulkan_nolink
|
Vulkan::Vulkan_nolink
|
||||||
)
|
)
|
||||||
|
|
||||||
|
qt_extend_target(OpenGL CONDITION QT_FEATURE_egl
|
||||||
|
SOURCES
|
||||||
|
qopenglcompositorbackingstore.cpp qopenglcompositorbackingstore_p.h
|
||||||
|
qopenglcompositor.cpp qopenglcompositor_p.h
|
||||||
|
)
|
||||||
|
|
||||||
qt_add_docs(OpenGL
|
qt_add_docs(OpenGL
|
||||||
doc/qtopengl.qdocconf
|
doc/qtopengl.qdocconf
|
||||||
)
|
)
|
||||||
|
@ -37,7 +37,8 @@ HEADERS += \
|
|||||||
qopenglversionprofile.h \
|
qopenglversionprofile.h \
|
||||||
qopenglvertexarrayobject.h \
|
qopenglvertexarrayobject.h \
|
||||||
qopenglwindow.h \
|
qopenglwindow.h \
|
||||||
qtopenglglobal.h
|
qtopenglglobal.h \
|
||||||
|
qplatformbackingstoreopenglsupport.h
|
||||||
|
|
||||||
SOURCES += \
|
SOURCES += \
|
||||||
qopengl2pexvertexarray.cpp \
|
qopengl2pexvertexarray.cpp \
|
||||||
@ -61,7 +62,8 @@ SOURCES += \
|
|||||||
qopenglversionprofile.cpp \
|
qopenglversionprofile.cpp \
|
||||||
qopenglvertexarrayobject.cpp \
|
qopenglvertexarrayobject.cpp \
|
||||||
qopenglwindow.cpp \
|
qopenglwindow.cpp \
|
||||||
qopengldebug.cpp
|
qopengldebug.cpp \
|
||||||
|
qplatformbackingstoreopenglsupport.cpp
|
||||||
|
|
||||||
!qtConfig(opengles2) {
|
!qtConfig(opengles2) {
|
||||||
HEADERS += \
|
HEADERS += \
|
||||||
@ -139,4 +141,14 @@ qtConfig(vulkan) {
|
|||||||
QMAKE_USE += vulkan/nolink
|
QMAKE_USE += vulkan/nolink
|
||||||
}
|
}
|
||||||
|
|
||||||
|
qtConfig(egl) {
|
||||||
|
SOURCES += \
|
||||||
|
qopenglcompositorbackingstore.cpp \
|
||||||
|
qopenglcompositor.cpp
|
||||||
|
|
||||||
|
HEADERS += \
|
||||||
|
qopenglcompositorbackingstore_p.h \
|
||||||
|
qopenglcompositor_p.h
|
||||||
|
}
|
||||||
|
|
||||||
load(qt_module)
|
load(qt_module)
|
||||||
|
@ -51,6 +51,8 @@
|
|||||||
// We mean it.
|
// We mean it.
|
||||||
//
|
//
|
||||||
|
|
||||||
|
#include <QtOpenGL/qtopenglglobal.h>
|
||||||
|
|
||||||
#include <QtCore/QTimer>
|
#include <QtCore/QTimer>
|
||||||
#include <QtOpenGL/QOpenGLTextureBlitter>
|
#include <QtOpenGL/QOpenGLTextureBlitter>
|
||||||
#include <QtGui/QMatrix4x4>
|
#include <QtGui/QMatrix4x4>
|
||||||
@ -72,7 +74,7 @@ public:
|
|||||||
virtual void endCompositing() { }
|
virtual void endCompositing() { }
|
||||||
};
|
};
|
||||||
|
|
||||||
class QOpenGLCompositor : public QObject
|
class Q_OPENGL_EXPORT QOpenGLCompositor : public QObject
|
||||||
{
|
{
|
||||||
Q_OBJECT
|
Q_OBJECT
|
||||||
|
|
@ -51,6 +51,8 @@
|
|||||||
// We mean it.
|
// We mean it.
|
||||||
//
|
//
|
||||||
|
|
||||||
|
#include <QtOpenGL/qtopenglglobal.h>
|
||||||
|
|
||||||
#include <qpa/qplatformbackingstore.h>
|
#include <qpa/qplatformbackingstore.h>
|
||||||
#include <QImage>
|
#include <QImage>
|
||||||
#include <QRegion>
|
#include <QRegion>
|
||||||
@ -60,7 +62,7 @@ QT_BEGIN_NAMESPACE
|
|||||||
class QOpenGLContext;
|
class QOpenGLContext;
|
||||||
class QPlatformTextureList;
|
class QPlatformTextureList;
|
||||||
|
|
||||||
class QOpenGLCompositorBackingStore : public QPlatformBackingStore
|
class Q_OPENGL_EXPORT QOpenGLCompositorBackingStore : public QPlatformBackingStore
|
||||||
{
|
{
|
||||||
public:
|
public:
|
||||||
QOpenGLCompositorBackingStore(QWindow *window);
|
QOpenGLCompositorBackingStore(QWindow *window);
|
@ -51,7 +51,7 @@
|
|||||||
|
|
||||||
#ifndef QT_NO_OPENGL
|
#ifndef QT_NO_OPENGL
|
||||||
|
|
||||||
#include <QtGui/qtguiglobal.h>
|
#include <QtOpenGL/qtopenglglobal.h>
|
||||||
#include <qpa/qplatformbackingstore.h>
|
#include <qpa/qplatformbackingstore.h>
|
||||||
|
|
||||||
#include <QtGui/QOpenGLContext>
|
#include <QtGui/QOpenGLContext>
|
||||||
@ -61,7 +61,7 @@ QT_BEGIN_NAMESPACE
|
|||||||
class QOpenGLTextureBlitter;
|
class QOpenGLTextureBlitter;
|
||||||
class QOpenGLBackingStore;
|
class QOpenGLBackingStore;
|
||||||
|
|
||||||
class QPlatformBackingStoreOpenGLSupport : public QPlatformBackingStoreOpenGLSupportBase
|
class Q_OPENGL_EXPORT QPlatformBackingStoreOpenGLSupport : public QPlatformBackingStoreOpenGLSupportBase
|
||||||
{
|
{
|
||||||
public:
|
public:
|
||||||
explicit QPlatformBackingStoreOpenGLSupport(QPlatformBackingStore *backingStore) : backingStore(backingStore) {}
|
explicit QPlatformBackingStoreOpenGLSupport(QPlatformBackingStore *backingStore) : backingStore(backingStore) {}
|
@ -19,9 +19,6 @@ endif()
|
|||||||
if(QT_FEATURE_xcb OR (UNIX AND NOT UIKIT))
|
if(QT_FEATURE_xcb OR (UNIX AND NOT UIKIT))
|
||||||
add_subdirectory(services)
|
add_subdirectory(services)
|
||||||
endif()
|
endif()
|
||||||
if(QT_FEATURE_opengl)
|
|
||||||
add_subdirectory(platformcompositor)
|
|
||||||
endif()
|
|
||||||
if(QT_FEATURE_egl)
|
if(QT_FEATURE_egl)
|
||||||
add_subdirectory(eglconvenience)
|
add_subdirectory(eglconvenience)
|
||||||
endif()
|
endif()
|
||||||
|
@ -1,23 +0,0 @@
|
|||||||
# Generated from platformcompositor.pro.
|
|
||||||
|
|
||||||
#####################################################################
|
|
||||||
## PlatformCompositorSupport Module:
|
|
||||||
#####################################################################
|
|
||||||
|
|
||||||
qt_add_module(PlatformCompositorSupport
|
|
||||||
STATIC
|
|
||||||
INTERNAL_MODULE
|
|
||||||
SOURCES
|
|
||||||
qopenglcompositor.cpp qopenglcompositor_p.h
|
|
||||||
qopenglcompositorbackingstore.cpp qopenglcompositorbackingstore_p.h
|
|
||||||
qplatformbackingstoreopenglsupport.cpp qplatformbackingstoreopenglsupport.h
|
|
||||||
DEFINES
|
|
||||||
QT_NO_CAST_FROM_ASCII
|
|
||||||
PUBLIC_LIBRARIES
|
|
||||||
Qt::CorePrivate
|
|
||||||
Qt::GuiPrivate
|
|
||||||
Qt::OpenGL
|
|
||||||
)
|
|
||||||
|
|
||||||
#### Keys ignored in scope 1:.:.:platformcompositor.pro:<TRUE>:
|
|
||||||
# MODULE = "platformcompositor_support"
|
|
@ -1,19 +0,0 @@
|
|||||||
TARGET = QtPlatformCompositorSupport
|
|
||||||
MODULE = platformcompositor_support
|
|
||||||
|
|
||||||
QT = core-private gui-private opengl
|
|
||||||
CONFIG += static internal_module
|
|
||||||
|
|
||||||
DEFINES += QT_NO_CAST_FROM_ASCII
|
|
||||||
|
|
||||||
SOURCES += \
|
|
||||||
qplatformbackingstoreopenglsupport.cpp \
|
|
||||||
qopenglcompositor.cpp \
|
|
||||||
qopenglcompositorbackingstore.cpp
|
|
||||||
|
|
||||||
HEADERS += \
|
|
||||||
qplatformbackingstoreopenglsupport.h \
|
|
||||||
qopenglcompositor_p.h \
|
|
||||||
qopenglcompositorbackingstore_p.h
|
|
||||||
|
|
||||||
load(qt_module)
|
|
@ -19,8 +19,6 @@ qtConfig(evdev)|qtConfig(tslib)|qtConfig(libinput)|qtConfig(integrityhid)|qtConf
|
|||||||
if(unix:!uikit)|qtConfig(xcb): \
|
if(unix:!uikit)|qtConfig(xcb): \
|
||||||
SUBDIRS += services
|
SUBDIRS += services
|
||||||
|
|
||||||
qtConfig(opengl): \
|
|
||||||
SUBDIRS += platformcompositor
|
|
||||||
qtConfig(egl): \
|
qtConfig(egl): \
|
||||||
SUBDIRS += eglconvenience
|
SUBDIRS += eglconvenience
|
||||||
qtConfig(xlib):qtConfig(opengl):!qtConfig(opengles2): \
|
qtConfig(xlib):qtConfig(opengl):!qtConfig(opengles2): \
|
||||||
|
@ -76,9 +76,9 @@ qt_extend_target(QAndroidIntegrationPlugin CONDITION QT_FEATURE_vulkan
|
|||||||
qandroidplatformvulkanwindow.cpp qandroidplatformvulkanwindow.h
|
qandroidplatformvulkanwindow.cpp qandroidplatformvulkanwindow.h
|
||||||
)
|
)
|
||||||
|
|
||||||
qt_extend_target(QAndroidIntegrationPlugin CONDITION TARGET Qt::PlatformCompositorSupportPrivate
|
qt_extend_target(QAndroidIntegrationPlugin CONDITION QT_FEATURE_opengl
|
||||||
PUBLIC_LIBRARIES
|
PUBLIC_LIBRARIES
|
||||||
Qt::PlatformCompositorSupportPrivate
|
Qt::OpenGLPrivate
|
||||||
)
|
)
|
||||||
|
|
||||||
qt_extend_target(QAndroidIntegrationPlugin CONDITION QT_FEATURE_android_style_assets
|
qt_extend_target(QAndroidIntegrationPlugin CONDITION QT_FEATURE_android_style_assets
|
||||||
|
@ -7,7 +7,7 @@ QT += \
|
|||||||
eventdispatcher_support-private accessibility_support-private \
|
eventdispatcher_support-private accessibility_support-private \
|
||||||
fontdatabase_support-private egl_support-private
|
fontdatabase_support-private egl_support-private
|
||||||
|
|
||||||
qtHaveModule(platformcompositor_support-private): QT += platformcompositor_support-private
|
qtConfig(opengl): QT += opengl-private
|
||||||
|
|
||||||
OTHER_FILES += $$PWD/android.json
|
OTHER_FILES += $$PWD/android.json
|
||||||
|
|
||||||
|
@ -44,7 +44,7 @@
|
|||||||
#include <QGuiApplication>
|
#include <QGuiApplication>
|
||||||
#include <QOpenGLContext>
|
#include <QOpenGLContext>
|
||||||
#if QT_CONFIG(opengl)
|
#if QT_CONFIG(opengl)
|
||||||
#include <QtPlatformCompositorSupport/qpa/qplatformbackingstoreopenglsupport.h>
|
#include <QtOpenGL/qpa/qplatformbackingstoreopenglsupport.h>
|
||||||
#endif
|
#endif
|
||||||
#include <QOffscreenSurface>
|
#include <QOffscreenSurface>
|
||||||
#include <QThread>
|
#include <QThread>
|
||||||
|
@ -111,9 +111,9 @@ qt_extend_target(QCocoaIntegrationPlugin CONDITION QT_FEATURE_sessionmanager
|
|||||||
qcocoasessionmanager.cpp qcocoasessionmanager.h
|
qcocoasessionmanager.cpp qcocoasessionmanager.h
|
||||||
)
|
)
|
||||||
|
|
||||||
qt_extend_target(QCocoaIntegrationPlugin CONDITION TARGET Qt::PlatformCompositorSupportPrivate
|
qt_extend_target(QCocoaIntegrationPlugin CONDITION QT_FEATURE_opengl
|
||||||
PUBLIC_LIBRARIES
|
PUBLIC_LIBRARIES
|
||||||
Qt::PlatformCompositorSupportPrivate
|
Qt::OpenGLPrivate
|
||||||
)
|
)
|
||||||
|
|
||||||
qt_extend_target(QCocoaIntegrationPlugin CONDITION TARGET Qt::Widgets
|
qt_extend_target(QCocoaIntegrationPlugin CONDITION TARGET Qt::Widgets
|
||||||
|
@ -98,7 +98,7 @@ QT += \
|
|||||||
core-private gui-private \
|
core-private gui-private \
|
||||||
theme_support-private
|
theme_support-private
|
||||||
|
|
||||||
qtHaveModule(platformcompositor_support-private): QT += platformcompositor_support-private
|
qtConfig(opengl): QT += opengl-private
|
||||||
|
|
||||||
CONFIG += no_app_extension_api_only
|
CONFIG += no_app_extension_api_only
|
||||||
|
|
||||||
|
@ -69,7 +69,7 @@
|
|||||||
#include <QtGui/private/qfontengine_coretext_p.h>
|
#include <QtGui/private/qfontengine_coretext_p.h>
|
||||||
|
|
||||||
#if QT_CONFIG(opengl)
|
#if QT_CONFIG(opengl)
|
||||||
#include <QtPlatformCompositorSupport/qpa/qplatformbackingstoreopenglsupport.h>
|
#include <QtOpenGL/qpa/qplatformbackingstoreopenglsupport.h>
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
#ifdef QT_WIDGETS_LIB
|
#ifdef QT_WIDGETS_LIB
|
||||||
|
@ -44,9 +44,9 @@ qt_extend_target(EglFSDeviceIntegration CONDITION TARGET Qt::InputSupportPrivate
|
|||||||
Qt::InputSupportPrivate
|
Qt::InputSupportPrivate
|
||||||
)
|
)
|
||||||
|
|
||||||
qt_extend_target(EglFSDeviceIntegration CONDITION TARGET Qt::PlatformCompositorSupportPrivate
|
qt_extend_target(EglFSDeviceIntegration CONDITION QT_FEATURE_opengl
|
||||||
PUBLIC_LIBRARIES
|
PUBLIC_LIBRARIES
|
||||||
Qt::PlatformCompositorSupportPrivate
|
Qt::OpenGLPrivate
|
||||||
)
|
)
|
||||||
|
|
||||||
qt_extend_target(EglFSDeviceIntegration CONDITION QT_FEATURE_vulkan
|
qt_extend_target(EglFSDeviceIntegration CONDITION QT_FEATURE_vulkan
|
||||||
|
@ -73,7 +73,7 @@
|
|||||||
#include <QtEventDispatcherSupport/private/qgenericunixeventdispatcher_p.h>
|
#include <QtEventDispatcherSupport/private/qgenericunixeventdispatcher_p.h>
|
||||||
#include <QtFbSupport/private/qfbvthandler_p.h>
|
#include <QtFbSupport/private/qfbvthandler_p.h>
|
||||||
#ifndef QT_NO_OPENGL
|
#ifndef QT_NO_OPENGL
|
||||||
# include <QtPlatformCompositorSupport/private/qopenglcompositorbackingstore_p.h>
|
# include <QtOpenGL/private/qopenglcompositorbackingstore_p.h>
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
#include <QtPlatformHeaders/QEGLNativeContext>
|
#include <QtPlatformHeaders/QEGLNativeContext>
|
||||||
|
@ -43,7 +43,7 @@
|
|||||||
#include <qpa/qwindowsysteminterface.h>
|
#include <qpa/qwindowsysteminterface.h>
|
||||||
#include <qpa/qplatformcursor.h>
|
#include <qpa/qplatformcursor.h>
|
||||||
#ifndef QT_NO_OPENGL
|
#ifndef QT_NO_OPENGL
|
||||||
# include <QtPlatformCompositorSupport/private/qopenglcompositor_p.h>
|
# include <QtOpenGL/private/qopenglcompositor_p.h>
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
#include "qeglfsscreen_p.h"
|
#include "qeglfsscreen_p.h"
|
||||||
|
@ -45,7 +45,7 @@
|
|||||||
#ifndef QT_NO_OPENGL
|
#ifndef QT_NO_OPENGL
|
||||||
# include <QtGui/private/qopenglcontext_p.h>
|
# include <QtGui/private/qopenglcontext_p.h>
|
||||||
# include <QtGui/QOpenGLContext>
|
# include <QtGui/QOpenGLContext>
|
||||||
# include <QtPlatformCompositorSupport/private/qopenglcompositorbackingstore_p.h>
|
# include <QtOpenGL/private/qopenglcompositorbackingstore_p.h>
|
||||||
#endif
|
#endif
|
||||||
#include <QtEglSupport/private/qeglconvenience_p.h>
|
#include <QtEglSupport/private/qeglconvenience_p.h>
|
||||||
|
|
||||||
|
@ -57,7 +57,7 @@
|
|||||||
|
|
||||||
#include <qpa/qplatformwindow.h>
|
#include <qpa/qplatformwindow.h>
|
||||||
#ifndef QT_NO_OPENGL
|
#ifndef QT_NO_OPENGL
|
||||||
# include <QtPlatformCompositorSupport/private/qopenglcompositor_p.h>
|
# include <QtOpenGL/private/qopenglcompositor_p.h>
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
QT_BEGIN_NAMESPACE
|
QT_BEGIN_NAMESPACE
|
||||||
|
@ -17,8 +17,7 @@ QT += \
|
|||||||
qtHaveModule(input_support-private): \
|
qtHaveModule(input_support-private): \
|
||||||
QT += input_support-private
|
QT += input_support-private
|
||||||
|
|
||||||
qtHaveModule(platformcompositor_support-private): \
|
qtConfig(opengl): QT += opengl-private
|
||||||
QT += platformcompositor_support-private
|
|
||||||
|
|
||||||
# Avoid X11 header collision, use generic EGL native types
|
# Avoid X11 header collision, use generic EGL native types
|
||||||
DEFINES += QT_EGL_NO_X11
|
DEFINES += QT_EGL_NO_X11
|
||||||
|
@ -47,9 +47,9 @@ qt_disable_apple_app_extension_api_only(QIOSIntegrationPlugin)
|
|||||||
## Scopes:
|
## Scopes:
|
||||||
#####################################################################
|
#####################################################################
|
||||||
|
|
||||||
extend_target(QIOSIntegrationPlugin CONDITION TARGET Qt::PlatformCompositorSupportPrivate
|
extend_target(QIOSIntegrationPlugin CONDITION QT_FEATURE_opengl
|
||||||
PUBLIC_LIBRARIES
|
PUBLIC_LIBRARIES
|
||||||
Qt::PlatformCompositorSupportPrivate
|
Qt::OpenGLPrivate
|
||||||
)
|
)
|
||||||
|
|
||||||
extend_target(QIOSIntegrationPlugin CONDITION NOT TVOS
|
extend_target(QIOSIntegrationPlugin CONDITION NOT TVOS
|
||||||
|
@ -8,7 +8,7 @@ qtConfig(shared): CONFIG += static
|
|||||||
QT += \
|
QT += \
|
||||||
core-private gui-private
|
core-private gui-private
|
||||||
|
|
||||||
qtHaveModule(platformcompositor_support-private): QT += platformcompositor_support-private
|
qtConfig(opengl): QT += opengl-private
|
||||||
|
|
||||||
LIBS += -framework Foundation -framework UIKit -framework QuartzCore -framework AudioToolbox
|
LIBS += -framework Foundation -framework UIKit -framework QuartzCore -framework AudioToolbox
|
||||||
|
|
||||||
|
@ -67,7 +67,7 @@
|
|||||||
#import <AudioToolbox/AudioServices.h>
|
#import <AudioToolbox/AudioServices.h>
|
||||||
|
|
||||||
#if QT_CONFIG(opengl)
|
#if QT_CONFIG(opengl)
|
||||||
#include <QtPlatformCompositorSupport/qpa/qplatformbackingstoreopenglsupport.h>
|
#include <QtOpenGL/qpa/qplatformbackingstoreopenglsupport.h>
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
#include <QtDebug>
|
#include <QtDebug>
|
||||||
|
@ -41,7 +41,7 @@
|
|||||||
#include "qwasmwindow.h"
|
#include "qwasmwindow.h"
|
||||||
#ifndef QT_NO_OPENGL
|
#ifndef QT_NO_OPENGL
|
||||||
# include "qwasmbackingstore.h"
|
# include "qwasmbackingstore.h"
|
||||||
# include <QtPlatformCompositorSupport/qpa/qplatformbackingstoreopenglsupport.h>
|
# include <QtOpenGL/qpa/qplatformbackingstoreopenglsupport.h>
|
||||||
#endif
|
#endif
|
||||||
#include "qwasmfontdatabase.h"
|
#include "qwasmfontdatabase.h"
|
||||||
#if defined(Q_OS_UNIX)
|
#if defined(Q_OS_UNIX)
|
||||||
|
@ -4,7 +4,7 @@ QT += \
|
|||||||
core-private gui-private \
|
core-private gui-private \
|
||||||
eventdispatcher_support-private fontdatabase_support-private egl_support-private
|
eventdispatcher_support-private fontdatabase_support-private egl_support-private
|
||||||
|
|
||||||
qtHaveModule(platformcompositor_support-private): QT += platformcompositor_support-private
|
qtConfig(opengl): QT += opengl-private
|
||||||
|
|
||||||
# Avoid X11 header collision, use generic EGL native types
|
# Avoid X11 header collision, use generic EGL native types
|
||||||
DEFINES += QT_EGL_NO_X11
|
DEFINES += QT_EGL_NO_X11
|
||||||
|
@ -86,9 +86,9 @@ qt_add_resource(QWindowsIntegrationPlugin "openglblacklists"
|
|||||||
## Scopes:
|
## Scopes:
|
||||||
#####################################################################
|
#####################################################################
|
||||||
|
|
||||||
qt_extend_target(QWindowsIntegrationPlugin CONDITION TARGET Qt::PlatformCompositorSupportPrivate
|
qt_extend_target(QWindowsIntegrationPlugin CONDITION QT_FEATURE_opengl
|
||||||
PUBLIC_LIBRARIES
|
PUBLIC_LIBRARIES
|
||||||
Qt::PlatformCompositorSupportPrivate
|
Qt::OpenGLPrivate
|
||||||
)
|
)
|
||||||
|
|
||||||
qt_extend_target(QWindowsIntegrationPlugin CONDITION QT_FEATURE_accessibility
|
qt_extend_target(QWindowsIntegrationPlugin CONDITION QT_FEATURE_accessibility
|
||||||
|
@ -46,7 +46,7 @@
|
|||||||
#include <QtGui/private/qpixmap_raster_p.h>
|
#include <QtGui/private/qpixmap_raster_p.h>
|
||||||
|
|
||||||
#if QT_CONFIG(opengl)
|
#if QT_CONFIG(opengl)
|
||||||
#include <QtPlatformCompositorSupport/qpa/qplatformbackingstoreopenglsupport.h>
|
#include <QtOpenGL/qpa/qplatformbackingstoreopenglsupport.h>
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
QT_BEGIN_NAMESPACE
|
QT_BEGIN_NAMESPACE
|
||||||
|
@ -5,7 +5,7 @@ QT += \
|
|||||||
eventdispatcher_support-private \
|
eventdispatcher_support-private \
|
||||||
fontdatabase_support-private theme_support-private
|
fontdatabase_support-private theme_support-private
|
||||||
|
|
||||||
qtHaveModule(platformcompositor_support-private): QT += platformcompositor_support-private
|
qtConfig(opengl): QT += opengl-private
|
||||||
|
|
||||||
qtConfig(accessibility): QT += accessibility_support-private
|
qtConfig(accessibility): QT += accessibility_support-private
|
||||||
|
|
||||||
|
@ -54,7 +54,7 @@
|
|||||||
# include "uiautomation/qwinrtuiaaccessibility.h"
|
# include "uiautomation/qwinrtuiaaccessibility.h"
|
||||||
#endif
|
#endif
|
||||||
#if QT_CONFIG(opengl)
|
#if QT_CONFIG(opengl)
|
||||||
#include <QtPlatformCompositorSupport/qpa/qplatformbackingstoreopenglsupport.h>
|
#include <QtOpenGL/qpa/qplatformbackingstoreopenglsupport.h>
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
#include <QtGui/QOffscreenSurface>
|
#include <QtGui/QOffscreenSurface>
|
||||||
|
@ -6,7 +6,7 @@ QT += \
|
|||||||
core-private gui-private \
|
core-private gui-private \
|
||||||
fontdatabase_support-private egl_support-private
|
fontdatabase_support-private egl_support-private
|
||||||
|
|
||||||
qtHaveModule(platformcompositor_support-private): QT += platformcompositor_support-private
|
qtConfig(opengl): QT += opengl-private
|
||||||
|
|
||||||
DEFINES *= QT_NO_CAST_FROM_ASCII __WRL_NO_DEFAULT_LIB__
|
DEFINES *= QT_NO_CAST_FROM_ASCII __WRL_NO_DEFAULT_LIB__
|
||||||
|
|
||||||
|
@ -71,9 +71,9 @@ qt_disable_apple_app_extension_api_only(XcbQpa)
|
|||||||
## Scopes:
|
## Scopes:
|
||||||
#####################################################################
|
#####################################################################
|
||||||
|
|
||||||
qt_extend_target(XcbQpa CONDITION TARGET Qt::PlatformCompositorSupportPrivate
|
qt_extend_target(XcbQpa CONDITION QT_FEATURE_opengl
|
||||||
PUBLIC_LIBRARIES
|
PUBLIC_LIBRARIES
|
||||||
Qt::PlatformCompositorSupportPrivate
|
Qt::OpenGLPrivate
|
||||||
)
|
)
|
||||||
|
|
||||||
qt_extend_target(XcbQpa CONDITION TARGET Qt::LinuxAccessibilitySupportPrivate
|
qt_extend_target(XcbQpa CONDITION TARGET Qt::LinuxAccessibilitySupportPrivate
|
||||||
|
@ -62,7 +62,7 @@
|
|||||||
#include <QtFontDatabaseSupport/private/qgenericunixfontdatabase_p.h>
|
#include <QtFontDatabaseSupport/private/qgenericunixfontdatabase_p.h>
|
||||||
#include <QtServiceSupport/private/qgenericunixservices_p.h>
|
#include <QtServiceSupport/private/qgenericunixservices_p.h>
|
||||||
#if QT_CONFIG(opengl)
|
#if QT_CONFIG(opengl)
|
||||||
#include <QtPlatformCompositorSupport/qpa/qplatformbackingstoreopenglsupport.h>
|
#include <QtOpenGL/qpa/qplatformbackingstoreopenglsupport.h>
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
#include <stdio.h>
|
#include <stdio.h>
|
||||||
|
@ -9,8 +9,7 @@ QT += \
|
|||||||
edid_support-private \
|
edid_support-private \
|
||||||
xkbcommon_support-private
|
xkbcommon_support-private
|
||||||
|
|
||||||
qtHaveModule(platformcompositor_support-private): \
|
qtConfig(opengl): QT += opengl-private
|
||||||
QT += platformcompositor_support-private
|
|
||||||
|
|
||||||
qtHaveModule(linuxaccessibility_support-private): \
|
qtHaveModule(linuxaccessibility_support-private): \
|
||||||
QT += linuxaccessibility_support-private
|
QT += linuxaccessibility_support-private
|
||||||
|
@ -18,7 +18,6 @@
|
|||||||
"QtFontDatabaseSupport" => "$basedir/src/platformsupport/fontdatabases",
|
"QtFontDatabaseSupport" => "$basedir/src/platformsupport/fontdatabases",
|
||||||
"QtInputSupport" => "$basedir/src/platformsupport/input",
|
"QtInputSupport" => "$basedir/src/platformsupport/input",
|
||||||
"QtXkbCommonSupport" => "$basedir/src/platformsupport/input/xkbcommon",
|
"QtXkbCommonSupport" => "$basedir/src/platformsupport/input/xkbcommon",
|
||||||
"QtPlatformCompositorSupport" => "$basedir/src/platformsupport/platformcompositor",
|
|
||||||
"QtServiceSupport" => "$basedir/src/platformsupport/services",
|
"QtServiceSupport" => "$basedir/src/platformsupport/services",
|
||||||
"QtThemeSupport" => "$basedir/src/platformsupport/themes",
|
"QtThemeSupport" => "$basedir/src/platformsupport/themes",
|
||||||
"QtEglSupport" => "$basedir/src/platformsupport/eglconvenience",
|
"QtEglSupport" => "$basedir/src/platformsupport/eglconvenience",
|
||||||
|
@ -239,18 +239,6 @@ _qt_library_map = [
|
|||||||
LibraryMapping(
|
LibraryMapping(
|
||||||
"particles", "Qt6", "Qt::QuickParticles", extra=["COMPONENTS", "QuickParticles"]
|
"particles", "Qt6", "Qt::QuickParticles", extra=["COMPONENTS", "QuickParticles"]
|
||||||
),
|
),
|
||||||
LibraryMapping(
|
|
||||||
"platformcompositor",
|
|
||||||
"Qt6",
|
|
||||||
"Qt::PlatformCompositorSupport",
|
|
||||||
extra=["COMPONENTS", "PlatformCompositorSupport"],
|
|
||||||
),
|
|
||||||
LibraryMapping(
|
|
||||||
"platformcompositor_support",
|
|
||||||
"Qt6",
|
|
||||||
"Qt::PlatformCompositorSupport",
|
|
||||||
extra=["COMPONENTS", "PlatformCompositorSupport"],
|
|
||||||
),
|
|
||||||
LibraryMapping(
|
LibraryMapping(
|
||||||
"plugin-interfaces",
|
"plugin-interfaces",
|
||||||
"Qt6",
|
"Qt6",
|
||||||
|
Loading…
x
Reference in New Issue
Block a user