Merge remote-tracking branch 'origin/5.13' into 5.14

 Conflicts:
	.qmake.conf
	mkspecs/features/mac/default_post.prf
	src/corelib/tools/qsimd_p.h
	src/platformsupport/fontdatabases/mac/qcoretextfontdatabase.mm
	util/qfloat16-tables/gen_qfloat16_tables.cpp

Change-Id: If48fa8a3bc3c983706b609a6d3822cb67c1352a4

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.

examples/opengl/computegles31/glwindow.cpp

@@ -180,7 +180,7 @@ static const char *fsDisplaySource =
     "}\n";
 
 static const char *csComputeSourceV =
-        "#define COMPUTEPATCHSIZE 32 \n"
+        "#define COMPUTEPATCHSIZE 10 // Setting this to 10 to comply with MAX_COMPUTE_WORK_GROUP_INVOCATIONS for both OpenGL and OpenGLES - see QTBUG-79374 \n"
         "#define IMGFMT rgba8 \n"
         "layout (local_size_x = COMPUTEPATCHSIZE, local_size_y = COMPUTEPATCHSIZE) in;\n"
         "layout(binding=0, IMGFMT) uniform readonly highp image2D inputImage; // Use a sampler to improve performance  \n"
@@ -221,7 +221,7 @@ static const char *csComputeSourceV =
         "}\n";
 
 static const char *csComputeSourceH =
-        "#define COMPUTEPATCHSIZE 32 \n"
+        "#define COMPUTEPATCHSIZE 10 \n"
         "#define IMGFMT rgba8 \n"
         "layout (local_size_x = COMPUTEPATCHSIZE, local_size_y = COMPUTEPATCHSIZE) in;\n"
         "layout(binding=0, IMGFMT) uniform readonly highp image2D inputImage; // Use a sampler to improve performance  \n"
@@ -408,7 +408,7 @@ void GLWindow::paintGL()
 
 
     // Process input image
-    QSize workGroups = getWorkGroups( 32, QSize(m_texImageInput->width(), m_texImageInput->height()));
+    QSize workGroups = getWorkGroups(10, QSize(m_texImageInput->width(), m_texImageInput->height()));
     // Pass 1
     f->glBindImageTexture(0, m_texImageInput->textureId(), 0, 0, 0,  GL_READ_WRITE, GL_RGBA8);
     f->glBindImageTexture(1, m_texImageTmp->textureId(), 0, 0, 0,  GL_READ_WRITE, GL_RGBA8);

mkspecs/common/g++-base.conf

@@ -10,12 +10,12 @@
 
 QMAKE_COMPILER          = gcc
 
-QMAKE_CC                = gcc
+QMAKE_CC                = $${CROSS_COMPILE}gcc
 
 QMAKE_LINK_C            = $$QMAKE_CC
 QMAKE_LINK_C_SHLIB      = $$QMAKE_CC
 
-QMAKE_CXX               = g++
+QMAKE_CXX               = $${CROSS_COMPILE}g++
 
 QMAKE_LINK              = $$QMAKE_CXX
 QMAKE_LINK_SHLIB        = $$QMAKE_CXX

mkspecs/features/qt_configure.prf

