summaryrefslogtreecommitdiffstats
path: root/tests/auto/quick
diff options
context:
space:
mode:
authorJocelyn Turcotte <jocelyn.turcotte@digia.com>2014-04-01 14:46:37 +0200
committerThe Qt Project <gerrit-noreply@qt-project.org>2014-04-08 14:00:13 +0200
commit798134400a22f878b6cfd186b3792ecedb4d9123 (patch)
tree5ff358f5e894fa60c19c1d29067a4c9618432307 /tests/auto/quick
parent96425960f9d57387c33e3ba50785aaa81255bc98 (diff)
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 <simon.hausmann@digia.com>
Diffstat (limited to 'tests/auto/quick')
-rw-r--r--tests/auto/quick/qquickwebviewgraphics/qquickwebviewgraphics_software.pro6
-rw-r--r--tests/auto/quick/qquickwebviewgraphics/tst_qquickwebviewgraphics.cpp4
-rw-r--r--tests/auto/quick/quick.pro8
3 files changed, 3 insertions, 15 deletions
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