Remove last remaining bits of QtPlatformHeaders

Task-number: QTBUG-84220 Change-Id: I951e04bfe9358a99951d1d61ff47b675584b7f81 Reviewed-by: Oliver Wolff <[email protected]>
leadtobetter · Aug 4, 2020 · a00ad95 · a00ad95
1 parent 4595fb2
commit a00ad95
Show file tree

Hide file tree

Showing 49 changed files with 46 additions and 705 deletions.
diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
@@ -57,7 +57,6 @@ if(QT_FEATURE_gui)
         endif()
     endif()
     add_subdirectory(platformsupport)
-    add_subdirectory(platformheaders)
 endif()
 if (QT_FEATURE_testlib)
     add_subdirectory(testlib)

diff --git a/src/gui/doc/qtgui.qdocconf b/src/gui/doc/qtgui.qdocconf
@@ -34,7 +34,6 @@ depends += \
     qtmultimedia \
     qtnetwork \
     qtopengl \
-    qtplatformheaders \
     qtsvg \
     qtqml \
     qtquick \

diff --git a/src/gui/kernel/qplatformgraphicsbuffer.cpp b/src/gui/kernel/qplatformgraphicsbuffer.cpp
@@ -60,10 +60,6 @@ QT_BEGIN_NAMESPACE
 
     There is no public constructor nor any public factory function.
 
-    QPlatformGraphicsBuffer is intended to be created by using platform specific
-    APIs available from QtPlatformHeaders, or there might be accessor functions
-    similar to the accessor function that QPlatformBackingstore has.
-
     \internal
 */
 

diff --git a/src/gui/kernel/qplatformscreen_p.h b/src/gui/kernel/qplatformscreen_p.h
@@ -77,6 +77,19 @@ struct Q_GUI_EXPORT QXcbScreen
 };
 #endif
 
+#if QT_CONFIG(vsp2)
+struct Q_GUI_EXPORT QVsp2Screen
+{
+    QT_DECLARE_PLATFORM_INTERFACE(QVsp2Screen)
+    virtual int addLayer(int dmabufFd, const QSize &size, const QPoint &position, uint drmPixelFormat, uint bytesPerLine) = 0;
+    virtual void setLayerBuffer(int id, int dmabufFd) = 0;
+    virtual void setLayerPosition(int id, const QPoint &position) = 0;
+    virtual void setLayerAlpha(int id, qreal alpha) = 0;
+    virtual bool removeLayer(int id) = 0;
+    virtual void addBlendListener(void (*callback)()) = 0;
+};
+#endif
+
 } // QPlatformInterface::Private
 
 QT_END_NAMESPACE

diff --git a/src/gui/platform/unix/qunixplatforminterface.cpp b/src/gui/platform/unix/qunixplatforminterface.cpp
@@ -88,6 +88,10 @@ QT_DEFINE_PRIVATE_PLATFORM_INTERFACE(QXcbScreen);
 QT_DEFINE_PRIVATE_PLATFORM_INTERFACE(QXcbWindow);
 #endif
 
+#if QT_CONFIG(vsp2)
+QT_DEFINE_PRIVATE_PLATFORM_INTERFACE(QVsp2Screen);
+#endif
+
 #if QT_CONFIG(evdev)
 QT_DEFINE_PRIVATE_PLATFORM_INTERFACE(QEvdevKeyMapper);
 

diff --git a/src/platformheaders/.prev_CMakeLists.txt b/src/platformheaders/.prev_CMakeLists.txt
diff --git a/src/platformheaders/CMakeLists.txt b/src/platformheaders/CMakeLists.txt
diff --git a/src/platformheaders/doc/qtplatformheaders.qdocconf b/src/platformheaders/doc/qtplatformheaders.qdocconf
diff --git a/src/platformheaders/doc/src/dontdocument.qdoc b/src/platformheaders/doc/src/dontdocument.qdoc
diff --git a/src/platformheaders/doc/src/qtplatformheaders.qdoc b/src/platformheaders/doc/src/qtplatformheaders.qdoc
diff --git a/src/platformheaders/eglfsfunctions/eglfsfunctions.pri b/src/platformheaders/eglfsfunctions/eglfsfunctions.pri