From 29c0377f07f4942f9957ea87d59c252148dc9e5b Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Morten=20Johan=20S=C3=B8rvig?= <morten.sorvig@qt.io>
Date: Fri, 1 Jun 2018 15:13:30 +0200
Subject: WebAssembly for QtBase
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

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

Done-with: Peng Wu <peng.wu@intopalo.com>
Done-with: Sami Enne <sami.enne@intopalo.com>
Done-with: Morten Johan Sørvig <morten.sorvig@qt.io>
Started-by: Andrew Knight <andrew.knight@intopalo.com>
Change-Id: I6562433c0a38d6ec49ab675e0f104f2665f3392d
Reviewed-by: Lorn Potter <lorn.potter@gmail.com>
Reviewed-by: Eskil Abrahamsen Blomfeldt <eskil.abrahamsen-blomfeldt@qt.io>
---
 configure.pri | 11 ++++++++++-
 1 file changed, 10 insertions(+), 1 deletion(-)

(limited to 'configure.pri')

diff --git a/configure.pri b/configure.pri
index 03eacd3c07..805b985fa6 100644
--- a/configure.pri
+++ b/configure.pri
@@ -68,7 +68,7 @@ defineReplace(qtConfFunc_crossCompile) {
 }
 
 defineReplace(qtConfFunc_licenseCheck) {
-    exists($$QT_SOURCE_TREE/LICENSE.LGPL3)|exists($$QT_SOURCE_TREE/LICENSE.GPL2): \
+    exists($$QT_SOURCE_TREE/LICENSE.LGPL3)|exists($$QT_SOURCE_TREE/LICENSE.GPL2)|exists($$QT_SOURCE_TREE/LICENSE.GPL3): \
         hasOpenSource = true
     else: \
         hasOpenSource = false
@@ -187,8 +187,13 @@ defineReplace(qtConfFunc_licenseCheck) {
         theLicense = "GNU Lesser General Public License (LGPL) version 3"
         showWhat = "Type 'L' to view the GNU Lesser General Public License version 3 (LGPLv3)."
         gpl2Ok = false
+        gpl3Ok = false
         winrt {
             notTheLicense = "Note: GPL version 2 is not available on WinRT."
+        } else: wasm {
+            gpl3Ok = true
+            theLicense = "GNU General Public License (GPL) version 3"
+            showWhat = "Type 'G' to view the GNU General Public License version 3 (GPLv3)."
         } else: $$qtConfEvaluate("features.android-style-assets") {
             notTheLicense = "Note: GPL version 2 is not available due to using Android style assets."
         } else {
@@ -230,6 +235,8 @@ defineReplace(qtConfFunc_licenseCheck) {
                 licenseFile = $$QT_SOURCE_TREE/LICENSE.LGPL3
             } else: equals(commercial, no):equals(val, g):$$gpl2Ok {
                 licenseFile = $$QT_SOURCE_TREE/LICENSE.GPL2
+            } else: equals(commercial, no):equals(val, g):$$gpl3Ok {
+                licenseFile = $$QT_SOURCE_TREE/LICENSE.GPL3
             } else {
                 next()
             }
@@ -268,6 +275,8 @@ defineTest(qtConfTest_architecture) {
         content = $$cat($$test_out_dir/arch.exe, blob)
     else: android:exists($$test_out_dir/libarch.so): \
         content = $$cat($$test_out_dir/libarch.so, blob)
+    else: wasm:exists($$test_out_dir/arch.wasm): \
+        content = $$cat($$test_out_dir/arch.wasm, blob)
     else: \
         error("$$eval($${1}.label) detection binary not found.")
 
-- 
cgit v1.2.3