diff options
| author | Lorn Potter <lorn.potter@gmail.com> | 2018-04-10 13:25:06 +1000 |
|---|---|---|
| committer | Morten Johan Sørvig <morten.sorvig@qt.io> | 2018-04-23 10:48:08 +0000 |
| commit | 176b62f327198166c4dc691606d562724ea438b6 (patch) | |
| tree | e14d36263100bba106860a3607de1422509f3df9 /src/quick/items | |
| parent | 0abec22f157e0931ce2622bd81d536028c9dd734 (diff) | |
webassembly: use default opengl backend
Change-Id: Iaaa9776846ae10f5f4b04f2fd4da52deeac66f0a
Reviewed-by: Morten Johan Sørvig <morten.sorvig@qt.io>
Diffstat (limited to 'src/quick/items')
| -rw-r--r-- | src/quick/items/qquickflickable.cpp | 3 | ||||
| -rw-r--r-- | src/quick/items/qquickview.cpp | 4 |
2 files changed, 3 insertions, 4 deletions
diff --git a/src/quick/items/qquickflickable.cpp b/src/quick/items/qquickflickable.cpp index 8cb64377cc..d4f10a9fd9 100644 --- a/src/quick/items/qquickflickable.cpp +++ b/src/quick/items/qquickflickable.cpp @@ -493,6 +493,9 @@ void QQuickFlickablePrivate::fixup(AxisData &data, qreal minExtent, qreal maxExt data.inOvershoot = false; fixupMode = Normal; data.vTime = timeline.time(); +#ifdef Q_OS_HTML5 + QCoreApplication::processEvents(QEventLoop::EventLoopExec); +#endif } static bool fuzzyLessThanOrEqualTo(qreal a, qreal b) diff --git a/src/quick/items/qquickview.cpp b/src/quick/items/qquickview.cpp index 17f6539974..1ac6c768e8 100644 --- a/src/quick/items/qquickview.cpp +++ b/src/quick/items/qquickview.cpp @@ -102,11 +102,7 @@ void QQuickViewPrivate::execute() } if (!source.isEmpty()) { QML_MEMORY_SCOPE_URL(engine.data()->baseUrl().resolved(source)); -#ifdef Q_OS_HTML5 - component = new QQmlComponent(engine.data(), source, QQmlComponent::PreferSynchronous, q); -#else component = new QQmlComponent(engine.data(), source, q); -#endif if (!component->isLoading()) { q->continueExecute(); } else { |