Turn the SoftwareContext plugin into the Scenegraph Software Adaptation

The 2D renderer will now become a built-in adaptation of scenegraph that
should always be available to fallback to when there are no other
renders available.  So rather than be an external plugin, now it is a
built in adaptation.

Change-Id: Ifa02fd50f3085ad1e6f1a73c3ce1e1825b677cc7
Reviewed-by: Laszlo Agocs <laszlo.agocs@theqtcompany.com>

39 files changed, 56 insertions, 79 deletions

diff --git a/src/plugins/plugins.pro b/src/plugins/plugins.pro
index b2ddb5c2c1..70a1eb22b6 100644
--- a/src/plugins/plugins.pro
+++ b/src/plugins/plugins.pro
@@ -1,5 +1,3 @@
 TEMPLATE = subdirs
 
 !contains(QT_CONFIG, no-qml-debug):SUBDIRS += qmltooling
-
-SUBDIRS += scenegraph
diff --git a/src/plugins/scenegraph/scenegraph.pro b/src/plugins/scenegraph/scenegraph.pro
deleted file mode 100644
index 807b6871b3..0000000000
--- a/src/plugins/scenegraph/scenegraph.pro
+++ /dev/null
@@ -1,2 +0,0 @@
-TEMPLATE = subdirs
-SUBDIRS += softwarecontext
diff --git a/src/plugins/scenegraph/softwarecontext/softwarecontext.json b/src/plugins/scenegraph/softwarecontext/softwarecontext.json
deleted file mode 100644
index ca87c6c38a..0000000000
--- a/src/plugins/scenegraph/softwarecontext/softwarecontext.json
+++ /dev/null
@@ -1,3 +0,0 @@
-{
-    "Keys": ["softwarecontext"]
-}
diff --git a/src/plugins/scenegraph/softwarecontext/softwarecontext.pro b/src/plugins/scenegraph/softwarecontext/softwarecontext.pro
deleted file mode 100644
index d9fd9a5f14..0000000000
--- a/src/plugins/scenegraph/softwarecontext/softwarecontext.pro
+++ /dev/null
@@ -1,52 +0,0 @@
-TARGET=softwarecontext
-
-QT += gui-private core-private quick-private qml-private
-
-PLUGIN_TYPE = scenegraph
-PLUGIN_CLASS_NAME = ContextPlugin
-load(qt_plugin)
-
-QMAKE_TARGET_PRODUCT = "Qt Quick 2D Renderer (Qt $$QT_VERSION)"
-QMAKE_TARGET_DESCRIPTION = "Quick 2D Renderer for Qt."
-
-
-#DEFINES += QTQUICK2D_DEBUG_FLUSH
-
-SOURCES += \
-    qsgsoftwarecontext.cpp \
-    qsgabstractsoftwarerenderer.cpp \
-    qsgsoftwareglyphnode.cpp \
-    qsgsoftwareimagenode.cpp \
-    qsgsoftwareninepatchnode.cpp \
-    qsgsoftwarepainternode.cpp \
-    qsgsoftwarerectanglenode.cpp \
-    qsgsoftwarepixmaprenderer.cpp \
-    qsgsoftwarepixmaptexture.cpp \
-    qsgsoftwarerenderablenode.cpp \
-    qsgsoftwarerenderablenodeupdater.cpp \
-    qsgsoftwarerenderer.cpp \
-    qsgsoftwarerenderlistbuilder.cpp \
-    qsgsoftwarerenderloop.cpp \
-    qsgsoftwarelayer.cpp \
-    qsgsoftwarecontextplugin.cpp
-
-HEADERS += \
-    qsgsoftwarecontext_p.h \
-    qsgabstractsoftwarerenderer_p.h \
-    qsgsoftwareglyphnode_p.h \
-    qsgsoftwareimagenode_p.h \
-    qsgsoftwareninepatchnode_p.h \
-    qsgsoftwarepainternode_p.h \
-    qsgsoftwarepixmaprenderer_p.h \
-    qsgsoftwarepixmaptexture_p.h \
-    qsgsoftwarerectanglenode_p.h \
-    qsgsoftwarerenderablenode_p.h \
-    qsgsoftwarerenderablenodeupdater_p.h \
-    qsgsoftwarerenderer_p.h \
-    qsgsoftwarerenderlistbuilder_p.h \
-    qsgsoftwarerenderloop_p.h \
-    qsgsoftwarelayer_p.h \
-    qsgsoftwarecontextplugin_p.h
-
-OTHER_FILES += softwarecontext.json
-
diff --git a/src/quick/scenegraph/adaptations/adaptations.pri b/src/quick/scenegraph/adaptations/adaptations.pri
index 850d2a3bbe..6b670b12f4 100644
--- a/src/quick/scenegraph/adaptations/adaptations.pri
+++ b/src/quick/scenegraph/adaptations/adaptations.pri
@@ -1,3 +1,3 @@
 include(dummy/dummy.pri)
