From 798134400a22f878b6cfd186b3792ecedb4d9123 Mon Sep 17 00:00:00 2001 From: Jocelyn Turcotte Date: Tue, 1 Apr 2014 14:46:37 +0200 Subject: Get rid of the BackingStore rendering path Now that the widgets view is also using the delegated renderer, there are no supported configuration that use the BackingStore rendering path, itself on the way of deprecation in Chromium. Change-Id: I4ab889f6a7c65e8447c259faf2c7a98b88c1acf5 Reviewed-by: Simon Hausmann --- .../qquickwebviewgraphics/qquickwebviewgraphics_software.pro | 6 ------ .../quick/qquickwebviewgraphics/tst_qquickwebviewgraphics.cpp | 4 ---- tests/auto/quick/quick.pro | 8 +++----- 3 files changed, 3 insertions(+), 15 deletions(-) delete mode 100644 tests/auto/quick/qquickwebviewgraphics/qquickwebviewgraphics_software.pro (limited to 'tests/auto/quick') diff --git a/tests/auto/quick/qquickwebviewgraphics/qquickwebviewgraphics_software.pro b/tests/auto/quick/qquickwebviewgraphics/qquickwebviewgraphics_software.pro deleted file mode 100644 index 07ef8be5b..000000000 --- a/tests/auto/quick/qquickwebviewgraphics/qquickwebviewgraphics_software.pro +++ /dev/null @@ -1,6 +0,0 @@ -TARGET = qquickwebviewgraphics -include(../tests.pri) -TARGET = $${TARGET}_software -OBJECTS_DIR = $${OBJECTS_DIR}_software - -DEFINES += TST_QQUICKWEBVIEWGRAPHICS_SOFTWARE=1 \ No newline at end of file diff --git a/tests/auto/quick/qquickwebviewgraphics/tst_qquickwebviewgraphics.cpp b/tests/auto/quick/qquickwebviewgraphics/tst_qquickwebviewgraphics.cpp index 213420b13..2595514a7 100644 --- a/tests/auto/quick/qquickwebviewgraphics/tst_qquickwebviewgraphics.cpp +++ b/tests/auto/quick/qquickwebviewgraphics/tst_qquickwebviewgraphics.cpp @@ -109,11 +109,7 @@ tst_QQuickWebViewGraphics::~tst_QQuickWebViewGraphics() // It is only called once. void tst_QQuickWebViewGraphics::initTestCase() { -#if defined(TST_QQUICKWEBVIEWGRAPHICS_SOFTWARE) - qApp->setProperty("QQuickWebEngineView_DisableHardwareAcceleration", QVariant(true)); -#else QWebEngine::initialize(); -#endif } void tst_QQuickWebViewGraphics::init() diff --git a/tests/auto/quick/quick.pro b/tests/auto/quick/quick.pro index e679184b6..bc92de6e4 100644 --- a/tests/auto/quick/quick.pro +++ b/tests/auto/quick/quick.pro @@ -1,8 +1,6 @@ TEMPLATE = subdirs SUBDIRS += \ - qquickwebviewgraphics/qquickwebviewgraphics_software.pro \ - publicapi/publicapi.pro \ - qmltests/qmltests.pro \ - -equals(QT_MAJOR_VERSION, 5):greaterThan(QT_MINOR_VERSION, 1): SUBDIRS += qquickwebviewgraphics/qquickwebviewgraphics.pro + publicapi \ + qmltests \ + qquickwebviewgraphics -- cgit v1.2.3