vcl/backendtest/GraphicsRenderTests.cxx | 2 +- vcl/inc/qt5/QtGraphics.hxx | 2 +- vcl/inc/qt5/QtSvpGraphics.hxx | 2 +- vcl/qa/cppunit/BackendTest.cxx | 4 ++-- vcl/qa/cppunit/cjktext.cxx | 4 ++-- vcl/qa/cppunit/text.cxx | 4 ++-- 6 files changed, 9 insertions(+), 9 deletions(-)
New commits: commit 754a8591f4e8ac6aea06436430e774143b190c81 Author: Michael Weghorn <[email protected]> AuthorDate: Wed Aug 14 11:07:56 2024 +0200 Commit: Michael Weghorn <[email protected]> CommitDate: Wed Aug 14 14:01:03 2024 +0200 qt: Remove "5" from render backend name The previously named "qtsvp5" and "qt5" render backends are used for both, qt5 and qt6 since the qt6 VCL plugin exists, so drop "5" from the name. Change-Id: Ia97eb14d9229bf33d40a6a383d7656f9467ad460 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/171854 Reviewed-by: Michael Weghorn <[email protected]> Tested-by: Jenkins diff --git a/vcl/backendtest/GraphicsRenderTests.cxx b/vcl/backendtest/GraphicsRenderTests.cxx index 6f384d498ce8..2683541b15ea 100644 --- a/vcl/backendtest/GraphicsRenderTests.cxx +++ b/vcl/backendtest/GraphicsRenderTests.cxx @@ -24,7 +24,7 @@ #include <unordered_map> #define SHOULD_ASSERT \ - (aOutDevTest.getRenderBackendName() != "qt5" && aOutDevTest.getRenderBackendName() != "qt5svp" \ + (aOutDevTest.getRenderBackendName() != "qt" && aOutDevTest.getRenderBackendName() != "qtsvp" \ && aOutDevTest.getRenderBackendName() != "gtk3svp" \ && aOutDevTest.getRenderBackendName() != "aqua" \ && aOutDevTest.getRenderBackendName() != "gen" \ diff --git a/vcl/inc/qt5/QtGraphics.hxx b/vcl/inc/qt5/QtGraphics.hxx index 5277fba33923..60486dff3936 100644 --- a/vcl/inc/qt5/QtGraphics.hxx +++ b/vcl/inc/qt5/QtGraphics.hxx @@ -67,7 +67,7 @@ public: void freeResources() override {} - OUString getRenderBackendName() const override { return u"qt5"_ustr; } + OUString getRenderBackendName() const override { return u"qt"_ustr; } void setClipRegion(vcl::Region const& rRegion) override; void ResetClipRegion() override; diff --git a/vcl/inc/qt5/QtSvpGraphics.hxx b/vcl/inc/qt5/QtSvpGraphics.hxx index f3e3de3394dd..a51690c14104 100644 --- a/vcl/inc/qt5/QtSvpGraphics.hxx +++ b/vcl/inc/qt5/QtSvpGraphics.hxx @@ -48,7 +48,7 @@ public: virtual void GetResolution(sal_Int32& rDPIX, sal_Int32& rDPIY) override; - virtual OUString getRenderBackendName() const override { return u"qt5svp"_ustr; } + virtual OUString getRenderBackendName() const override { return u"qtsvp"_ustr; } }; /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/vcl/qa/cppunit/BackendTest.cxx b/vcl/qa/cppunit/BackendTest.cxx index c785d056a22d..4c2ae7cfcfd7 100644 --- a/vcl/qa/cppunit/BackendTest.cxx +++ b/vcl/qa/cppunit/BackendTest.cxx @@ -90,8 +90,8 @@ public: // silently in case a new backend is added. #define SHOULD_ASSERT \ (assertBackendNameNotEmpty(aOutDevTest.getRenderBackendName()) \ - && aOutDevTest.getRenderBackendName() != "qt5" \ - && aOutDevTest.getRenderBackendName() != "qt5svp" \ + && aOutDevTest.getRenderBackendName() != "qt" \ + && aOutDevTest.getRenderBackendName() != "qtsvp" \ && aOutDevTest.getRenderBackendName() != "gtk3svp" \ && aOutDevTest.getRenderBackendName() != "aqua" \ && aOutDevTest.getRenderBackendName() != "gen" \ diff --git a/vcl/qa/cppunit/cjktext.cxx b/vcl/qa/cppunit/cjktext.cxx index ad00de2e8893..ad86e2fe89a2 100644 --- a/vcl/qa/cppunit/cjktext.cxx +++ b/vcl/qa/cppunit/cjktext.cxx @@ -113,8 +113,8 @@ void VclCjkTextTest::testVerticalText() // Bail out on all backends that do not work (or I didn't test). Opt-out rather than opt-in // to make sure new backends fail initially. - if (device->GetGraphics()->getRenderBackendName() == "qt5" - || device->GetGraphics()->getRenderBackendName() == "qt5svp" + if (device->GetGraphics()->getRenderBackendName() == "qt" + || device->GetGraphics()->getRenderBackendName() == "qtsvp" || device->GetGraphics()->getRenderBackendName() == "gtk3svp" || device->GetGraphics()->getRenderBackendName() == "aqua" || device->GetGraphics()->getRenderBackendName() == "gen" diff --git a/vcl/qa/cppunit/text.cxx b/vcl/qa/cppunit/text.cxx index 23c8d5f963c4..ad7077a32a2a 100644 --- a/vcl/qa/cppunit/text.cxx +++ b/vcl/qa/cppunit/text.cxx @@ -142,8 +142,8 @@ CPPUNIT_TEST_FIXTURE(VclTextTest, testSimpleText) // Bail out on all backends that do not work (or I didn't test). Opt-out rather than opt-in // to make sure new backends fail initially. - if (device->GetGraphics()->getRenderBackendName() == "qt5" - || device->GetGraphics()->getRenderBackendName() == "qt5svp" + if (device->GetGraphics()->getRenderBackendName() == "qt" + || device->GetGraphics()->getRenderBackendName() == "qtsvp" || device->GetGraphics()->getRenderBackendName() == "gtk3svp" || device->GetGraphics()->getRenderBackendName() == "aqua" || device->GetGraphics()->getRenderBackendName() == "gen"