-
+include(software/software.pri)
 config_d3d12: include(d3d12/d3d12.pri)
diff --git a/src/plugins/scenegraph/softwarecontext/qsgabstractsoftwarerenderer.cpp b/src/quick/scenegraph/adaptations/software/qsgabstractsoftwarerenderer.cpp
index 4ceaa08197..4ceaa08197 100644
--- a/src/plugins/scenegraph/softwarecontext/qsgabstractsoftwarerenderer.cpp
+++ b/src/quick/scenegraph/adaptations/software/qsgabstractsoftwarerenderer.cpp
diff --git a/src/plugins/scenegraph/softwarecontext/qsgabstractsoftwarerenderer_p.h b/src/quick/scenegraph/adaptations/software/qsgabstractsoftwarerenderer_p.h
index 87e1e594c6..87e1e594c6 100644
--- a/src/plugins/scenegraph/softwarecontext/qsgabstractsoftwarerenderer_p.h
+++ b/src/quick/scenegraph/adaptations/software/qsgabstractsoftwarerenderer_p.h
diff --git a/src/plugins/scenegraph/softwarecontext/qsgsoftwarecontextplugin.cpp b/src/quick/scenegraph/adaptations/software/qsgsoftwareadaptation.cpp
index 9eb0d8041b..55d226bf93 100644
--- a/src/plugins/scenegraph/softwarecontext/qsgsoftwarecontextplugin.cpp
+++ b/src/quick/scenegraph/adaptations/software/qsgsoftwareadaptation.cpp
@@ -37,7 +37,7 @@
 **
 ****************************************************************************/
 
-#include "qsgsoftwarecontextplugin_p.h"
+#include "qsgsoftwareadaptation_p.h"
 #include "qsgsoftwarecontext_p.h"
 #include "qsgsoftwarerenderloop_p.h"
 
@@ -46,28 +46,28 @@
 
 QT_BEGIN_NAMESPACE
 
-QSGSoftwareContextPlugin::QSGSoftwareContextPlugin(QObject *parent)
+QSGSoftwareAdaptation::QSGSoftwareAdaptation(QObject *parent)
     : QSGContextPlugin(parent)
 {
 }
 
-QStringList QSGSoftwareContextPlugin::keys() const
+QStringList QSGSoftwareAdaptation::keys() const
 {
-    return QStringList() << QLatin1String("softwarecontext");
+    return QStringList() << QLatin1String("software");
 }
 
-QSGContext *QSGSoftwareContextPlugin::create(const QString &) const
+QSGContext *QSGSoftwareAdaptation::create(const QString &) const
 {
     if (!instance)
         instance = new QSGSoftwareContext();
     return instance;
 }
 
-QSGRenderLoop *QSGSoftwareContextPlugin::createWindowManager()
+QSGRenderLoop *QSGSoftwareAdaptation::createWindowManager()
 {
     return new QSGSoftwareRenderLoop();
 }
 
-QSGSoftwareContext *QSGSoftwareContextPlugin::instance = 0;
+QSGSoftwareContext *QSGSoftwareAdaptation::instance = 0;
 
 QT_END_NAMESPACE
diff --git a/src/plugins/scenegraph/softwarecontext/qsgsoftwarecontextplugin_p.h b/src/quick/scenegraph/adaptations/software/qsgsoftwareadaptation_p.h
index c2e020cd38..3bdfd0e90d 100644
--- a/src/plugins/scenegraph/softwarecontext/qsgsoftwarecontextplugin_p.h
+++ b/src/quick/scenegraph/adaptations/software/qsgsoftwareadaptation_p.h
@@ -40,28 +40,23 @@
 #ifndef PLUGINMAIN_H
 #define PLUGINMAIN_H
 
-#include <private/qsgcontext_p.h>
 #include <private/qsgcontextplugin_p.h>
 
-#include <qplugin.h>
-
-#include "qsgsoftwarecontext_p.h"
-
 QT_BEGIN_NAMESPACE
 
