meta-qt5: update meta layer

First snapshot of 5.12.1 branch & other updates:

f705a8a qtsystems: update submodule
9c6ce81 qt5: cleanup mkspecs
5ebd582 qt5: update submodules
2f0b002 Merge remote-tracking branch 'qtyocto/upstream/master' into 5.12
475da47 qt3d-runtime: update to v2.2
c320af0 nativesdk-qtbase: remove packaging QA issue fix
9fc65c0 qtwebengine: Configure Ninja to honor PARALLEL_MAKE
010a29e qmllive: add new recipe
f227502 python-pyqt5: MAKEFLAGS pass -j 1 via MAKEFLAGS during do_install
fe453ec packagegroup-qt5-toolchain-target: Skip qtwebkit if opengl not found
18f82a8 python-pyqt5: Disable parallel install

Change-Id: I8869107d56ae255d22894a4f1f1ee0a6907e6131
Reviewed-by: Samuli Piippo <samuli.piippo@qt.io>

4 files changed, 19 insertions, 76 deletions

diff --git a/meta-boot2qt-distro/recipes-qt/qt5/qtbase/0001-Add-win32-g-oe-mkspec-that-uses-the-OE_-environment.patch b/meta-boot2qt-distro/recipes-qt/qt5/qtbase/0001-Add-win32-g-oe-mkspec-that-uses-the-OE_-environment.patch
index ac4fe40..7b13555 100644
--- a/meta-boot2qt-distro/recipes-qt/qt5/qtbase/0001-Add-win32-g-oe-mkspec-that-uses-the-OE_-environment.patch
+++ b/meta-boot2qt-distro/recipes-qt/qt5/qtbase/0001-Add-win32-g-oe-mkspec-that-uses-the-OE_-environment.patch
@@ -1,4 +1,4 @@
-From 0386cb5f9a46e56a0a94f2a92e87ed52d41cf4ea Mon Sep 17 00:00:00 2001
+From 8d720921ddda76fcf77c0f7ebc5ac0b873ab1595 Mon Sep 17 00:00:00 2001
 From: David Schulz <david.schulz@theqtcompany.com>
 Date: Fri, 3 Jul 2015 16:06:59 +0200
 Subject: [PATCH] Add win32-g++-oe mkspec that uses the OE_ environment.
@@ -8,108 +8,52 @@ Upstream-Status: Inappropriate [embedded specific]
 
 Change-Id: Ic60b32f88ee6a792b0d8938e40e2d6cb19fb93aa
 ---
- mkspecs/win32-g++-oe/qmake.conf      | 87 ++++++++++++++++++++++++++++++++++++
- mkspecs/win32-g++-oe/qplatformdefs.h | 42 +++++++++++++++++
- 2 files changed, 129 insertions(+)
+ mkspecs/win32-g++-oe/qmake.conf      | 31 ++++++++++++++++++++
+ mkspecs/win32-g++-oe/qplatformdefs.h | 42 ++++++++++++++++++++++++++++
+ 2 files changed, 73 insertions(+)
  create mode 100644 mkspecs/win32-g++-oe/qmake.conf
  create mode 100644 mkspecs/win32-g++-oe/qplatformdefs.h
 
 diff --git a/mkspecs/win32-g++-oe/qmake.conf b/mkspecs/win32-g++-oe/qmake.conf
 new file mode 100644
-index 0000000..76eefe5
+index 0000000000..ab759e2093
 --- /dev/null
 +++ b/mkspecs/win32-g++-oe/qmake.conf
-@@ -0,0 +1,87 @@
+@@ -0,0 +1,31 @@
 +#
 +# qmake configuration for win32-g++
 +#
-+# Written for MinGW / gcc 4.6 or higher
++# Written for MinGW-w64 / gcc 5.3 or higher
 +#
 +# Cross compile example for i686-w64-mingw32-g++:
 +#   configure -xplatform win32-g++ -device-option CROSS_COMPILE=i686-w64-mingw32-
 +#
 +
-+load(device_config)
-+include(../common/g++-base.conf)
++include(../common/g++-win32.conf)
 +
-+MAKEFILE_GENERATOR      = MINGW
-+QMAKE_PLATFORM          = win32 mingw
-+CONFIG                 += debug_and_release debug_and_release_target precompile_header
-+DEFINES                += UNICODE
-+QMAKE_COMPILER_DEFINES += __GNUC__ WIN32
-+
-+QMAKE_EXT_OBJ           = .o
-+QMAKE_EXT_RES           = _res.o
-+
-+QMAKE_COMPILER          = $$(OE_QMAKE_COMPILER)
++# modifications to g++-win32.conf
 +
 +QMAKE_CC                = $$(OE_QMAKE_CC)
