From 19cc6b2b80f7c5275b31ce285aad5ad9207b474e Mon Sep 17 00:00:00 2001 From: Qt Submodule Update Bot Date: Mon, 12 Aug 2019 10:39:24 +0200 Subject: [PATCH 1/2] Update submodules on '5.13.1' in qt5 Change-Id: Ibe04f05d2195953f6ab7305472d1700ec1c73312 Reviewed-by: Liang Qi --- qtlocation | 2 +- qtmultimedia | 2 +- qtsvg | 2 +- qtwebengine | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/qtlocation b/qtlocation index 46ae4e4d..8a08b56e 160000 --- a/qtlocation +++ b/qtlocation @@ -1 +1 @@ -Subproject commit 46ae4e4db687b8a12e639d9b248546652b680c04 +Subproject commit 8a08b56e71ff3d842cbfb6460a18d5ff991689db diff --git a/qtmultimedia b/qtmultimedia index 2da4e162..a5ddec65 160000 --- a/qtmultimedia +++ b/qtmultimedia @@ -1 +1 @@ -Subproject commit 2da4e162516830f4976f30c789a3fd9511dde932 +Subproject commit a5ddec658526e47e5783a89c1fd1c463d464fbe7 diff --git a/qtsvg b/qtsvg index 1bdd9b7b..fe7d2028 160000 --- a/qtsvg +++ b/qtsvg @@ -1 +1 @@ -Subproject commit 1bdd9b7bbc6d2ca83095c2f9a376ef6867674ca8 +Subproject commit fe7d20286e50c5ac08fb153436580d985d7530ea diff --git a/qtwebengine b/qtwebengine index fa555f40..a6c32599 160000 --- a/qtwebengine +++ b/qtwebengine @@ -1 +1 @@ -Subproject commit fa555f40bca60e82194bef22915bf7c545082c0e +Subproject commit a6c32599a14e1c4c61f7b9c4968f8d8635f5e29c From d19f60d7458a295c4abf36aef1332184c7de41bf Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Simo=20F=C3=A4lt?= Date: Wed, 7 Aug 2019 15:09:30 +0300 Subject: [PATCH 2/2] Provisioning: Append the emscripten to path instead of prepend Having it first in path seems to cause some confusion when detecting libc++ in darwin. Change-Id: I841e7f169e4771d3818cf156d9d78fc242e9995c Reviewed-by: Friedemann Kleint Reviewed-by: Heikki Halmet --- coin/provisioning/common/unix/emsdk.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/coin/provisioning/common/unix/emsdk.sh b/coin/provisioning/common/unix/emsdk.sh index 17af067c..acb2483a 100755 --- a/coin/provisioning/common/unix/emsdk.sh +++ b/coin/provisioning/common/unix/emsdk.sh @@ -89,7 +89,7 @@ COMPILER_ENGINE = NODE_JS JS_ENGINES = [NODE_JS] EOM -SetEnvVar "PATH" "\"$targetFolder/emscripten-llvm-e$version/:$node_js:$targetFolder/emscripten-$version:\$PATH\"" +SetEnvVar "PATH" "\"\$PATH:$targetFolder/emscripten-llvm-e$version/:$node_js:$targetFolder/emscripten-$version\"" SetEnvVar "EMSCRIPTEN" "$targetFolder/emscripten-$version" SetEnvVar "EM_CONFIG" "$targetFolder/.emscripten"