-class QSGSoftwareContextPlugin : public QSGContextPlugin
-{
-    Q_OBJECT
-
-    Q_PLUGIN_METADATA(IID "org.qt-project.Qt.QSGContextFactoryInterface" FILE "softwarecontext.json")
+class QSGContext;
+class QSGRenderLoop;
+class QSGSoftwareContext;
 
+class QSGSoftwareAdaptation : public QSGContextPlugin
+{
 public:
-    QSGSoftwareContextPlugin(QObject *parent = 0);
+    QSGSoftwareAdaptation(QObject *parent = 0);
 
     QStringList keys() const override;
     QSGContext *create(const QString &key) const override;
     QSGRenderLoop *createWindowManager() override;
-
+private:
     static QSGSoftwareContext *instance;
 };
 
diff --git a/src/plugins/scenegraph/softwarecontext/qsgsoftwarecontext.cpp b/src/quick/scenegraph/adaptations/software/qsgsoftwarecontext.cpp
index 307ab206e2..307ab206e2 100644
--- a/src/plugins/scenegraph/softwarecontext/qsgsoftwarecontext.cpp
+++ b/src/quick/scenegraph/adaptations/software/qsgsoftwarecontext.cpp
diff --git a/src/plugins/scenegraph/softwarecontext/qsgsoftwarecontext_p.h b/src/quick/scenegraph/adaptations/software/qsgsoftwarecontext_p.h
index 51e69d95ed..51e69d95ed 100644
--- a/src/plugins/scenegraph/softwarecontext/qsgsoftwarecontext_p.h
+++ b/src/quick/scenegraph/adaptations/software/qsgsoftwarecontext_p.h
diff --git a/src/plugins/scenegraph/softwarecontext/qsgsoftwareglyphnode.cpp b/src/quick/scenegraph/adaptations/software/qsgsoftwareglyphnode.cpp
index d22830a831..d22830a831 100644
--- a/src/plugins/scenegraph/softwarecontext/qsgsoftwareglyphnode.cpp
+++ b/src/quick/scenegraph/adaptations/software/qsgsoftwareglyphnode.cpp
diff --git a/src/plugins/scenegraph/softwarecontext/qsgsoftwareglyphnode_p.h b/src/quick/scenegraph/adaptations/software/qsgsoftwareglyphnode_p.h
index e7efc6da9d..e7efc6da9d 100644
--- a/src/plugins/scenegraph/softwarecontext/qsgsoftwareglyphnode_p.h
+++ b/src/quick/scenegraph/adaptations/software/qsgsoftwareglyphnode_p.h
diff --git a/src/plugins/scenegraph/softwarecontext/qsgsoftwareimagenode.cpp b/src/quick/scenegraph/adaptations/software/qsgsoftwareimagenode.cpp
index 7dadc1d3d4..7dadc1d3d4 100644
--- a/src/plugins/scenegraph/softwarecontext/qsgsoftwareimagenode.cpp
+++ b/src/quick/scenegraph/adaptations/software/qsgsoftwareimagenode.cpp
diff --git a/src/plugins/scenegraph/softwarecontext/qsgsoftwareimagenode_p.h b/src/quick/scenegraph/adaptations/software/qsgsoftwareimagenode_p.h
index 7f6c4481c4..7f6c4481c4 100644
--- a/src/plugins/scenegraph/softwarecontext/qsgsoftwareimagenode_p.h
+++ b/src/quick/scenegraph/adaptations/software/qsgsoftwareimagenode_p.h
diff --git a/src/plugins/scenegraph/softwarecontext/qsgsoftwarelayer.cpp b/src/quick/scenegraph/adaptations/software/qsgsoftwarelayer.cpp
index 39e12c8797..39e12c8797 100644
--- a/src/plugins/scenegraph/softwarecontext/qsgsoftwarelayer.cpp
+++ b/src/quick/scenegraph/adaptations/software/qsgsoftwarelayer.cpp
diff --git a/src/plugins/scenegraph/softwarecontext/qsgsoftwarelayer_p.h b/src/quick/scenegraph/adaptations/software/qsgsoftwarelayer_p.h
index 2fc1948f68..2fc1948f68 100644
--- a/src/plugins/scenegraph/softwarecontext/qsgsoftwarelayer_p.h
+++ b/src/quick/scenegraph/adaptations/software/qsgsoftwarelayer_p.h
diff --git a/src/plugins/scenegraph/softwarecontext/qsgsoftwareninepatchnode.cpp b/src/quick/scenegraph/adaptations/software/qsgsoftwareninepatchnode.cpp
index 36ff1f2229..36ff1f2229 100644
--- a/src/plugins/scenegraph/softwarecontext/qsgsoftwareninepatchnode.cpp
+++ b/src/quick/scenegraph/adaptations/software/qsgsoftwareninepatchnode.cpp
diff --git a/src/plugins/scenegraph/softwarecontext/qsgsoftwareninepatchnode_p.h b/src/quick/scenegraph/adaptations/software/qsgsoftwareninepatchnode_p.h
index 68db5e1284..68db5e1284 100644
--- a/src/plugins/scenegraph/softwarecontext/qsgsoftwareninepatchnode_p.h
+++ b/src/quick/scenegraph/adaptations/software/qsgsoftwareninepatchnode_p.h
diff --git a/src/plugins/scenegraph/softwarecontext/qsgsoftwarepainternode.cpp b/src/quick/scenegraph/adaptations/software/qsgsoftwarepainternode.cpp
index 34b0cd5b72..34b0cd5b72 100644
--- a/src/plugins/scenegraph/softwarecontext/qsgsoftwarepainternode.cpp
+++ b/src/quick/scenegraph/adaptations/software/qsgsoftwarepainternode.cpp
diff --git a/src/plugins/scenegraph/softwarecontext/qsgsoftwarepainternode_p.h b/src/quick/scenegraph/adaptations/software/qsgsoftwarepainternode_p.h
index 78ecc26868..78ecc26868 100644
--- a/src/plugins/scenegraph/softwarecontext/qsgsoftwarepainternode_p.h
+++ b/src/quick/scenegraph/adaptations/software/qsgsoftwarepainternode_p.h
diff --git a/src/plugins/scenegraph/softwarecontext/qsgsoftwarepixmaprenderer.cpp b/src/quick/scenegraph/adaptations/software/qsgsoftwarepixmaprenderer.cpp
index c04dea3d8f..c04dea3d8f 100644
--- a/src/plugins/scenegraph/softwarecontext/qsgsoftwarepixmaprenderer.cpp
+++ b/src/quick/scenegraph/adaptations/software/qsgsoftwarepixmaprenderer.cpp
diff --git a/src/plugins/scenegraph/softwarecontext/qsgsoftwarepixmaprenderer_p.h b/src/quick/scenegraph/adaptations/software/qsgsoftwarepixmaprenderer_p.h
index 86c886d263..86c886d263 100644
--- a/src/plugins/scenegraph/softwarecontext/qsgsoftwarepixmaprenderer_p.h
+++ b/src/quick/scenegraph/adaptations/software/qsgsoftwarepixmaprenderer_p.h
diff --git a/src/plugins/scenegraph/softwarecontext/qsgsoftwarepixmaptexture.cpp b/src/quick/scenegraph/adaptations/software/qsgsoftwarepixmaptexture.cpp
index e04c400af3..e04c400af3 100644
--- a/src/plugins/scenegraph/softwarecontext/qsgsoftwarepixmaptexture.cpp
+++ b/src/quick/scenegraph/adaptations/software/qsgsoftwarepixmaptexture.cpp
diff --git a/src/plugins/scenegraph/softwarecontext/qsgsoftwarepixmaptexture_p.h b/src/quick/scenegraph/adaptations/software/qsgsoftwarepixmaptexture_p.h
index 0ddbadedae..0ddbadedae 100644
--- a/src/plugins/scenegraph/softwarecontext/qsgsoftwarepixmaptexture_p.h
+++ b/src/quick/scenegraph/adaptations/software/qsgsoftwarepixmaptexture_p.h
diff --git a/src/plugins/scenegraph/softwarecontext/qsgsoftwarerectanglenode.cpp b/src/quick/scenegraph/adaptations/software/qsgsoftwarerectanglenode.cpp
index 4acb25204e..4acb25204e 100644
--- a/src/plugins/scenegraph/softwarecontext/qsgsoftwarerectanglenode.cpp
+++ b/src/quick/scenegraph/adaptations/software/qsgsoftwarerectanglenode.cpp
diff --git a/src/plugins/scenegraph/softwarecontext/qsgsoftwarerectanglenode_p.h b/src/quick/scenegraph/adaptations/software/qsgsoftwarerectanglenode_p.h
index 3af3b39aac..3af3b39aac 100644
--- a/src/plugins/scenegraph/softwarecontext/qsgsoftwarerectanglenode_p.h
+++ b/src/quick/scenegraph/adaptations/software/qsgsoftwarerectanglenode_p.h
diff --git a/src/plugins/scenegraph/softwarecontext/qsgsoftwarerenderablenode.cpp b/src/quick/scenegraph/adaptations/software/qsgsoftwarerenderablenode.cpp
index 8f143f3984..8f143f3984 100644
--- a/src/plugins/scenegraph/softwarecontext/qsgsoftwarerenderablenode.cpp
+++ b/src/quick/scenegraph/adaptations/software/qsgsoftwarerenderablenode.cpp
diff --git a/src/plugins/scenegraph/softwarecontext/qsgsoftwarerenderablenode_p.h b/src/quick/scenegraph/adaptations/software/qsgsoftwarerenderablenode_p.h
index 841953da24..841953da24 100644
--- a/src/plugins/scenegraph/softwarecontext/qsgsoftwarerenderablenode_p.h
+++ b/src/quick/scenegraph/adaptations/software/qsgsoftwarerenderablenode_p.h
diff --git a/src/plugins/scenegraph/softwarecontext/qsgsoftwarerenderablenodeupdater.cpp b/src/quick/scenegraph/adaptations/software/qsgsoftwarerenderablenodeupdater.cpp
index 39fe272979..39fe272979 100644
--- a/src/plugins/scenegraph/softwarecontext/qsgsoftwarerenderablenodeupdater.cpp
+++ b/src/quick/scenegraph/adaptations/software/qsgsoftwarerenderablenodeupdater.cpp
diff --git a/src/plugins/scenegraph/softwarecontext/qsgsoftwarerenderablenodeupdater_p.h b/src/quick/scenegraph/adaptations/software/qsgsoftwarerenderablenodeupdater_p.h
index 1c7e6bb8ab..1c7e6bb8ab 100644
--- a/src/plugins/scenegraph/softwarecontext/qsgsoftwarerenderablenodeupdater_p.h
+++ b/src/quick/scenegraph/adaptations/software/qsgsoftwarerenderablenodeupdater_p.h
diff --git a/src/plugins/scenegraph/softwarecontext/qsgsoftwarerenderer.cpp b/src/quick/scenegraph/adaptations/software/qsgsoftwarerenderer.cpp
index 4397178c7d..4397178c7d 100644
--- a/src/plugins/scenegraph/softwarecontext/qsgsoftwarerenderer.cpp
+++ b/src/quick/scenegraph/adaptations/software/qsgsoftwarerenderer.cpp
diff --git a/src/plugins/scenegraph/softwarecontext/qsgsoftwarerenderer_p.h b/src/quick/scenegraph/adaptations/software/qsgsoftwarerenderer_p.h
index 9f558a46d5..9f558a46d5 100644
--- a/src/plugins/scenegraph/softwarecontext/qsgsoftwarerenderer_p.h
+++ b/src/quick/scenegraph/adaptations/software/qsgsoftwarerenderer_p.h
diff --git a/src/plugins/scenegraph/softwarecontext/qsgsoftwarerenderlistbuilder.cpp b/src/quick/scenegraph/adaptations/software/qsgsoftwarerenderlistbuilder.cpp
index af81ff61c3..af81ff61c3 100644
--- a/src/plugins/scenegraph/softwarecontext/qsgsoftwarerenderlistbuilder.cpp
+++ b/src/quick/scenegraph/adaptations/software/qsgsoftwarerenderlistbuilder.cpp
diff --git a/src/plugins/scenegraph/softwarecontext/qsgsoftwarerenderlistbuilder_p.h b/src/quick/scenegraph/adaptations/software/qsgsoftwarerenderlistbuilder_p.h
index d0d492c368..d0d492c368 100644
--- a/src/plugins/scenegraph/softwarecontext/qsgsoftwarerenderlistbuilder_p.h
+++ b/src/quick/scenegraph/adaptations/software/qsgsoftwarerenderlistbuilder_p.h
diff --git a/src/plugins/scenegraph/softwarecontext/qsgsoftwarerenderloop.cpp b/src/quick/scenegraph/adaptations/software/qsgsoftwarerenderloop.cpp
index cbd4cd2655..cbd4cd2655 100644
--- a/src/plugins/scenegraph/softwarecontext/qsgsoftwarerenderloop.cpp
+++ b/src/quick/scenegraph/adaptations/software/qsgsoftwarerenderloop.cpp
diff --git a/src/plugins/scenegraph/softwarecontext/qsgsoftwarerenderloop_p.h b/src/quick/scenegraph/adaptations/software/qsgsoftwarerenderloop_p.h
index ed69f86eff..ed69f86eff 100644
--- a/src/plugins/scenegraph/softwarecontext/qsgsoftwarerenderloop_p.h
+++ b/src/quick/scenegraph/adaptations/software/qsgsoftwarerenderloop_p.h
diff --git a/src/quick/scenegraph/adaptations/software/software.pri b/src/quick/scenegraph/adaptations/software/software.pri
new file mode 100644
index 0000000000..b8cdbc4a25
--- /dev/null
+++ b/src/quick/scenegraph/adaptations/software/software.pri
@@ -0,0 +1,39 @@
+QT += gui-private core-private qml-private
+
+#DEFINES += QTQUICK2D_DEBUG_FLUSH
+
+SOURCES += \
+    $$PWD/qsgsoftwarecontext.cpp \
+    $$PWD/qsgabstractsoftwarerenderer.cpp \
+    $$PWD/qsgsoftwareglyphnode.cpp \
+    $$PWD/qsgsoftwareimagenode.cpp \
+    $$PWD/qsgsoftwareninepatchnode.cpp \
+    $$PWD/qsgsoftwarepainternode.cpp \
+    $$PWD/qsgsoftwarerectanglenode.cpp \
+    $$PWD/qsgsoftwarepixmaprenderer.cpp \
+    $$PWD/qsgsoftwarepixmaptexture.cpp \
+    $$PWD/qsgsoftwarerenderablenode.cpp \
+    $$PWD/qsgsoftwarerenderablenodeupdater.cpp \
+    $$PWD/qsgsoftwarerenderer.cpp \
+    $$PWD/qsgsoftwarerenderlistbuilder.cpp \
+    $$PWD/qsgsoftwarerenderloop.cpp \
+    $$PWD/qsgsoftwarelayer.cpp \
+    $$PWD/qsgsoftwareadaptation.cpp
+
+HEADERS += \
+    $$PWD/qsgsoftwarecontext_p.h \
+    $$PWD/qsgabstractsoftwarerenderer_p.h \
+    $$PWD/qsgsoftwareglyphnode_p.h \
+    $$PWD/qsgsoftwareimagenode_p.h \
+    $$PWD/qsgsoftwareninepatchnode_p.h \
+    $$PWD/qsgsoftwarepainternode_p.h \
+    $$PWD/qsgsoftwarepixmaprenderer_p.h \
+    $$PWD/qsgsoftwarepixmaptexture_p.h \
+    $$PWD/qsgsoftwarerectanglenode_p.h \
+    $$PWD/qsgsoftwarerenderablenode_p.h \
+    $$PWD/qsgsoftwarerenderablenodeupdater_p.h \
+    $$PWD/qsgsoftwarerenderer_p.h \
+    $$PWD/qsgsoftwarerenderlistbuilder_p.h \
+    $$PWD/qsgsoftwarerenderloop_p.h \
+    $$PWD/qsgsoftwarelayer_p.h \
+    $$PWD/qsgsoftwareadaptation_p.h
diff --git a/src/quick/scenegraph/qsgcontextplugin.cpp b/src/quick/scenegraph/qsgcontextplugin.cpp
index 87b4ed5b8e..cf12918e3e 100644
--- a/src/quick/scenegraph/qsgcontextplugin.cpp
+++ b/src/quick/scenegraph/qsgcontextplugin.cpp
@@ -45,6 +45,7 @@
 
 // Built-in adaptations
 #include <QtQuick/private/qsgdummyadaptation_p.h>
+#include <QtQuick/private/qsgsoftwareadaptation_p.h>
 #ifdef QSG_D3D12
 #include <QtQuick/private/qsgd3d12adaptation_p.h>
 #endif
@@ -84,6 +85,7 @@ QSGAdaptionBackendData::QSGAdaptionBackendData()
 {
     // Fill in the table with the built-in adaptations.
     builtIns.append(new QSGDummyAdaptation);
+    builtIns.append(new QSGSoftwareAdaptation);
 #ifdef QSG_D3D12
     builtIns.append(new QSGD3D12Adaptation);
 #endif