meta-qt5: update to Qt 5.9.1 RC

Update mingw mkspec to fix Qt build

Change-Id: I1f9ff8f09a7b2cac3b26426a44139b351e39abad
Reviewed-by: Mikko Gronoff <mikko.gronoff@qt.io>

1 files changed, 30 insertions, 53 deletions

diff --git a/recipes-qt/qt5/qtbase/0001-Add-win32-g-oe-mkspec-that-uses-the-OE_-environment.patch b/recipes-qt/qt5/qtbase/0001-Add-win32-g-oe-mkspec-that-uses-the-OE_-environment.patch
index 7ce3a9e..ac4fe40 100644
--- a/recipes-qt/qt5/qtbase/0001-Add-win32-g-oe-mkspec-that-uses-the-OE_-environment.patch
+++ b/recipes-qt/qt5/qtbase/0001-Add-win32-g-oe-mkspec-that-uses-the-OE_-environment.patch
@@ -1,23 +1,25 @@
-From 5363b4d6d1f3c5683267ec3e190b85eca964eef8 Mon Sep 17 00:00:00 2001
+From 0386cb5f9a46e56a0a94f2a92e87ed52d41cf4ea 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.
 
 Upstream-Status: Inappropriate [embedded specific]
                  too OE specific, probably cannot be upstreamed
+
+Change-Id: Ic60b32f88ee6a792b0d8938e40e2d6cb19fb93aa
 ---
- mkspecs/win32-g++-oe/qmake.conf      | 109 +++++++++++++++++++++++++++++++++++
- mkspecs/win32-g++-oe/qplatformdefs.h |  42 ++++++++++++++
- 2 files changed, 151 insertions(+)
+ mkspecs/win32-g++-oe/qmake.conf      | 87 ++++++++++++++++++++++++++++++++++++
+ mkspecs/win32-g++-oe/qplatformdefs.h | 42 +++++++++++++++++
+ 2 files changed, 129 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..1c8879a
+index 0000000..76eefe5
 --- /dev/null
 +++ b/mkspecs/win32-g++-oe/qmake.conf
-@@ -0,0 +1,109 @@
+@@ -0,0 +1,87 @@
 +#
 +# qmake configuration for win32-g++
 +#
@@ -28,6 +30,7 @@ index 0000000..1c8879a
 +#
 +
 +load(device_config)
++include(../common/g++-base.conf)
 +
 +MAKEFILE_GENERATOR      = MINGW
 +QMAKE_PLATFORM          = win32 mingw
@@ -38,45 +41,22 @@ index 0000000..1c8879a
 +QMAKE_EXT_OBJ           = .o
 +QMAKE_EXT_RES           = _res.o
 +
-+QMAKE_COMPILER          = $(OE_QMAKE_COMPILER) gcc
++QMAKE_COMPILER          = $$(OE_QMAKE_COMPILER)
 +
-+QMAKE_CC                = $(OE_QMAKE_CC)
++QMAKE_CC                = $$(OE_QMAKE_CC)
 +QMAKE_LEX               = flex
 +QMAKE_LEXFLAGS          =
-+QMAKE_YACC              = byacc
++QMAKE_YACC              = bison -y
 +QMAKE_YACCFLAGS         = -d
