Merge remote-tracking branch 'origin/dev' into merge-dev

Change-Id: I31b761cfd5ea01373c60d02a5da8c33398d34739

bin/syncqt.pl

@@ -209,6 +209,7 @@ sub classNames {
     $$clean = 1;
     $$requires = "";
 
+    my $suspended = 0;
     my $ihdrbase = basename($iheader);
 
     my $parsable = "";
@@ -221,9 +222,11 @@ sub classNames {
                 $$clean = 0 if ($line =~ m/^#pragma qt_sync_skip_header_check/);
                 return @ret if($line =~ m/^#pragma qt_sync_stop_processing/);
                 push(@ret, $1) if($line =~ m/^#pragma qt_class\(([^)]*)\)[\r\n]*$/);
+                $suspended = 1 if ($line =~ m/^#pragma qt_sync_suspend_processing/);
+                $suspended = 0 if ($line =~ m/^#pragma qt_sync_resume_processing/);
                 $line = 0;
             }
-            if($line) {
+            if ($line && !$suspended) {
                 $line =~ s,//.*$,,; #remove c++ comments
                 $line .= ";" if($line =~ m/^Q_[A-Z_0-9]*\(.*\)[\r\n]*$/); #qt macro
                 $line .= ";" if($line =~ m/^QT_(BEGIN|END)_HEADER[\r\n]*$/); #qt macro

config_help.txt

@@ -130,7 +130,7 @@ Build options:
                          Currently supported backends are 'etw' (Windows) and
                          'lttng' (Linux), or 'yes' for auto-detection. [no]
 
-  -sanitize {address|thread|memory|undefined}
+  -sanitize {address|thread|memory|fuzzer-no-link|undefined}
                          Instrument with the specified compiler sanitizer.
                          Note that some sanitizers cannot be combined;
                          for example, -sanitize address cannot be combined with
@@ -162,6 +162,8 @@ Build options:
   -reduce-exports ...... Reduce amount of exported symbols [auto]
   -reduce-relocations .. Reduce amount of relocations [auto] (Unix only)
 
+  -relocatable ......... Enable the Qt installation to be relocated [auto]
+
   -plugin-manifests .... Embed manifests into plugins [no] (Windows only)
   -static-runtime ...... With -static, use static runtime [no] (Windows only)
 
@@ -255,6 +257,7 @@ Network options:
   -no-openssl .......... Do not use OpenSSL [default on Apple and WinRT]
   -openssl-linked ...... Use OpenSSL and link to libssl [no]
   -openssl-runtime ..... Use OpenSSL and dynamically load libssl [auto]
+  -schannel ............ Use Secure Channel [no] (Windows only)
   -securetransport ..... Use SecureTransport [auto] (Apple only)
 
   -sctp ................ Enable SCTP support [no]

configure

@@ -525,8 +525,7 @@ while [ "$#" -gt 0 ]; do
     -android-ndk| \
     -android-ndk-platform| \
     -android-ndk-host| \
-    -android-arch| \
-    -android-toolchain-version)
+    -android-arch)
         VAR=`echo $1 | sed 's,^-\(.*\),\1,'`
         shift
         VAL="$1"

configure.json

@@ -775,12 +775,12 @@
         },
         "debug": {
             "label": "Build for debugging",
-            "autoDetect": "features.developer-build || config.win32 || config.darwin"
+            "autoDetect": "features.developer-build || (config.win32 && !config.gcc) || config.darwin"
         },
         "debug_and_release": {
             "label": "Compile libs in debug and release mode",
-            "autoDetect": "input.debug == ''",
-            "condition": "config.darwin || (config.win32 && !config.gcc)",
+            "autoDetect": "input.debug == '' && !(config.win32 && config.gcc)",
+            "condition": "config.darwin || config.win32",
             "output": [ "publicFeature", "publicQtConfig", "debugAndRelease" ]
         },
         "force_debug_info": {
@@ -894,14 +894,20 @@
             "autoDetect": false,
             "output": [ "publicConfig" ]
         },
+        "sanitize_fuzzer_no_link": {
+            "label": "Fuzzer (instrumentation only)",
+            "autoDetect": false,
+            "output": [ "publicConfig" ],
+            "purpose": [ "Adds instrumentation for fuzzing to the binaries but links to the usual main function instead of a fuzzer's." ]
+        },
         "sanitize_undefined": {
             "label": "Undefined",
             "autoDetect": false,
             "output": [ "publicConfig" ]
         },
         "sanitizer": {
             "label": "Sanitizers",
-            "condition": "features.sanitize_address || features.sanitize_thread || features.sanitize_memory || features.sanitize_undefined",
+            "condition": "features.sanitize_address || features.sanitize_thread || features.sanitize_memory || features.sanitize_fuzzer_no_link || features.sanitize_undefined",
             "output": [ "sanitizer", "publicConfig" ]
         },
         "coverage_trace_pc_guard": {
@@ -1441,6 +1447,11 @@
             "type": "error",
             "condition": "features.coverage && !config.clang",
             "message": "Command line option -coverage is only supported with clang compilers."
+        },
+        {
+            "type": "error",
+            "condition": "features.sanitize_fuzzer_no_link && !config.clang",
+            "message": "Command line option -sanitize fuzzer-no-link is only supported with clang compilers."
         }
     ],
 
@@ -1464,6 +1475,15 @@
             "type": "error",
             "condition": "!features.stl",
             "message": "Qt requires a compliant STL library."
+        },
+        {
+            "type": "emccVersion",
+            "condition": "config.wasm"
+        },
+        {
+            "type": "error",
+            "condition": "config.ios && features.debug && !features.debug_and_release",
+            "message": "Debug build wihtout Release build is not currently supported on ios see QTBUG-71990. Use -debug-and-release."
         }
     ],
 
@@ -1575,7 +1595,13 @@
                 {
                     "section": "Sanitizers",
                     "condition": "features.sanitizer",
-                    "entries": [ "sanitize_address", "sanitize_thread", "sanitize_memory", "sanitize_undefined" ]
+                    "entries": [
+                        "sanitize_address",
+                        "sanitize_thread",
+                        "sanitize_memory",
+                        "sanitize_fuzzer_no_link",
+                        "sanitize_undefined"
+                    ]
                 },
                 {
                     "message": "Code Coverage Instrumentation",

configure.pri

@@ -53,6 +53,8 @@ defineTest(qtConfCommandline_sanitize) {
             qtConfCommandlineSetInput("sanitize_thread", "yes")
         } else: equals(val, "memory") {
             qtConfCommandlineSetInput("sanitize_memory", "yes")
+        } else: equals(val, "fuzzer-no-link") {
+            qtConfCommandlineSetInput("sanitize_fuzzer_no_link", "yes")
         } else: equals(val, "undefined") {
             qtConfCommandlineSetInput("sanitize_undefined", "yes")
         } else {
@@ -92,7 +94,7 @@ defineReplace(qtConfFunc_licenseCheck) {
         hasOpenSource = true
     else: \
         hasOpenSource = false
-    exists($$QT_SOURCE_TREE/LICENSE.QT-LICENSE-AGREEMENT-4.0): \
+    exists($$QT_SOURCE_TREE/LICENSE.QT-LICENSE-AGREEMENT): \
         hasCommercial = true
     else: \
         hasCommercial = false
@@ -222,7 +224,7 @@ defineReplace(qtConfFunc_licenseCheck) {
             affix = either
         }
     } else {
-        theLicense = $$cat($$QT_SOURCE_TREE/LICENSE.QT-LICENSE-AGREEMENT-4.0, lines)
+        theLicense = $$cat($$QT_SOURCE_TREE/LICENSE.QT-LICENSE-AGREEMENT, lines)
         theLicense = $$first(theLicense)
         showWhat = "Type '?' to view the $${theLicense}."
     }
@@ -249,7 +251,7 @@ defineReplace(qtConfFunc_licenseCheck) {
             } else: equals(val, n)|equals(val, no) {
                 return(false)
             } else: equals(commercial, yes):equals(val, ?) {
-                licenseFile = $$QT_SOURCE_TREE/LICENSE.QT-LICENSE-AGREEMENT-4.0
+                licenseFile = $$QT_SOURCE_TREE/LICENSE.QT-LICENSE-AGREEMENT
             } else: equals(commercial, no):equals(val, l) {
                 licenseFile = $$QT_SOURCE_TREE/LICENSE.LGPL3
             } else: equals(commercial, no):equals(val, g):$$gpl2Ok {
@@ -607,8 +609,11 @@ defineTest(qtConfOutput_prepareOptions) {
                 qtConfAddNote("Available Android host does not match host architecture.")
             }
         } else {
-            !exists($$ndk_tc_pfx/$$ndk_host/*): \
-                qtConfFatalError("Specified Android NDK host is invalid.")
+            !exists($$ndk_tc_pfx/$$ndk_host/*) {
+                err = "Specified Android NDK host '$$ndk_host' is invalid. Expected files in the following directory to exist:"
+                err += '$${ndk_tc_pfx}/$${ndk_host}/'
+                qtConfFatalError($$err)
+            }
         }
 
         android_abis = $$eval(config.input.android-abis)
@@ -818,6 +823,8 @@ defineTest(qtConfOutput_preparePaths) {
         libloc_absolute_path = $$absolute_path($$config.rel_input.libdir, $$config.input.prefix)
     }
     config.input.liblocation_to_prefix = $$relative_path($$config.input.prefix, $$libloc_absolute_path)
+    config.qtbase.features.shared.available =
+    export(config.qtbase.features.shared.available)
 
     hostbindir_absolute_path = $$absolute_path($$config.rel_input.hostbindir, $$config.input.hostprefix)
     config.input.hostbindir_to_hostprefix = $$relative_path($$config.input.hostprefix, $$hostbindir_absolute_path)
@@ -1218,6 +1225,12 @@ defineReplace(qtConfOutputPostProcess_publicPro) {
             "QT_RELEASE_DATE = $$config.input.qt_release_date"
     }
 
+    wasm: {
+        qt_emcc_version = $$qtSystemEmccVersion()
+        output += \
+           "QT_EMCC_VERSION = $$qt_emcc_version"
+    }
+
     return($$output)
 }
 
@@ -1250,6 +1263,12 @@ defineReplace(qtConfOutputPostProcess_publicHeader) {
     !isEmpty(config.input.qt_libinfix): \
         output += "$${LITERAL_HASH}define QT_LIBINFIX \"$$eval(config.input.qt_libinfix)\""
 
+    wasm: {
+        qt_emcc_version = $$qtSystemEmccVersion()
+output += \
+           "$${LITERAL_HASH}define QT_EMCC_VERSION \"$$qt_emcc_version\""
+    }
+
     return($$output)
 }
 
@@ -1332,6 +1351,14 @@ defineTest(qtConfReport_buildMode) {
     qtConfReportPadded($$1, $$build_mode)
 }
 
+defineTest(qtConfReport_emccVersion) {
+    EMCC_VERSION = $$qtSystemEmccVersion()
+    REQ_VERSION = $$qtEmccRecommendedVersion()
+    !equals(EMCC_VERSION, $$REQ_VERSION) {
+        qtConfAddReport("You should use the recommended Emscripten version $$REQ_VERSION with this Qt. You have $$EMCC_VERSION $$QT_EMCC_VERSION")
+    }
+}
+
 # ensure pristine environment for configuration
 discard_from($$[QT_HOST_DATA/get]/mkspecs/qconfig.pri)
 discard_from($$[QT_HOST_DATA/get]/mkspecs/qmodule.pri)

dist/changes-5.13.2

@@ -0,0 +1,69 @@
+Qt 5.13.2 is a bug-fix release. It maintains both forward and backward
+compatibility (source and binary) with Qt 5.13.0 through 5.13.1.
+
+For more details, refer to the online documentation included in this
+distribution. The documentation is also available online:
+
+https://doc.qt.io/qt-5/index.html
+
+The Qt version 5.13 series is binary compatible with the 5.12.x series.
+Applications compiled for 5.12 will continue to run with 5.13.
+
+Some of the changes listed in this file include issue tracking numbers
+corresponding to tasks in the Qt Bug Tracker:
+
+https://bugreports.qt.io/
+
+Each of these identifiers can be entered in the bug tracker to obtain more
+information about a particular change.
+
+****************************************************************************
+*                                  QtCore                                  *
+****************************************************************************
+
+ - Fixed a bug that made qErrnoWarning() say there was no error when
+   generating the error message.
+
+ - QBitArray:
+   * Fixed two bugs that caused QBitArrays created using fromBits() not to
+     compare equal to the equivalent QBitArray created using other methods
+     if the size was zero or not a multiple of 4. If the size modulus 8 was
+     5, 6, or 7, the data was actually incorrect.
+
+ - QCryptographicHash:
+   * Fixed a bug that caused the SHA-3 and Keccak algorithms to crash if
+     passed 256 MB of data or more.
+
+ - QObject:
+   * Fixed a resource leak caused by a race condition if multiple QObjects
+     were created at the same time, for the first time in an application,
+     from multiple threads (implies threads not started with QThread).
+
+****************************************************************************
+*                                  QtGui                                   *
+****************************************************************************
+
+ - Text:
+   * [QTBUG-69546] Fixed a crash bug in
+     QTextDocument::clearUndoRedoStacks(QTextDocument::UndoStack).
+
+****************************************************************************
+*                                  QtSQL                                   *
+****************************************************************************
+
+ - sqlite:
+   * Updated to v3.29.0
+
+****************************************************************************
+*                        Platform-Specific Changes                         *
+****************************************************************************
+
+ - Linux:
+   * [QTBUG-61916] Added an environment variable
+     QT_QPA_PRESERVE_CONSOLE_STATE that can be used to prevent Qt from
+     altering the tty screen and cursor settings when running with
+     platforms like linuxfb and eglfs.
+
+ - Android:
+   * [QTBUG-76036] Fixed an issue where menus would not work on 64 bit
+     builds.