diff options
Diffstat (limited to 'tests/auto/quick')
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 |