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

Change-Id: Ib4df563fc7b1f7c40f425e0e71180d9517a672be
CryFeiFei · Oct 30, 2019 · a317bff · a317bff
2 parents b56e856 + d05ca48
commit a317bff
Show file tree

Hide file tree

Showing 25 changed files with 5,707 additions and 4,235 deletions.
diff --git a/configure.pri b/configure.pri
@@ -734,7 +734,13 @@ defineTest(qtConfOutput_preparePaths) {
         }
         have_prefix = false
     } else {
-        config.input.prefix = $$absolute_path($$config.input.prefix, $$OUT_PWD)
+        equals(XSPEC, $$[QMAKE_SPEC]) {
+            # Only make the user-specified prefix absolute if we're not cross-compiling.
+            config.input.prefix = $$absolute_path($$config.input.prefix, $$OUT_PWD)
+        } else {
+            # But we still must normalize path separators.
+            config.input.prefix = $$replace(config.input.prefix, \\\\, /)
+        }
         have_prefix = true
     }
 

diff --git a/mkspecs/features/qt_example_installs.prf b/mkspecs/features/qt_example_installs.prf
@@ -25,14 +25,16 @@ defineTest(addInstallFiles) {
     export($$1)
 }
 
-probase = $$relative_path($$_PRO_FILE_PWD_, $$dirname(_QMAKE_CONF_)/examples)
+moduleRoot = $$dirname(_QMAKE_CONF_)
+probase = $$relative_path($$_PRO_FILE_PWD_, $$moduleRoot/examples)
 isEmpty(probase)|contains(probase, ^\\..*): \
     return()
 
 isEmpty(_QMAKE_CACHE_) {
-    !equals(OUT_PWD, $$_PRO_FILE_PWD_): \
-        return()
-    error("You cannot build examples inside the Qt source tree, except as part of a proper Qt build.")
+    moduleRootRelativeToBuildDir = $$relative_path($$moduleRoot, $$OUT_PWD)
+    # Check if OUT_PWD is inside module root
+    equals(moduleRootRelativeToBuildDir, .)|contains(moduleRootRelativeToBuildDir, \(\.\./\)+\(\.\.\)?): \
+        error("You cannot build examples inside the Qt source tree, except as part of a proper Qt build.")
 }
 
 contains(TEMPLATE, "vc.*"): \

diff --git a/src/3rdparty/sqlite/patches/0001-Fix-CVE-2019-16168-in-SQLite.patch b/src/3rdparty/sqlite/patches/0001-Fix-CVE-2019-16168-in-SQLite.patch
diff --git a/src/3rdparty/sqlite/qt_attribution.json b/src/3rdparty/sqlite/qt_attribution.json
@@ -6,8 +6,8 @@
 
     "Description": "SQLite is a small C library that implements a self-contained, embeddable, zero-configuration SQL database engine.",
     "Homepage": "https://www.sqlite.org/",
-    "Version": "3.29.0",
-    "DownloadLocation": "https://www.sqlite.org/2019/sqlite-amalgamation-3290000.zip",
+    "Version": "3.30.1",
+    "DownloadLocation": "https://www.sqlite.org/2019/sqlite-amalgamation-3300100.zip",
     "License": "Public Domain",
     "Copyright": "The authors disclaim copyright to the source code. However, a license can be obtained if needed."
 }