-+QMAKE_LEX               = flex
-+QMAKE_LEXFLAGS          =
-+QMAKE_YACC              = bison -y
-+QMAKE_YACCFLAGS         = -d
 +QMAKE_CFLAGS           += -fno-keep-inline-dllexport $$(OE_QMAKE_CFLAGS)
 +QMAKE_CFLAGS_WARN_ON   += -Wextra
-+QMAKE_CFLAGS_SSE2      += -mstackrealign
 +
 +QMAKE_CXX               = $$(OE_QMAKE_CXX)
-+QMAKE_CXXFLAGS_THREAD   = $$QMAKE_CFLAGS_THREAD
-+QMAKE_CXXFLAGS_RTTI_ON  = -frtti
-+QMAKE_CXXFLAGS_RTTI_OFF = -fno-rtti
-+QMAKE_CXXFLAGS_EXCEPTIONS_ON = -fexceptions -mthreads
-+
-+QMAKE_INCDIR            =
-+
-+QMAKE_RUN_CC            = $(CC) -c $(CFLAGS) $(INCPATH) -o $obj $src
-+QMAKE_RUN_CC_IMP        = $(CC) -c $(CFLAGS) $(INCPATH) -o $@ $<
-+QMAKE_RUN_CXX           = $(CXX) -c $(CXXFLAGS) $(INCPATH) -o $obj $src
-+QMAKE_RUN_CXX_IMP       = $(CXX) -c $(CXXFLAGS) $(INCPATH) -o $@ $<
++QMAKE_CXXFLAGS         += -fno-keep-inline-dllexport
++QMAKE_CXXFLAGS_WARN_ON  = $$QMAKE_CFLAGS_WARN_ON
 +
 +QMAKE_LINK              = $$(OE_QMAKE_LINK)
-+QMAKE_LINK_C            = $$(OE_QMAKE_LINK)
++QMAKE_LINK_C            = $$(OE_QMAKE_CC)
 +QMAKE_LFLAGS            = $$(OE_QMAKE_LDFLAGS)
-+QMAKE_LFLAGS_EXCEPTIONS_ON = -mthreads
-+QMAKE_LFLAGS_RELEASE    = -Wl,-s
-+QMAKE_LFLAGS_CONSOLE    = -Wl,-subsystem,console
-+QMAKE_LFLAGS_WINDOWS    = -Wl,-subsystem,windows
-+QMAKE_LFLAGS_DLL        = -shared
-+QMAKE_LFLAGS_GCSECTIONS = -Wl,--gc-sections
-+QMAKE_LINK_OBJECT_MAX   = 10
-+QMAKE_LINK_OBJECT_SCRIPT = object_script
-+QMAKE_PREFIX_SHLIB      =
-+QMAKE_EXTENSION_SHLIB   = dll
-+QMAKE_PREFIX_STATICLIB  = lib
-+QMAKE_EXTENSION_STATICLIB = a
-+QMAKE_LIB_EXTENSIONS    = a dll.a
 +
-+QMAKE_LIBS              =
-+QMAKE_LIBS_CORE         = -lole32 -luuid -lws2_32 -ladvapi32 -lshell32 -luser32 -lkernel32
-+QMAKE_LIBS_GUI          = -lgdi32 -lcomdlg32 -loleaut32 -limm32 -lwinmm -lws2_32 -lole32 -luuid -luser32 -ladvapi32
-+QMAKE_LIBS_NETWORK      = -lws2_32
-+QMAKE_LIBS_OPENGL       = -lglu32 -lopengl32 -lgdi32 -luser32
-+QMAKE_LIBS_OPENGL_ES2   = -lgdi32 -luser32
-+QMAKE_LIBS_OPENGL_ES2_DEBUG = -lgdi32 -luser32
-+QMAKE_LIBS_COMPAT       = -ladvapi32 -lshell32 -lcomdlg32 -luser32 -lgdi32 -lws2_32
-+QMAKE_LIBS_QT_ENTRY     = -lmingw32 -lqtmain
-+
-+QMAKE_IDL               = midl
 +QMAKE_LIB               = $$(OE_QMAKE_AR) -rc
 +QMAKE_RC                = $$(RC)
 +
 +QMAKE_STRIP             = $$(OE_QMAKE_STRIP)
