From eb6201b2af725d64e5e92f19a512b1ff23ceba51 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Morten=20Johan=20S=C3=B8rvig?= <morten.sorvig@qt.io>
Date: Mon, 4 Jun 2018 11:33:45 +0200
Subject: WebAssembly for QtDeclarative

This is the squashed diff from wip/webassembly to 5.12.

Done-with: Lorn Potter <lorn.potter@gmail.com>
Change-Id: Ieef34accefef38018a66d3c39bfacb825af4bea6
Reviewed-by: Lorn Potter <lorn.potter@gmail.com>
---
 tools/tools.pro | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'tools')

diff --git a/tools/tools.pro b/tools/tools.pro
index 22544d60d3..3f5f23eb32 100644
--- a/tools/tools.pro
+++ b/tools/tools.pro
@@ -9,7 +9,7 @@ qtConfig(qml-devtools) {
     qtConfig(commandlineparser):qtConfig(xmlstreamwriter): SUBDIRS += qmlcachegen
 }
 
-!android|android_app {
+qtConfig(thread):!android|android_app {
     SUBDIRS += \
         qml
 
-- 
cgit v1.2.3


From a7472867f407f1226d82aa7bce4cd4d6f9bd652f Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Morten=20Johan=20S=C3=B8rvig?= <morten.sorvig@qt.io>
Date: Mon, 2 Jul 2018 22:27:11 +0200
Subject: Make QtDeclarative work for the no-thread config

Force use of the basic render loop, adapt qqmlthread
and qqmltypeloader to work on a single thread.

Disable components and features that require worker
threads: qmldb_server, worker script, shapes, folderlistmodel,
threaded render loop, software renderer.

Done-with: Lorn Potter <lorn.potter@gmail.com>
Change-Id: I77d965947f684f8b7d19284b5decd893395316cb
Reviewed-by: Lorn Potter <lorn.potter@gmail.com>
---
 tools/qmlscene/main.cpp | 2 ++
 1 file changed, 2 insertions(+)

(limited to 'tools')

diff --git a/tools/qmlscene/main.cpp b/tools/qmlscene/main.cpp
index fab3dcce67..4d18a868a2 100644
--- a/tools/qmlscene/main.cpp
+++ b/tools/qmlscene/main.cpp
@@ -51,8 +51,10 @@
 
 #ifdef QT_WIDGETS_LIB
 #include <QtWidgets/QApplication>
+#if QT_CONFIG(filedialog)
 #include <QtWidgets/QFileDialog>
 #endif
+#endif
 
 #include <QtCore/QTranslator>
 #include <QtCore/QLibraryInfo>
-- 
cgit v1.2.3