Merge remote-tracking branch 'upstream/3.4' into merge-3.4

2026-07-30 15:53:03 +04:00 · 2020-06-04 17:55:00 +00:00
parent c3e8a82c9c ef3844a177
commit 7722a2b8a8
35 changed files with 1061 additions and 236 deletions
@@ -49,8 +49,17 @@
            postRun: [] ,
            onRuntimeInitialized: function() {
              console.log("Emscripten runtime is ready, launching QUnit tests...");
-              //console.log(cv.getBuildInformation());
-              QUnit.start();
+              if (window.cv instanceof Promise) {
+                window.cv.then((target) => {
+                   window.cv = target;
+                   //console.log(cv.getBuildInformation());
+                   QUnit.start();
+                })
+              } else {
+                // for backward compatible
+                // console.log(cv.getBuildInformation());
+                QUnit.start();
+              }
            },
            print: (function() {
              var element = document.getElementById('output');