-+QMAKE_STRIPFLAGS_LIB   += --strip-unneeded
-+QMAKE_OBJCOPY           = $${CROSS_COMPILE}objcopy
-+QMAKE_NM                = $${CROSS_COMPILE}nm -P
-+
-+isEmpty(QMAKE_QT_CONFIG):QMAKE_QT_CONFIG = $$(OE_QMAKE_QT_CONFIG)
-+
-+include(../common/angle.conf)
-+include(../common/gcc-base.conf)
 +
 +load(qt_config)
 diff --git a/mkspecs/win32-g++-oe/qplatformdefs.h b/mkspecs/win32-g++-oe/qplatformdefs.h
 new file mode 100644
-index 0000000..9d63527
+index 0000000000..9d63527955
 --- /dev/null
 +++ b/mkspecs/win32-g++-oe/qplatformdefs.h
 @@ -0,0 +1,42 @@
diff --git a/meta-boot2qt-distro/recipes-qt/qt5/qtbase_git.bbappend b/meta-boot2qt-distro/recipes-qt/qt5/qtbase_git.bbappend
index bd86b68..95ca956 100644
--- a/meta-boot2qt-distro/recipes-qt/qt5/qtbase_git.bbappend
+++ b/meta-boot2qt-distro/recipes-qt/qt5/qtbase_git.bbappend
@@ -47,7 +47,7 @@ PACKAGECONFIG += " \
     ltcg \
     sql-sqlite \
     tslib \
-    xkbcommon-evdev \
+    xkbcommon \
     "
 
 PACKAGECONFIG_remove = "tests"
diff --git a/meta-boot2qt-distro/recipes-qt/qt5/qtlocation/0001-location-disable-simulator-content-under-plugins.patch b/meta-boot2qt-distro/recipes-qt/qt5/qtlocation/0001-location-disable-simulator-content-under-plugins.patch
index b90d2f8..c5e9fbf 100644
--- a/meta-boot2qt-distro/recipes-qt/qt5/qtlocation/0001-location-disable-simulator-content-under-plugins.patch
+++ b/meta-boot2qt-distro/recipes-qt/qt5/qtlocation/0001-location-disable-simulator-content-under-plugins.patch
@@ -1,20 +1,19 @@
-From 5a68ac7a0121eff661a448e2fcbe5c02981c50a1 Mon Sep 17 00:00:00 2001
+From 1362ec91854e9d56be56dc3556a9991eb3b17a5c Mon Sep 17 00:00:00 2001
 From: Mikko Gronoff <mikko.gronoff@qt.io>
 Date: Wed, 25 Oct 2017 13:22:16 +0300
 Subject: [PATCH] location: disable simulator content under plugins
 
 Does not build against more recent simulator
-
 ---
  src/plugins/position/position.pro | 2 +-
  1 file changed, 1 insertion(+), 1 deletion(-)
 
 diff --git a/src/plugins/position/position.pro b/src/plugins/position/position.pro
-index 4453b8a3..c36a1b58 100644
+index 6800d5a3..a6d3edba 100644
 --- a/src/plugins/position/position.pro
 +++ b/src/plugins/position/position.pro
-@@ -6,7 +6,7 @@ qtHaveModule(dbus):SUBDIRS += geoclue
- qtHaveModule(dbus):SUBDIRS += geoclue2
+@@ -6,7 +6,7 @@ linux:qtHaveModule(dbus):SUBDIRS += geoclue
+ linux:qtHaveModule(dbus):SUBDIRS += geoclue2
  qtConfig(gypsy):SUBDIRS += gypsy
  qtConfig(winrt_geolocation):SUBDIRS += winrt
 -qtHaveModule(simulator):SUBDIRS += simulator
diff --git a/scripts/manifest.xml b/scripts/manifest.xml
index 1057a45..46f6eb6 100644
--- a/scripts/manifest.xml
+++ b/scripts/manifest.xml
@@ -26,7 +26,7 @@
            path="sources/meta-openembedded"/>
   <project name="meta-qt5"
            remote="qtyocto"
-           revision="6830447387d2bfaef1e855040068df2a7f19d485"
+           revision="f705a8a47e542a5819380f024c92e43eebf08f5e"
            path="sources/meta-qt5"/>
   <project name="meta-mingw"
            remote="qtyocto"