diff options
| author | Pierre Rossi <pierre.rossi@digia.com> | 2014-02-11 14:23:07 +0100 |
|---|---|---|
| committer | The Qt Project <gerrit-noreply@qt-project.org> | 2014-02-14 13:18:45 +0100 |
| commit | 10a9cda2c25aa453ad1fa7a0b6fbf3426f886971 (patch) | |
| tree | 11903ee49094ac790fe497af73e8af23960af062 /tests | |
| parent | c974b9c213e267c203fce1f588f667156bbca445 (diff) | |
Fixup QtQuick autotests with scene graph usage
Change-Id: Ib49ac987af9fd6af32708048613fc5e6442bb73f
Reviewed-by: Jocelyn Turcotte <jocelyn.turcotte@digia.com>
Reviewed-by: Andras Becsi <andras.becsi@digia.com>
Diffstat (limited to 'tests')
| -rw-r--r-- | tests/auto/quick/qmltests/qmltests.pro | 1 | ||||
| -rw-r--r-- | tests/auto/quick/shared/qt_webengine_quicktest.h | 6 |
2 files changed, 7 insertions, 0 deletions
diff --git a/tests/auto/quick/qmltests/qmltests.pro b/tests/auto/quick/qmltests/qmltests.pro index ee8c0362c..19df60591 100644 --- a/tests/auto/quick/qmltests/qmltests.pro +++ b/tests/auto/quick/qmltests/qmltests.pro @@ -1,6 +1,7 @@ include(../tests.pri) QT += webengine qmltest +QT_PRIVATE += quick-private IMPORTPATH += $$PWD/data diff --git a/tests/auto/quick/shared/qt_webengine_quicktest.h b/tests/auto/quick/shared/qt_webengine_quicktest.h index d3ce305fd..80b7ca7a1 100644 --- a/tests/auto/quick/shared/qt_webengine_quicktest.h +++ b/tests/auto/quick/shared/qt_webengine_quicktest.h @@ -50,6 +50,9 @@ #include <QtGui/QGuiApplication> #endif +#include "qopenglcontext.h" +#include <QtQuick/private/qsgcontext_p.h> + QT_BEGIN_NAMESPACE #ifndef QUICK_TEST_SOURCE_DIR @@ -69,6 +72,9 @@ QT_BEGIN_NAMESPACE qputenv("QTWEBENGINEPROCESS_PATH", QWP_PATH); \ if (!QCoreApplication::instance()) \ app = new Application(argc, argv); \ + QOpenGLContext shareContext; \ + shareContext.create(); \ + QSGContext::setSharedOpenGLContext(&shareContext); \ int i = quick_test_main(argc, argv, #name, QUICK_TEST_SOURCE_DIR); \ delete app; \ return i; \ |