-+QMAKE_CFLAGS            = -pipe $(OE_QMAKE_CFLAGS)
-+QMAKE_CFLAGS_DEPS       = -M
-+QMAKE_CFLAGS_WARN_ON    = -Wall -Wextra
-+QMAKE_CFLAGS_WARN_OFF   = -w
-+QMAKE_CFLAGS_RELEASE    = -O2
-+QMAKE_CFLAGS_DEBUG      = -g
-+QMAKE_CFLAGS_YACC       = -Wno-unused -Wno-parentheses
-+QMAKE_CFLAGS_SPLIT_SECTIONS = -ffunction-sections
-+QMAKE_CFLAGS_SSE2       = -msse2 -mstackrealign
-+QMAKE_CFLAGS_SSE3       = -msse3
-+QMAKE_CFLAGS_SSSE3      = -mssse3
-+QMAKE_CFLAGS_SSE4_1     = -msse4.1
-+QMAKE_CFLAGS_SSE4_2     = -msse4.2
-+QMAKE_CFLAGS_AVX        = -mavx
-+QMAKE_CFLAGS_AVX2       = -mavx2
-+QMAKE_CFLAGS_NEON       = -mfpu=neon
-+
-+QMAKE_CXX               = $(OE_QMAKE_CXX)
-+QMAKE_CXXFLAGS          = $$QMAKE_CFLAGS $(OE_QMAKE_CXXFLAGS)
-+QMAKE_CXXFLAGS_DEPS     = $$QMAKE_CFLAGS_DEPS
-+QMAKE_CXXFLAGS_WARN_ON  = $$QMAKE_CFLAGS_WARN_ON
-+QMAKE_CXXFLAGS_WARN_OFF = $$QMAKE_CFLAGS_WARN_OFF
-+QMAKE_CXXFLAGS_RELEASE  = $$QMAKE_CFLAGS_RELEASE
-+QMAKE_CXXFLAGS_DEBUG    = $$QMAKE_CFLAGS_DEBUG
-+QMAKE_CXXFLAGS_YACC     = $$QMAKE_CFLAGS_YACC
++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_CXXFLAGS_EXCEPTIONS_OFF = -fno-exceptions
-+QMAKE_CXXFLAGS_CXX11    = -std=c++0x
-+QMAKE_CXXFLAGS_SPLIT_SECTIONS = $$QMAKE_CFLAGS_SPLIT_SECTIONS
 +
 +QMAKE_INCDIR            =
 +
@@ -85,19 +65,15 @@ index 0000000..1c8879a
 +QMAKE_RUN_CXX           = $(CXX) -c $(CXXFLAGS) $(INCPATH) -o $obj $src
 +QMAKE_RUN_CXX_IMP       = $(CXX) -c $(CXXFLAGS) $(INCPATH) -o $@ $<
 +
-+QMAKE_LINK              = $(OE_QMAKE_LINK)
-+QMAKE_LINK_C            = $(OE_QMAKE_LINK)
-+QMAKE_LFLAGS            = $(OE_QMAKE_LDFLAGS)
++QMAKE_LINK              = $$(OE_QMAKE_LINK)
++QMAKE_LINK_C            = $$(OE_QMAKE_LINK)
++QMAKE_LFLAGS            = $$(OE_QMAKE_LDFLAGS)
 +QMAKE_LFLAGS_EXCEPTIONS_ON = -mthreads
-+QMAKE_LFLAGS_EXCEPTIONS_OFF =
 +QMAKE_LFLAGS_RELEASE    = -Wl,-s
-+QMAKE_LFLAGS_DEBUG      =
 +QMAKE_LFLAGS_CONSOLE    = -Wl,-subsystem,console
 +QMAKE_LFLAGS_WINDOWS    = -Wl,-subsystem,windows
 +QMAKE_LFLAGS_DLL        = -shared
-+QMAKE_LFLAGS_CXX11      =
 +QMAKE_LFLAGS_GCSECTIONS = -Wl,--gc-sections
-+QMAKE_LFLAGS_USE_GOLD   = -fuse-ld=gold
 +QMAKE_LINK_OBJECT_MAX   = 10
 +QMAKE_LINK_OBJECT_SCRIPT = object_script
 +QMAKE_PREFIX_SHLIB      =
@@ -111,21 +87,25 @@ index 0000000..1c8879a
 +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   = -llibEGL -llibGLESv2 -lgdi32 -luser32
-+QMAKE_LIBS_OPENGL_ES2_DEBUG = -llibEGLd -llibGLESv2d -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) -ru
-+QMAKE_RC                = $(RC)
++QMAKE_LIB               = $$(OE_QMAKE_AR) -rc
++QMAKE_RC                = $$(RC)
 +
-+QMAKE_STRIP             = $${OE_QMAKE_STRIP}
++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)
++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
@@ -175,6 +155,3 @@ index 0000000..9d63527
 +****************************************************************************/
 +
 +#include "../win32-g++/qplatformdefs.h"
--- 
-1.9.1
-