diff options
| author | Qt Forward Merge Bot <qt_forward_merge_bot@qt-project.org> | 2018-09-11 01:00:17 +0200 |
|---|---|---|
| committer | Qt Forward Merge Bot <qt_forward_merge_bot@qt-project.org> | 2018-09-11 01:00:17 +0200 |
| commit | aef223b55329643e4a2a122f3efef3fa17d9efbb (patch) | |
| tree | 82c70b0dd9f6e7f712e75e2986e747aaf048936b /src/quick/scenegraph | |
| parent | ac384cb45b61ba664b545e6e272f7884fd0aefae (diff) | |
| parent | de2f5d2bc11a71fe12fcc4c08fff9bf59571db36 (diff) | |
Merge remote-tracking branch 'origin/5.12' into dev
Change-Id: I09926703421b2ab6a1e0a627be96c006673c0713
Diffstat (limited to 'src/quick/scenegraph')
4 files changed, 12 insertions, 7 deletions
diff --git a/src/quick/scenegraph/adaptations/adaptations.pri b/src/quick/scenegraph/adaptations/adaptations.pri index bfd7095718..40fa739e15 100644 --- a/src/quick/scenegraph/adaptations/adaptations.pri +++ b/src/quick/scenegraph/adaptations/adaptations.pri @@ -1 +1 @@ -qtConfig(thread): include(software/software.pri) +include(software/software.pri) diff --git a/src/quick/scenegraph/adaptations/software/qsgsoftwareadaptation.cpp b/src/quick/scenegraph/adaptations/software/qsgsoftwareadaptation.cpp index a8b5944974..c33144344f 100644 --- a/src/quick/scenegraph/adaptations/software/qsgsoftwareadaptation.cpp +++ b/src/quick/scenegraph/adaptations/software/qsgsoftwareadaptation.cpp @@ -74,6 +74,7 @@ QSGContextFactoryInterface::Flags QSGSoftwareAdaptation::flags(const QString &) QSGRenderLoop *QSGSoftwareAdaptation::createWindowManager() { +#if QT_CONFIG(thread) static bool threaded = false; static bool envChecked = false; if (!envChecked) { @@ -83,6 +84,7 @@ QSGRenderLoop *QSGSoftwareAdaptation::createWindowManager() if (threaded) return new QSGSoftwareThreadedRenderLoop; +#endif return new QSGSoftwareRenderLoop(); } diff --git a/src/quick/scenegraph/adaptations/software/software.pri b/src/quick/scenegraph/adaptations/software/software.pri index de5f01cdee..278dbe7944 100644 --- a/src/quick/scenegraph/adaptations/software/software.pri +++ b/src/quick/scenegraph/adaptations/software/software.pri @@ -18,8 +18,7 @@ SOURCES += \ $$PWD/qsgsoftwarerenderlistbuilder.cpp \ $$PWD/qsgsoftwarerenderloop.cpp \ $$PWD/qsgsoftwarelayer.cpp \ - $$PWD/qsgsoftwareadaptation.cpp \ - $$PWD/qsgsoftwarethreadedrenderloop.cpp + $$PWD/qsgsoftwareadaptation.cpp HEADERS += \ $$PWD/qsgsoftwarecontext_p.h \ @@ -37,8 +36,7 @@ HEADERS += \ $$PWD/qsgsoftwarerenderlistbuilder_p.h \ $$PWD/qsgsoftwarerenderloop_p.h \ $$PWD/qsgsoftwarelayer_p.h \ - $$PWD/qsgsoftwareadaptation_p.h \ - $$PWD/qsgsoftwarethreadedrenderloop_p.h + $$PWD/qsgsoftwareadaptation_p.h qtConfig(quick-sprite) { SOURCES += \ @@ -46,3 +44,10 @@ qtConfig(quick-sprite) { HEADERS += \ $$PWD/qsgsoftwarespritenode_p.h } + +qtConfig(thread) { + SOURCES += \ + $$PWD/qsgsoftwarethreadedrenderloop.cpp + HEADERS +=\ + $$PWD/qsgsoftwarethreadedrenderloop_p.h +} diff --git a/src/quick/scenegraph/qsgcontextplugin.cpp b/src/quick/scenegraph/qsgcontextplugin.cpp index 4f8b1cf332..66add51c55 100644 --- a/src/quick/scenegraph/qsgcontextplugin.cpp +++ b/src/quick/scenegraph/qsgcontextplugin.cpp @@ -89,10 +89,8 @@ struct QSGAdaptationBackendData QSGAdaptationBackendData::QSGAdaptationBackendData() : flags(nullptr) { -#if QT_CONFIG(thread) // Fill in the table with the built-in adaptations. builtIns.append(new QSGSoftwareAdaptation); -#endif } QSGAdaptationBackendData::~QSGAdaptationBackendData() |