@@ -759,6 +759,8 @@ defineTest(qtConfLibrary_pkgConfig) {
         return(false)
     contains($${1}.libs, ".*\\.$${QMAKE_EXTENSION_STATICLIB}$") {
         qtRunLoggedCommand("$$pkg_config --static --libs $$args", libs)|return(false)
+        # Split by space
+        eval(libs = $$libs)
         !qtConfResolveLibs($${1}.libs, $$libs): \
             return(false)
     }

mkspecs/features/resources.prf

@@ -16,63 +16,8 @@ defineReplace(xml_escape) {
     return($$1)
 }
 
-RESOURCES += qmake_immediate
-for(resource, RESOURCES) {
-    # Regular case of user qrc file
-    contains(resource, ".*\\.qrc$"): \
-        next()
-
-    # Fallback for stand-alone files/directories
-    !defined($${resource}.files, var) {
-        !equals(resource, qmake_immediate) {
-            !exists($$absolute_path($$resource, $$_PRO_FILE_PWD_)): \
-                warning("Failure to find: $$resource")
-            qmake_immediate.files += $$resource
-            OTHER_FILES *= $$resource
-        }
-        RESOURCES -= $$resource
-        next()
-    }
-
-    resource_file = $$absolute_path($$RCC_DIR/qmake_$${resource}.qrc, $$OUT_PWD)
-
-    isEmpty(BUILDS)|build_pass {
-        # Collection of files, generate qrc file
-        prefix = $$eval($${resource}.prefix)
-        isEmpty(prefix): \
-            prefix = "/"
-
-        resource_file_content = \
-            "<!DOCTYPE RCC><RCC version=\"1.0\">" \
-            "<qresource prefix=\"$$xml_escape($$prefix)\">"
-
-        abs_base = $$absolute_path($$eval($${resource}.base), $$_PRO_FILE_PWD_)
-
-        for(file, $${resource}.files) {
-            abs_path = $$absolute_path($$file, $$_PRO_FILE_PWD_)
-            files = $$files($$abs_path/*, true)
-            isEmpty(files): \
-                files = $$abs_path
-            for (file, files) {
-                exists($$file/*): next()  # exclude directories
-                alias = $$relative_path($$file, $$abs_base)
-                resource_file_content += \
-                    "<file alias=\"$$xml_escape($$alias)\">$$xml_escape($$file)</file>"
-                OTHER_FILES *= $$file
-            }
-        }
-
-        resource_file_content += \
-            "</qresource>" \
-            "</RCC>"
-
-        !write_file($$resource_file, resource_file_content): \
-            error()
-    }
-
-    RESOURCES -= $$resource
-    RESOURCES += $$resource_file
-}
+load(resources_functions)
+qtFlattenResources()
 
 !isEmpty(RESOURCES):contains(TEMPLATE, .*lib):plugin:static {
     pluginBaseName = $$basename(TARGET)

mkspecs/features/resources_functions.prf

@@ -0,0 +1,63 @@
+defineTest(qtFlattenResources) {
+    RESOURCES += qmake_immediate
+    for(resource, RESOURCES) {
+        # Regular case of user qrc file
+        contains(resource, ".*\\.qrc$"): \
+            next()
+
+        # Fallback for stand-alone files/directories
+        !defined($${resource}.files, var) {
+            !equals(resource, qmake_immediate) {
+                !exists($$absolute_path($$resource, $$_PRO_FILE_PWD_)): \
+                    warning("Failure to find: $$resource")
+                qmake_immediate.files += $$resource
+                OTHER_FILES *= $$resource
+            }
+            RESOURCES -= $$resource
+            next()
+        }
+
+        resource_file = $$absolute_path($$RCC_DIR/qmake_$${resource}.qrc, $$OUT_PWD)
+
+        isEmpty(BUILDS)|build_pass {
+            # Collection of files, generate qrc file
+            prefix = $$eval($${resource}.prefix)
+            isEmpty(prefix): \
+                prefix = "/"
+
+            resource_file_content = \
+                "<!DOCTYPE RCC><RCC version=\"1.0\">" \
+                "<qresource prefix=\"$$xml_escape($$prefix)\">"
+
+            abs_base = $$absolute_path($$eval($${resource}.base), $$_PRO_FILE_PWD_)
+
+            for(file, $${resource}.files) {
+                abs_path = $$absolute_path($$file, $$_PRO_FILE_PWD_)
+                files = $$files($$abs_path/*, true)
+                isEmpty(files): \
+                    files = $$abs_path
+                for (file, files) {
+                    exists($$file/*): next()  # exclude directories
+                    alias = $$relative_path($$file, $$abs_base)
+                    resource_file_content += \
+                        "<file alias=\"$$xml_escape($$alias)\">$$xml_escape($$file)</file>"
+                    OTHER_FILES *= $$file
+                }
+            }
+
+            resource_file_content += \
+                "</qresource>" \
+                "</RCC>"
+
+            !write_file($$resource_file, resource_file_content): \
+                error()
+        }
+
+        RESOURCES -= $$resource
+        RESOURCES += $$resource_file
+    }
+    export(RESOURCES)
+    export(OTHER_FILES)
+    export(qmake_immediate.files)
+    return(true)
+}

mkspecs/win32-icc/qmake.conf

@@ -22,7 +22,7 @@ QMAKE_CFLAGS_WARN_OFF   = -W0
 QMAKE_CFLAGS_DEBUG      = $$QMAKE_CFLAGS_OPTIMIZE_DEBUG -Zi -MDd
 QMAKE_CFLAGS_UTF8_SOURCE = -Qoption,cpp,--unicode_source_kind,UTF-8
 QMAKE_CFLAGS_LTCG       = -Qipo
-QMAKE_CFLAGS_DISABLE_LTCG = -Qno-ipo
+QMAKE_CFLAGS_DISABLE_LTCG = -Qipo-
 
 QMAKE_CFLAGS_SSE2       = -QxSSE2
 QMAKE_CFLAGS_SSE3       = -QxSSE3

qmake/generators/win32/msvc_vcproj.cpp

@@ -1581,12 +1581,14 @@ void VcprojGenerator::initExtraCompilerOutputs()
             if (!outputVar.isEmpty() && otherFilters.contains(outputVar))
                 continue;
 
-            QString tmp_out = project->first(outputs.first().toKey()).toQString();
+            QString tmp_out;
+            if (!outputs.isEmpty())
+                tmp_out = project->first(outputs.first().toKey()).toQString();
             if (project->values(ProKey(*it + ".CONFIG")).indexOf("combine") != -1) {
                 // Combined output, only one file result
                 extraCompile.addFile(Option::fixPathToTargetOS(
                         replaceExtraCompilerVariables(tmp_out, QString(), QString(), NoShell), false));
-            } else {
+            } else if (!inputVars.isEmpty()) {
                 // One output file per input
                 const ProStringList &tmp_in = project->values(inputVars.first().toKey());
                 for (int i = 0; i < tmp_in.count(); ++i) {

src/3rdparty/freetype/README

@@ -1,5 +1,5 @@
-  FreeType 2.9.1
-  ==============
+  FreeType 2.10.1
+  ===============
 
   Homepage: https://www.freetype.org
 
@@ -15,22 +15,22 @@
   Read the  files `docs/INSTALL*'  for installation  instructions; see
   the file `docs/LICENSE.TXT' for the available licenses.
 
-  The FreeType 2 API reference is located in `docs/reference'; use the
-  file   `ft2-toc.html'   as   the   top  entry   point.    Additional
+  The FreeType  2 API  reference is located  in `docs/reference/site';
+  use  the  file `index.html'  as  the  top entry  point.   Additional
   documentation is available as a separate package from our sites.  Go
   to
 
     https://download.savannah.gnu.org/releases/freetype/
 
   and download one of the following files.
 
-    freetype-doc-2.9.1.tar.bz2
-    freetype-doc-2.9.1.tar.gz
-    ftdoc291.zip
+    freetype-doc-2.10.1.tar.xz
+    freetype-doc-2.10.1.tar.gz
+    ftdoc2101.zip
 
   To view the documentation online, go to
 
-    https://www.freetype.org/freetype2/documentation.html
+    https://www.freetype.org/freetype2/docs/
 
 
   Mailing Lists
@@ -71,7 +71,7 @@
 
 ----------------------------------------------------------------------
 
-Copyright 2006-2018 by
+Copyright (C) 2006-2019 by
 David Turner, Robert Wilhelm, and Werner Lemberg.
 
 This  file is  part of  the FreeType  project, and  may only  be used,

src/3rdparty/freetype/builds/unix/ftsystem.c

@@ -4,7 +4,7 @@
 /*                                                                         */
 /*    Unix-specific FreeType low-level system interface (body).            */
 /*                                                                         */
-/*  Copyright 1996-2018 by                                                 */
+/*  Copyright (C) 1996-2019 by                                             */
 /*  David Turner, Robert Wilhelm, and Werner Lemberg.                      */
 /*                                                                         */
 /*  This file is part of the FreeType project, and may only be used,       */
@@ -173,7 +173,7 @@
   /* messages during execution.                                            */
   /*                                                                       */
 #undef  FT_COMPONENT
-#define FT_COMPONENT  trace_io
+#define FT_COMPONENT  io
 
   /* We use the macro STREAM_FILE for convenience to extract the       */
   /* system-specific stream handle from a given FreeType stream object */