From 880824649aa617a715b6d9a31fd1dba18df75a7b Mon Sep 17 00:00:00 2001
From: Kai Koehne <kai.koehne@qt.io>
Date: Fri, 27 May 2016 12:43:43 +0200
Subject: Fix 'The command line is too long' errors on Windows
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

If all arguments are made absolute the system command line easily
get's too long, which will lead to weird build errors later on.

This can be easily worked around by resolving the path names on
the callee side. Anyhow, we now have to make sure that the file
separators are consistent.

Task-number: QTBUG-53618
Change-Id: I1b28cc43dd890f6c9b723af9b70d2b2614651ba2
Reviewed-by: Michael Brüning <michael.bruning@theqtcompany.com>
---
 tools/qmake/mkspecs/features/functions.prf | 12 +++---------
 1 file changed, 3 insertions(+), 9 deletions(-)

(limited to 'tools/qmake/mkspecs')

diff --git a/tools/qmake/mkspecs/features/functions.prf b/tools/qmake/mkspecs/features/functions.prf
index 2df689bca..a4abf458c 100644
--- a/tools/qmake/mkspecs/features/functions.prf
+++ b/tools/qmake/mkspecs/features/functions.prf
@@ -112,19 +112,13 @@ defineReplace(extractCFlag) {
 }
 
 defineReplace(findMocables) {
-  input = $$1
-  for (file, input): \
-      infiles += $$absolute_path($$file, $$_PRO_FILE_PWD_)
-  mocables = $$system("python $$QTWEBENGINE_ROOT/tools/buildscripts/find-mocables $$infiles")
-  mocables = $$replace(mocables, $$re_escape($${_PRO_FILE_PWD_}/), '')
+  mocables = $$system("$$system_path(python $$QTWEBENGINE_ROOT/tools/buildscripts/find-mocables $$_PRO_FILE_PWD_ $$1)")
+  mocables = $$replace(mocables, $$re_escape($$system_path($${_PRO_FILE_PWD_}/)), '')
   return($$mocables)
 }
 
 defineReplace(findIncludedMocFiles) {
-  input = $$1
-  for (file, input): \
-      infiles += $$absolute_path($$file, $$_PRO_FILE_PWD_)
-  return($$system("python $$QTWEBENGINE_ROOT/tools/buildscripts/find-included-moc-files $$infiles"))
+  return($$system("$$system_path(python $$QTWEBENGINE_ROOT/tools/buildscripts/find-included-moc-files $$_PRO_FILE_PWD_ $$1)"))
 }
 
 defineReplace(mocOutput) {
-- 
cgit v1.2.3


From 42d864c86d8c85db7b2d42f8505d962a642e4c77 Mon Sep 17 00:00:00 2001
From: Allan Sandfeld Jensen <allan.jensen@theqtcompany.com>
Date: Mon, 30 May 2016 11:48:11 +0200
Subject: Add qtlocation dependency to sync.profile
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Without qtpositioning from qtlocation source module, we have no support
for geolocation.

Also correct a false dependency on xmlpatterns, and adds a feature
report on geolocation at configure time.

Change-Id: I7d80b8288631401bf4c8aaa2541327a52910c3e6
Reviewed-by: Michael Brüning <michael.bruning@theqtcompany.com>
---
 tools/qmake/mkspecs/features/configure.prf | 5 +++++
 1 file changed, 5 insertions(+)

(limited to 'tools/qmake/mkspecs')

diff --git a/tools/qmake/mkspecs/features/configure.prf b/tools/qmake/mkspecs/features/configure.prf
index 9d7d85535..8427b58e3 100644
--- a/tools/qmake/mkspecs/features/configure.prf
+++ b/tools/qmake/mkspecs/features/configure.prf
@@ -107,5 +107,10 @@ defineTest(finalizeConfigure) {
     } else {
         log("Proprietary codecs (H264, MP3).... Not enabled         (Default, enable with WEBENGINE_CONFIG+=use_proprietary_codecs)$${EOL}")
     }
+    qtHaveModule(positioning): {
+        log("Geolocation....................... Enabled$${EOL}")
+    } else {
+        log("Geolocation....................... Not enabled         (Requires Qt Positioning module)$${EOL}")
+    }
 }
 
-- 
cgit v1.2.3