qt5: Update to Qt 5.6.0 branch

Change-Id: I7263e17eae03b942e915d4cc80e7e40a9028889a
Reviewed-by: David Schulz <david.schulz@theqtcompany.com>

30 files changed, 99 insertions, 93 deletions

diff --git a/recipes-qt/qt5/nativesdk-qtbase_git.bb b/recipes-qt/qt5/nativesdk-qtbase_git.bb
index ba361113..754fde35 100644
--- a/recipes-qt/qt5/nativesdk-qtbase_git.bb
+++ b/recipes-qt/qt5/nativesdk-qtbase_git.bb
@@ -6,8 +6,8 @@ HOMEPAGE = "http://qt-project.org"
 
 LICENSE = "GFDL-1.3 & BSD & (LGPL-2.1 & The-Qt-Company-Qt-LGPL-Exception-1.1 | LGPL-3.0)"
 LIC_FILES_CHKSUM = " \
-    file://LICENSE.LGPLv21;md5=58a180e1cf84c756c29f782b3a485c29 \
-    file://LICENSE.LGPLv3;md5=b8c75190712063cde04e1f41b6fdad98 \
+    file://LICENSE.LGPLv21;md5=d3bb688e8d381a9fa5ee9063114b366d \
+    file://LICENSE.LGPLv3;md5=3fd06ee442011942b532cc6dedb0b39c \
     file://LICENSE.GPLv3;md5=40f9bf30e783ddc201497165dfb32afb \
     file://LGPL_EXCEPTION.txt;md5=9625233da42f9e0ce9d63651a9d97654 \
     file://LICENSE.FDL;md5=6d9f2a9af4c8b8c3c769f6cc1b6aaf7e \
@@ -261,4 +261,4 @@ fakeroot do_generate_qt_environment_file_mingw32() {
 
 addtask generate_qt_environment_file after do_install before do_package
 
-SRCREV = "f7f4dde80e13ff1c05a9399297ffb746ab505e62"
+SRCREV = "8c2b4266002736da499d169a0da187e5cdc5381a"
diff --git a/recipes-qt/qt5/qt3d_git.bb b/recipes-qt/qt5/qt3d_git.bb
index 0ec99c61..dff99af1 100644
--- a/recipes-qt/qt5/qt3d_git.bb
+++ b/recipes-qt/qt5/qt3d_git.bb
@@ -15,4 +15,4 @@ FILES_${PN}-qmlplugins += " \
     ${OE_QMAKE_PATH_QML}/*/*/*.obj \
 "
 
-SRCREV = "9b9f34701f47824e8201453d148152fb0855f98a"
+SRCREV = "190795b1f884620ba8b31d3998ac97107d4f4eb7"
diff --git a/recipes-qt/qt5/qt5-git.inc b/recipes-qt/qt5/qt5-git.inc
index f8fb38b7..16381500 100644
--- a/recipes-qt/qt5/qt5-git.inc
+++ b/recipes-qt/qt5/qt5-git.inc
@@ -2,7 +2,7 @@
 # Copyright (C) 2013-2014 Martin Jansa <martin.jansa@gmail.com>
 
 QT_MODULE ?= "${BPN}"
-QT_MODULE_BRANCH ?= "5.6"
+QT_MODULE_BRANCH ?= "5.6.0"
 
 # each module needs to define valid SRCREV
 SRC_URI = " \
@@ -11,7 +11,7 @@ SRC_URI = " \
 
 S = "${WORKDIR}/git"
 
-PV = "5.5.99+5.6.0-alpha1+git${SRCPV}"
+PV = "5.6.0+git${SRCPV}"
 
 #LICENSE = "GFDL-1.3 & BSD & (LGPL-2.1 & The-Qt-Company-Qt-LGPL-Exception-1.1 | LGPL-3.0)"
 #LIC_FILES_CHKSUM = "file://LICENSE.LGPLv21;md5=58a180e1cf84c756c29f782b3a485c29 \
diff --git a/recipes-qt/qt5/qtbase-native_git.bb b/recipes-qt/qt5/qtbase-native_git.bb
index dc328d77..485675a8 100644
--- a/recipes-qt/qt5/qtbase-native_git.bb
+++ b/recipes-qt/qt5/qtbase-native_git.bb
@@ -4,8 +4,8 @@ SECTION = "libs"
 HOMEPAGE = "http://qt-project.org"
 LICENSE = "GFDL-1.3 & BSD & (LGPL-2.1 & The-Qt-Company-Qt-LGPL-Exception-1.1 | LGPL-3.0)"
 LIC_FILES_CHKSUM = " \
-    file://LICENSE.LGPLv21;md5=58a180e1cf84c756c29f782b3a485c29 \
-    file://LICENSE.LGPLv3;md5=b8c75190712063cde04e1f41b6fdad98 \
+    file://LICENSE.LGPLv21;md5=d3bb688e8d381a9fa5ee9063114b366d \
+    file://LICENSE.LGPLv3;md5=3fd06ee442011942b532cc6dedb0b39c \
     file://LICENSE.GPLv3;md5=40f9bf30e783ddc201497165dfb32afb \
     file://LGPL_EXCEPTION.txt;md5=9625233da42f9e0ce9d63651a9d97654 \
     file://LICENSE.FDL;md5=6d9f2a9af4c8b8c3c769f6cc1b6aaf7e \
@@ -116,4 +116,4 @@ do_install() {
     ln -sf syncqt.pl ${D}${OE_QMAKE_PATH_QT_BINS}/syncqt
 }
 
-SRCREV = "f7f4dde80e13ff1c05a9399297ffb746ab505e62"
+SRCREV = "8c2b4266002736da499d169a0da187e5cdc5381a"
diff --git a/recipes-qt/qt5/qtbase/0002-configure-Separate-host-and-build-platform.patch b/recipes-qt/qt5/qtbase/0002-configure-Separate-host-and-build-platform.patch
index 557cffa8..bfe1ba8b 100644
--- a/recipes-qt/qt5/qtbase/0002-configure-Separate-host-and-build-platform.patch
+++ b/recipes-qt/qt5/qtbase/0002-configure-Separate-host-and-build-platform.patch
@@ -1,4 +1,4 @@
-From 89784751fa045f0bf86bc87b9be4dd5b19e1227d Mon Sep 17 00:00:00 2001
+From 4a99cb44a7913ff86e644dc08578e579958983a4 Mon Sep 17 00:00:00 2001
 From: David Schulz <david.schulz@theqtcompany.com>
 Date: Mon, 12 Oct 2015 09:55:30 +0200
 Subject: [PATCH] configure: Separate host and build platform.
@@ -17,7 +17,7 @@ Change-Id: Ifd83a4c6376d3299647e74bb349a3452a6f433fc
  config.tests/unix/compile.test     |   6 +-
  configure                          | 163 ++++++++++++++++++++++++++++++++-----
  mkspecs/features/device_config.prf |  15 ++--
- mkspecs/features/qt_functions.prf  | 2 +-
+ mkspecs/features/qt_functions.prf  |   2 +-
  mkspecs/features/qt_tool.prf       |  57 ++++++++-----
  qmake/qmake-aux.pro                |  11 +++
  qmake/qmake-docs.pro               |   2 -
@@ -51,7 +51,7 @@ index c50bd8b..cfb47de 100755
  
  ARCH=""
 diff --git a/config.tests/unix/compile.test b/config.tests/unix/compile.test
-index 103321e..57769a3 100755
+index 65bc874..45c365c 100755
 --- a/config.tests/unix/compile.test
 +++ b/config.tests/unix/compile.test
 @@ -10,7 +10,9 @@ OUTDIR=$5
@@ -69,13 +69,13 @@ index 103321e..57769a3 100755
  # Make sure output from possible previous tests is gone
  rm -f "$EXE" "${EXE}.exe"
  
--set -- "$OUTDIR/bin/qmake" -nocache -spec "$QMKSPEC" "CONFIG+=$QMAKE_CONFIG" "CONFIG+=android_app" "CONFIG-=debug_and_release app_bundle lib_bundle" "LIBS*=$LFLAGS" "LIBS+=$MAC_ARCH_LFLAGS" "INCLUDEPATH*=$INCLUDEPATH" "QMAKE_CXXFLAGS*=$CXXFLAGS" "QMAKE_CXXFLAGS+=$MAC_ARCH_CXXFLAGS" "$SRCDIR/$TEST/$EXE.pro" -o "$OUTDIR/$TEST/Makefile"
-+set -- "$QMAKE" -qtconf "$QTCONF" -nocache -spec "$QMKSPEC" "CONFIG+=$QMAKE_CONFIG" "CONFIG+=android_app" "CONFIG-=debug_and_release app_bundle lib_bundle" "LIBS*=$LFLAGS" "LIBS+=$MAC_ARCH_LFLAGS" "INCLUDEPATH*=$INCLUDEPATH" "QMAKE_CXXFLAGS*=$CXXFLAGS" "QMAKE_CXXFLAGS+=$MAC_ARCH_CXXFLAGS" "$SRCDIR/$TEST/$EXE.pro" -o "$OUTDIR/$TEST/Makefile"
+-set -- "$OUTDIR/bin/qmake" -nocache -spec "$QMKSPEC" "CONFIG+=$QMAKE_CONFIG" "CONFIG+=android_app" "CONFIG-=debug_and_release app_bundle lib_bundle" "LIBS+=$LFLAGS" "LIBS+=$MAC_ARCH_LFLAGS" "INCLUDEPATH*=$INCLUDEPATH" "QMAKE_CXXFLAGS*=$CXXFLAGS" "QMAKE_CXXFLAGS+=$MAC_ARCH_CXXFLAGS" "$SRCDIR/$TEST/$EXE.pro" -o "$OUTDIR/$TEST/Makefile"
++set -- "$QMAKE" -qtconf "$QTCONF" -nocache -spec "$QMKSPEC" "CONFIG+=$QMAKE_CONFIG" "CONFIG+=android_app" "CONFIG-=debug_and_release app_bundle lib_bundle" "LIBS+=$LFLAGS" "LIBS+=$MAC_ARCH_LFLAGS" "INCLUDEPATH*=$INCLUDEPATH" "QMAKE_CXXFLAGS*=$CXXFLAGS" "QMAKE_CXXFLAGS+=$MAC_ARCH_CXXFLAGS" "$SRCDIR/$TEST/$EXE.pro" -o "$OUTDIR/$TEST/Makefile"
  if [ "$VERBOSE" = "yes" ]; then
      OUTDIR=$OUTDIR "$@" && $MAKE && SUCCESS=yes
  else
 diff --git a/configure b/configure
-index 52c1be2..6b89d34 100755
+index d923bbb..175eb02 100755
 --- a/configure
 +++ b/configure
 @@ -104,9 +104,11 @@ QT_CONFIG=
@@ -118,7 +118,7 @@ index 52c1be2..6b89d34 100755
          if [ "$BUILD_ON_MAC" = "yes" ]; then specvals=$(macSDKify "$specvals"); fi
      fi
      getSingleQMakeVariable "$1" "$specvals"
-@@ -345,7 +347,7 @@ getQMakeConf()
+@@ -355,7 +357,7 @@ getQEvalMakeConf()
  getXQMakeConf()
  {
      if [ -z "$xspecvals" ]; then
@@ -127,7 +127,7 @@ index 52c1be2..6b89d34 100755
          if [ "$XPLATFORM_MAC" = "yes" ]; then xspecvals=$(macSDKify "$xspecvals"); fi
      fi
      getSingleQMakeVariable "$1" "$xspecvals"
-@@ -478,6 +480,23 @@ resolveDeviceMkspec()
+@@ -498,6 +500,23 @@ resolveDeviceMkspec()
  }
  
  #-------------------------------------------------------------------------------
@@ -151,7 +151,7 @@ index 52c1be2..6b89d34 100755
  # operating system detection
  #-------------------------------------------------------------------------------
  
-@@ -502,12 +521,10 @@ BUILD_ON_MAC=no
+@@ -522,12 +541,10 @@ BUILD_ON_MAC=no
  if [ -d /System/Library/Frameworks/Carbon.framework ]; then
      BUILD_ON_MAC=yes
  fi
@@ -164,7 +164,7 @@ index 52c1be2..6b89d34 100755
      DEV_NULL=/tmp/empty-file
      echo "" > $DEV_NULL
      relpath=`(cd "$relpath"; pwd -W)`
-@@ -922,6 +939,7 @@ while [ "$#" -gt 0 ]; do
+@@ -932,6 +949,7 @@ while [ "$#" -gt 0 ]; do
      -hostlibdir| \
      -extprefix| \
      -sysroot| \
@@ -172,7 +172,7 @@ index 52c1be2..6b89d34 100755
      -depths| \
      -make| \
      -nomake| \
-@@ -930,6 +948,7 @@ while [ "$#" -gt 0 ]; do
+@@ -940,6 +958,7 @@ while [ "$#" -gt 0 ]; do
      -xplatform| \
      -device| \
      -device-option| \
@@ -180,7 +180,7 @@ index 52c1be2..6b89d34 100755
      -sdk| \
      -arch| \
      -host-arch| \
-@@ -1249,6 +1268,10 @@ while [ "$#" -gt 0 ]; do
+@@ -1259,6 +1278,10 @@ while [ "$#" -gt 0 ]; do
      gcc-sysroot)
          CFG_GCC_SYSROOT="$VAL"
          ;;
@@ -191,7 +191,7 @@ index 52c1be2..6b89d34 100755
      bindir)
          QT_INSTALL_BINS="$VAL"
          ;;
-@@ -1423,6 +1446,11 @@ while [ "$#" -gt 0 ]; do
+@@ -1433,6 +1456,11 @@ while [ "$#" -gt 0 ]; do
          DEV_VAL=`echo $VAL | cut -d '=' -f 2-`
          DeviceVar set $DEV_VAR "$DEV_VAL"
          ;;
@@ -203,7 +203,7 @@ index 52c1be2..6b89d34 100755
      qpa)
          QT_QPA_DEFAULT_PLATFORM="$VAL"
          ;;
-@@ -2671,6 +2699,8 @@ Additional options:
+@@ -2683,6 +2711,8 @@ Additional options:
      -device-option <key=value> ... Add device specific options for the device mkspec
                                     (experimental)
  
@@ -212,7 +212,7 @@ index 52c1be2..6b89d34 100755
   *  -no-separate-debug-info . Do not store debug information in a separate file.
      -separate-debug-info .... Strip debug information into a separate file.
  
-@@ -2702,6 +2732,9 @@ Additional options:
+@@ -2714,6 +2744,9 @@ Additional options:
      -sysroot <dir> ...... Sets <dir> as the target compiler's and qmake's sysroot and also sets pkg-config paths.
      -no-gcc-sysroot ..... When using -sysroot, it disables the passing of --sysroot to the compiler
  
@@ -222,7 +222,7 @@ index 52c1be2..6b89d34 100755
      -no-feature-<feature> Do not compile in <feature>.
      -feature-<feature> .. Compile in <feature>. The available features
                            are described in src/corelib/global/qfeatures.txt
-@@ -3301,7 +3301,7 @@ if [ -d "$XPLATFORM" ]; then
+@@ -3280,7 +3313,7 @@ if [ -d "$XPLATFORM" ]; then
  else
    XQMAKESPEC="$relpath/mkspecs/${XPLATFORM}"
  fi
@@ -231,7 +231,7 @@ index 52c1be2..6b89d34 100755
      QT_CROSS_COMPILE=yes
      QMAKE_CONFIG="$QMAKE_CONFIG cross_compile"
      QTCONFIG_CONFIG="$QTCONFIG_CONFIG cross_compile"
-@@ -4039,7 +4072,8 @@ if true; then ###[ '!' -f "$outpath/bin/qmake" ];
+@@ -4059,7 +4092,8 @@ if true; then ###[ '!' -f "$outpath/bin/qmake" ];
                  EXTRA_LFLAGS="\$(QMAKE_LFLAGS_RPATH)\"$rpath\" $EXTRA_LFLAGS"
              done
          fi
@@ -241,7 +241,7 @@ index 52c1be2..6b89d34 100755
              EXTRA_CFLAGS="-DUNICODE"
              EXTRA_CXXFLAGS="-DUNICODE"
              EXTRA_OBJS="qfilesystemengine_win.o \
-@@ -4058,7 +4092,8 @@ if true; then ###[ '!' -f "$outpath/bin/qmake" ];
+@@ -4078,7 +4112,8 @@ if true; then ###[ '!' -f "$outpath/bin/qmake" ];
                          \"\$(SOURCE_PATH)/tools/shared/windows/registry.cpp\""
              EXTRA_LFLAGS="-static -s -lole32 -luuid -ladvapi32 -lkernel32"
              EXEEXT=".exe"
@@ -269,7 +269,7 @@ index 52c1be2..6b89d34 100755
          echo >>"$mkfile"
  	adjrelpath=`echo "$relpath" | sed 's/ /\\\\\\\\ /g'`
  	adjoutpath=`echo "$outpath" | sed 's/ /\\\\\\\\ /g'`
-@@ -4158,7 +4195,81 @@ QTCONFFILE="$outpath/bin/qt.conf"
+@@ -4178,7 +4215,81 @@ QTCONFFILE="$outpath/bin/qt.conf"
  cat > "$QTCONFFILE" <<EOF
  [EffectivePaths]
  Prefix=..
@@ -351,7 +351,7 @@ index 52c1be2..6b89d34 100755
  if [ x"$relpath" != x"$outpath" ]; then
      cat >> "$QTCONFFILE" <<EOF
  [EffectiveSourcePaths]
-@@ -4166,6 +4277,9 @@ Prefix=$relpath
+@@ -4186,6 +4297,9 @@ Prefix=$relpath
  EOF
  fi
  
@@ -361,7 +361,7 @@ index 52c1be2..6b89d34 100755
  #-------------------------------------------------------------------------------
  # write out device config before we run the test.
  #-------------------------------------------------------------------------------
-@@ -4178,9 +4292,20 @@ else
+@@ -4198,9 +4312,20 @@ else
  fi
  
  #-------------------------------------------------------------------------------
@@ -383,7 +383,7 @@ index 52c1be2..6b89d34 100755
  if [ $? != "0" ]; then
      echo "Failed to process makespec for platform '$XPLATFORM'"
      if [ "$OPT_VERBOSE" = "yes" ]; then
-@@ -4196,7 +4321,7 @@ fi
+@@ -4216,7 +4341,7 @@ fi
  #-------------------------------------------------------------------------------
  if [ -z "$PKG_CONFIG" ]; then
      # See if PKG_CONFIG is set in the mkspec:
@@ -392,7 +392,7 @@ index 52c1be2..6b89d34 100755
      [ -n "$PKG_CONFIG" ] && [ "$OPT_VERBOSE" = "yes" ] && echo "Found pkg-config from mkspec: $PKG_CONFIG"
  fi
  if [ -z "$PKG_CONFIG" ]; then
-@@ -4271,7 +4396,7 @@ compileTest()
+@@ -4291,7 +4416,7 @@ compileTest()
      if [ "$CFG_SHARED" = "no" ]; then
          test_config="$QMAKE_CONFIG static"
      fi
@@ -401,7 +401,7 @@ index 52c1be2..6b89d34 100755
  }
  
  compileTestWithPkgConfig()
-@@ -4320,7 +4445,7 @@ compileTestWithPkgConfig()
+@@ -4340,7 +4465,7 @@ compileTestWithPkgConfig()
  
  # Use config.tests/arch/arch.pro to have the compiler tell us what the target architecture is
  OUTFILE=$outpath/arch.result
@@ -410,7 +410,7 @@ index 52c1be2..6b89d34 100755
  if [ $? -eq 0 ]; then
      eval `cat "$OUTFILE"`
  else
-@@ -4333,7 +4458,7 @@ rm -f "$OUTFILE" 2>/dev/null
+@@ -4353,7 +4478,7 @@ rm -f "$OUTFILE" 2>/dev/null
  
  if [ "$QMAKESPEC" != "$XQMAKESPEC" ]; then
      # Do the same test again, using the host compiler
@@ -419,7 +419,7 @@ index 52c1be2..6b89d34 100755
      if [ $? -eq 0 ]; then
          eval `cat "$OUTFILE"`
      else
-@@ -4549,7 +4674,7 @@ fi
+@@ -4569,7 +4694,7 @@ fi
  
  # detect mips_dsp support
  if [ "$CFG_ARCH" = "mips" ] && [ "${CFG_MIPS_DSP}" = "auto" ]; then
@@ -428,7 +428,7 @@ index 52c1be2..6b89d34 100755
          CFG_MIPS_DSP=yes
      else
          CFG_MIPS_DSP=no
-@@ -4560,7 +4685,7 @@ fi
+@@ -4580,7 +4705,7 @@ fi
  
  # detect mips_dspr2 support
  if [ "$CFG_ARCH" = "mips" ] && [ "${CFG_MIPS_DSPR2}" = "auto" ]; then
@@ -437,7 +437,7 @@ index 52c1be2..6b89d34 100755
          CFG_MIPS_DSPR2=yes
      else
          CFG_MIPS_DSPR2=no
-@@ -7447,7 +7572,7 @@ rm -f "$QMAKE_VARS_FILE" 2>/dev/null
+@@ -7467,7 +7592,7 @@ rm -f "$QMAKE_VARS_FILE" 2>/dev/null
          cd ..
      fi
  
@@ -475,7 +475,7 @@ index e0383ef..9281d3e 100644
  # Provide a function to be used by mkspecs
  defineTest(deviceSanityCheckCompiler) {
 diff --git a/mkspecs/features/qt_functions.prf b/mkspecs/features/qt_functions.prf
-index 00f4bdf..6615995 100644
+index b2c2507..c16005f 100644
 --- a/mkspecs/features/qt_functions.prf
 +++ b/mkspecs/features/qt_functions.prf
 @@ -57,7 +57,7 @@ defineTest(qtHaveModule) {
@@ -488,7 +488,7 @@ index 00f4bdf..6615995 100644
              cmd = perl -w $$system_path($${cmd}.pl)
          } else: contains(QMAKE_HOST.os, Windows) {
 diff --git a/mkspecs/features/qt_tool.prf b/mkspecs/features/qt_tool.prf
-index 3f0301a..add121d 100644
+index 839c3d6..45f1b94 100644
 --- a/mkspecs/features/qt_tool.prf
 +++ b/mkspecs/features/qt_tool.prf
 @@ -17,39 +17,52 @@ DEFINES *= QT_USE_QSTRINGBUILDER
@@ -639,5 +639,5 @@ index 98ca86a..11cff9e 100644
  mkspecs.files -= $$PWD/mkspecs/modules $$PWD/mkspecs/modules-inst
  INSTALLS += mkspecs
 -- 
-2.5.0.windows.1
+1.9.1
 
diff --git a/recipes-qt/qt5/qtbase/0004-qt_module-Fix-pkgconfig-and-libtool-replacements.patch b/recipes-qt/qt5/qtbase/0004-qt_module-Fix-pkgconfig-and-libtool-replacements.patch
index 2bbb92cc..d82fef21 100644
--- a/recipes-qt/qt5/qtbase/0004-qt_module-Fix-pkgconfig-and-libtool-replacements.patch
+++ b/recipes-qt/qt5/qtbase/0004-qt_module-Fix-pkgconfig-and-libtool-replacements.patch
@@ -1,7 +1,7 @@
-From a76a6c33be512a2909904b6136a6044e4b747ffd Mon Sep 17 00:00:00 2001
+From 9d880bebf7efc83495487f8ea9a434956fe98eb0 Mon Sep 17 00:00:00 2001
 From: Martin Jansa <Martin.Jansa@gmail.com>
 Date: Sat, 27 Apr 2013 23:15:37 +0200
-Subject: [PATCH 4/9] qt_module: Fix pkgconfig and libtool replacements
+Subject: [PATCH] qt_module: Fix pkgconfig and libtool replacements
 MIME-Version: 1.0
 Content-Type: text/plain; charset=UTF-8
 Content-Transfer-Encoding: 8bit
@@ -26,7 +26,7 @@ Content-Transfer-Encoding: 8bit
 * qmake does not prefix them with QT_SYSROOT when using them
   so e.g. when building qtdeclarative we get -L/usr/lib to LINKAGE
   variable, which is unsafe for cross-compilation
-* writting QT_SYSROOT in .prl files is dangerous for sstate when
+* writing QT_SYSROOT in .prl files is dangerous for sstate when
   builds are in different directories, so we need
   SSTATE_SCAN_FILES += "*.pri *.prl"
   to make them relocateble
@@ -63,8 +63,8 @@ Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
 Signed-off-by: Andreas Müller <schnitzeltony@googlemail.com>
 ---
  mkspecs/features/qt_common.prf |  2 +-
- mkspecs/features/qt_module.prf | 10 ++++++++++
- 2 files changed, 11 insertions(+), 1 deletion(-)
+ mkspecs/features/qt_module.prf | 11 +++++++++++
+ 2 files changed, 12 insertions(+), 1 deletion(-)
 
 diff --git a/mkspecs/features/qt_common.prf b/mkspecs/features/qt_common.prf
 index 38602f6..f9c401f 100644
@@ -80,33 +80,34 @@ index 38602f6..f9c401f 100644
      lib_replace.CONFIG = path
      QMAKE_PRL_INSTALL_REPLACE += lib_replace
 diff --git a/mkspecs/features/qt_module.prf b/mkspecs/features/qt_module.prf
-index 193629b..38ff9a8 100644
+index fdce486..8e7a650 100644
 --- a/mkspecs/features/qt_module.prf
 +++ b/mkspecs/features/qt_module.prf
-@@ -255,6 +255,11 @@ unix|mingw {
+@@ -259,6 +259,11 @@ load(qt_targets)
+         pclib_replace.replace = $$QMAKE_PKGCONFIG_LIBDIR
      pclib_replace.CONFIG = path
      QMAKE_PKGCONFIG_INSTALL_REPLACE += pclib_replace
- 
++
 +    pkgconfig_include_replace.match = $$rplbase/include
 +    pkgconfig_include_replace.replace = "\$$\\{includedir}"
 +    pkgconfig_include_replace.CONFIG = path
 +    QMAKE_PKGCONFIG_INSTALL_REPLACE += pkgconfig_include_replace
+ }
+ !lib_bundle:unix {
+     CONFIG += create_libtool
+@@ -271,6 +276,12 @@ load(qt_targets)
+         ltlib_replace.replace = $$QMAKE_LIBTOOL_LIBDIR
+     ltlib_replace.CONFIG = path
+     QMAKE_LIBTOOL_INSTALL_REPLACE += ltlib_replace
 +
-     unix {
-         CONFIG += create_libtool explicitlib
-         host_build: \
-@@ -266,6 +271,11 @@ unix|mingw {
-             ltlib_replace.replace = $$QMAKE_LIBTOOL_LIBDIR
-         ltlib_replace.CONFIG = path
-         QMAKE_LIBTOOL_INSTALL_REPLACE += ltlib_replace
-+        # drop -L/usr/lib in .prl files
-+        prl_replace.match = "-L\$${libdir}"
-+        prl_replace.replace = ""
-+        prl_replace.CONFIG = path
-+        QMAKE_PRL_INSTALL_REPLACE += prl_replace
-     }
++    # drop -L/usr/lib in .prl files
++    prl_replace.match = "-L\$${libdir}"
++    prl_replace.replace = ""
++    prl_replace.CONFIG = path
++    QMAKE_PRL_INSTALL_REPLACE += prl_replace
  }
  
+ contains(QT_PRODUCT, OpenSource.*):DEFINES *= QT_OPENSOURCE
 -- 
-2.6.2
+1.9.1
 
diff --git a/recipes-qt/qt5/qtbase_git.bb b/recipes-qt/qt5/qtbase_git.bb
index 62442bc9..998d7795 100644
--- a/recipes-qt/qt5/qtbase_git.bb
+++ b/recipes-qt/qt5/qtbase_git.bb
@@ -3,8 +3,8 @@ require qt5-git.inc
 
 LICENSE = "GFDL-1.3 & BSD & (LGPL-2.1 & The-Qt-Company-Qt-LGPL-Exception-1.1 | LGPL-3.0)"
 LIC_FILES_CHKSUM = " \
-    file://LICENSE.LGPLv21;md5=58a180e1cf84c756c29f782b3a485c29 \
-    file://LICENSE.LGPLv3;md5=b8c75190712063cde04e1f41b6fdad98 \
+    file://LICENSE.LGPLv21;md5=d3bb688e8d381a9fa5ee9063114b366d \
+    file://LICENSE.LGPLv3;md5=3fd06ee442011942b532cc6dedb0b39c \
     file://LICENSE.GPLv3;md5=40f9bf30e783ddc201497165dfb32afb \
     file://LGPL_EXCEPTION.txt;md5=9625233da42f9e0ce9d63651a9d97654 \
     file://LICENSE.FDL;md5=6d9f2a9af4c8b8c3c769f6cc1b6aaf7e \
@@ -208,6 +208,7 @@ do_install_append() {
     # Remove macx-ios-clang directory because /usr/lib/qt5/mkspecs/macx-ios-clang/rename_main.sh:#!/bin/bash
     # triggers QA Issue: qtbase-mkspecs requires /bin/bash, but no providers in its RDEPENDS [file-rdeps]
     rm -rf ${D}/${OE_QMAKE_PATH_QT_ARCHDATA}/mkspecs/macx-ios-clang
+    rm -rf ${D}/${OE_QMAKE_PATH_QT_ARCHDATA}/mkspecs/features/data/mac
 
     # Replace host paths with qmake built-in properties
     sed -i -e 's|${STAGING_DIR_NATIVE}${prefix_native}|$$[QT_HOST_PREFIX/get]|g' \
@@ -249,4 +250,4 @@ sysroot_stage_dirs_append() {
     rm -rf $to${OE_QMAKE_PATH_QT_FONTS}
 }
 
-SRCREV = "f7f4dde80e13ff1c05a9399297ffb746ab505e62"
+SRCREV = "8c2b4266002736da499d169a0da187e5cdc5381a"
diff --git a/recipes-qt/qt5/qtcanvas3d_git.bb b/recipes-qt/qt5/qtcanvas3d_git.bb
index c892d9b3..a5940f25 100644
--- a/recipes-qt/qt5/qtcanvas3d_git.bb
+++ b/recipes-qt/qt5/qtcanvas3d_git.bb
@@ -10,4 +10,4 @@ LIC_FILES_CHKSUM = " \
 
 DEPENDS = "qtdeclarative"
 
-SRCREV = "a84dad27182ba6cb4c6f9bf4008a9e63346a7a83"
+SRCREV = "f669d1708c1009adc7d82d42bf550e0d971e827f"
diff --git a/recipes-qt/qt5/qtconnectivity_git.bb b/recipes-qt/qt5/qtconnectivity_git.bb
index f677f710..e3113847 100644
--- a/recipes-qt/qt5/qtconnectivity_git.bb
+++ b/recipes-qt/qt5/qtconnectivity_git.bb
@@ -25,4 +25,4 @@ do_configure_prepend() {
     sed -i 's/^qtCompileTest(bluez)/OE_BLUEZ_ENABLED:qtCompileTest(bluez)/g' ${S}/qtconnectivity.pro
 }
 
-SRCREV = "a7617f963c1d375fb7ac7d5c17f450acdb2796b8"
+SRCREV = "8b550f0a7508ed413cded71a20485e61010b0aa3"
diff --git a/recipes-qt/qt5/qtdeclarative_git.bb b/recipes-qt/qt5/qtdeclarative_git.bb
index a78d62f4..c466a52a 100644
--- a/recipes-qt/qt5/qtdeclarative_git.bb
+++ b/recipes-qt/qt5/qtdeclarative_git.bb
@@ -38,6 +38,6 @@ do_install_append_class-nativesdk() {
 
 EXTRA_QMAKEVARS_PRE += "${@base_contains('PACKAGECONFIG', 'qtxmlpatterns', 'CONFIG+=OE_QTXMLPATTERNS_ENABLED', '', d)}"
 
-SRCREV = "1064d5100f4d00af5f56b87331251f97d78f8b87"
+SRCREV = "19dffeed2e677cf03b6e122c7a15f355ebe413c8"
 
 BBCLASSEXTEND =+ "native nativesdk"
diff --git a/recipes-qt/qt5/qtenginio_git.bb b/recipes-qt/qt5/qtenginio_git.bb
index 5854abe3..23b9417c 100644
--- a/recipes-qt/qt5/qtenginio_git.bb
+++ b/recipes-qt/qt5/qtenginio_git.bb
@@ -11,4 +11,4 @@ LIC_FILES_CHKSUM = " \
 
 DEPENDS += "qtbase qtdeclarative qtxmlpatterns"
 
-SRCREV = "34d66f3836051dca35a854577fe04b45af3630f2"
+SRCREV = "2a19257a5eef7a25a05d5cf7ea69ecc4184226f3"
diff --git a/recipes-qt/qt5/qtgraphicaleffects_git.bb b/recipes-qt/qt5/qtgraphicaleffects_git.bb
index 463e15be..f80f6fad 100644
--- a/recipes-qt/qt5/qtgraphicaleffects_git.bb
+++ b/recipes-qt/qt5/qtgraphicaleffects_git.bb
@@ -17,4 +17,4 @@ DEPENDS += "qtdeclarative"
 
 RDEPENDS_${PN}-dev = ""
 
-SRCREV = "ad227e9808288b12726114365ae1474386c6cdf8"
+SRCREV = "2f0e5e726d76b8ad5a0e9b07aeb57006490e18b4"
diff --git a/recipes-qt/qt5/qtimageformats_git.bb b/recipes-qt/qt5/qtimageformats_git.bb
index a847fb28..0a97f121 100644
--- a/recipes-qt/qt5/qtimageformats_git.bb
+++ b/recipes-qt/qt5/qtimageformats_git.bb
@@ -28,4 +28,4 @@ EXTRA_QMAKEVARS_PRE += "${@base_contains('PACKAGECONFIG', 'jasper', 'CONFIG+=OE_
 EXTRA_QMAKEVARS_PRE += "${@base_contains('PACKAGECONFIG', 'libtiff', 'CONFIG+=OE_LIBTIFF_ENABLED', '', d)}"
 EXTRA_QMAKEVARS_PRE += "${@base_contains('PACKAGECONFIG', 'libwebp', 'CONFIG+=OE_LIBWEBP_ENABLED', '', d)}"
 
-SRCREV = "67cbcf399aa1a18b9b1dbac0a6572a865687230a"
+SRCREV = "0bd46d5861fa7b48c87cd3a734d00671df929869"
diff --git a/recipes-qt/qt5/qtlocation_git.bb b/recipes-qt/qt5/qtlocation_git.bb
index 2c66ad47..d6857edb 100644
--- a/recipes-qt/qt5/qtlocation_git.bb
+++ b/recipes-qt/qt5/qtlocation_git.bb
@@ -29,4 +29,4 @@ do_configure_prepend() {
 EXTRA_QMAKEVARS_PRE += "${@base_contains('PACKAGECONFIG', 'geoclue', 'CONFIG+=OE_GEOCLUE_ENABLED', '', d)}"
 EXTRA_QMAKEVARS_PRE += "${@base_contains('PACKAGECONFIG', 'gypsy', 'CONFIG+=OE_GYPSY_ENABLED', '', d)}"
 
-SRCREV = "1fd85dd9426b65198b396c686edd42e42d5b8149"
+SRCREV = "a2b6581e5a865ec1a3a7006b668e36c64d2f7ef5"
diff --git a/recipes-qt/qt5/qtmultimedia_git.bb b/recipes-qt/qt5/qtmultimedia_git.bb
index 96a21cd8..36d7f408 100644
--- a/recipes-qt/qt5/qtmultimedia_git.bb
+++ b/recipes-qt/qt5/qtmultimedia_git.bb
@@ -35,4 +35,4 @@ SRC_URI += "\
      file://0001-Initial-porting-effort-to-GStreamer-1.0.patch \
 "
 
-SRCREV = "ac1b772ec8e428acd23322a6fccbde2bda6b8bd2"
+SRCREV = "d633c02ce21b4b5aa9d9877c9424fcc0f363aa6b"
diff --git a/recipes-qt/qt5/qtquick1_git.bb b/recipes-qt/qt5/qtquick1_git.bb
index d7cf4345..9d7ddbd6 100644
--- a/recipes-qt/qt5/qtquick1_git.bb
+++ b/recipes-qt/qt5/qtquick1_git.bb
@@ -23,4 +23,4 @@ do_configure_prepend() {
     sed -i 's#^qtHaveModule(webkitwidgets):#enable-webkit:qtHaveModule(webkitwidgets):#g' ${S}/src/imports/imports.pro
 }
 
-SRCREV = "b0382acf65dbc0debcb7cf956ba954117a682d90"
+SRCREV = "dcc5e5c01c28b227f0e5e5e4976a9d26e8a45295"
diff --git a/recipes-qt/qt5/qtquickcontrols_git.bb b/recipes-qt/qt5/qtquickcontrols_git.bb
index 644b70ec..5894c533 100644
--- a/recipes-qt/qt5/qtquickcontrols_git.bb
+++ b/recipes-qt/qt5/qtquickcontrols_git.bb
@@ -13,4 +13,4 @@ DEPENDS += "qtdeclarative"
 
 RDEPENDS_${PN}-dev = ""
 
-SRCREV = "2e48d16e4a230069884ac0585ae111037f4171fb"
+SRCREV = "fc9c57cf8b66bafbcaa6957bb22293047aa3d9df"
diff --git a/recipes-qt/qt5/qtscript_git.bb b/recipes-qt/qt5/qtscript_git.bb
index c53217a3..eea6911c 100644
--- a/recipes-qt/qt5/qtscript_git.bb
+++ b/recipes-qt/qt5/qtscript_git.bb
@@ -27,4 +27,4 @@ ARM_INSTRUCTION_SET_armv5 = "arm"
 
 DEPENDS += "qtbase"
 
-SRCREV = "7ebf02ea3e8e91b13eb2d34847c005d8a487e9da"
+SRCREV = "a70f6a1b9599931fccd13b15a1700e61137f7e72"
diff --git a/recipes-qt/qt5/qtsensors_git.bb b/recipes-qt/qt5/qtsensors_git.bb
index a422544b..ca0ba4a8 100644
--- a/recipes-qt/qt5/qtsensors_git.bb
+++ b/recipes-qt/qt5/qtsensors_git.bb
@@ -15,4 +15,4 @@ LIC_FILES_CHKSUM = " \
 
 DEPENDS += "qtbase qtdeclarative"
 
-SRCREV = "d8d4a5e9ac1251e82d1ec639bc3bff7e7f53c083"
+SRCREV = "ad52d307cbff44b77bf7d4fa923377b72bb04374"
diff --git a/recipes-qt/qt5/qtserialport_git.bb b/recipes-qt/qt5/qtserialport_git.bb
index c95844c5..db6a289c 100644
--- a/recipes-qt/qt5/qtserialport_git.bb
+++ b/recipes-qt/qt5/qtserialport_git.bb
@@ -15,4 +15,4 @@ LIC_FILES_CHKSUM = " \
 
 DEPENDS += "qtbase"
 
-SRCREV = "2575d33fab4042baba67384f92119c58c0ce0245"
+SRCREV = "6dda140ada3d7c683537b069bf1512275a190884"
diff --git a/recipes-qt/qt5/qtsvg_git.bb b/recipes-qt/qt5/qtsvg_git.bb
index 57e9b4fa..83abbe6b 100644
--- a/recipes-qt/qt5/qtsvg_git.bb
+++ b/recipes-qt/qt5/qtsvg_git.bb
@@ -13,6 +13,6 @@ LIC_FILES_CHKSUM = " \
 
 DEPENDS += "qtbase"
 
-SRCREV = "9ee5ee12a7b92a57624dafed935b3ac1fad426d9"
+SRCREV = "38777ea7451d55e9c3d32d88d46063016013f60c"
 
 SRC_URI += "file://0001-textobject.pro-use-DEPLOYMENT-only-for-wince-like-ot.patch"
diff --git a/recipes-qt/qt5/qtsystems_git.bb b/recipes-qt/qt5/qtsystems_git.bb
index 9d9d245d..0152e8a5 100644
--- a/recipes-qt/qt5/qtsystems_git.bb
+++ b/recipes-qt/qt5/qtsystems_git.bb
@@ -33,4 +33,4 @@ QT_MODULE_BRANCH = "dev"
 # qtsystems wasn't released yet, last tag before this SRCREV is 5.0.0-beta1
 # qt5-git PV is only to indicate that this recipe is compatible with qt5 5.6
 
-SRCREV = "0577ffca58b7fed78c1820fc1c2b7ab3533d5698"
+SRCREV = "37b614abbfb35d06a57e5b0824249c3abd5640e3"
diff --git a/recipes-qt/qt5/qttools_git.bb b/recipes-qt/qt5/qttools_git.bb
index 5ee1e865..96b41274 100644
--- a/recipes-qt/qt5/qttools_git.bb
+++ b/recipes-qt/qt5/qttools_git.bb
@@ -3,9 +3,9 @@ require qt5-git.inc
 
 LICENSE = "GFDL-1.3 & BSD & (LGPL-2.1 & The-Qt-Company-Qt-LGPL-Exception-1.1 | LGPL-3.0)"
 LIC_FILES_CHKSUM = " \
-    file://LICENSE.LGPLv21;md5=58a180e1cf84c756c29f782b3a485c29 \
-    file://LICENSE.LGPLv3;md5=b8c75190712063cde04e1f41b6fdad98 \
-    file://LICENSE.GPLv3;md5=40f9bf30e783ddc201497165dfb32afb \
+    file://LICENSE.LGPLv21;md5=d3bb688e8d381a9fa5ee9063114b366d \
+    file://LICENSE.LGPLv3;md5=3fd06ee442011942b532cc6dedb0b39c \
+    file://LICENSE.GPLv3;md5=a40e2bb02b1ac431f461afd03ff9d1d6 \
     file://LGPL_EXCEPTION.txt;md5=9625233da42f9e0ce9d63651a9d97654 \
     file://LICENSE.FDL;md5=6d9f2a9af4c8b8c3c769f6cc1b6aaf7e \
 "
@@ -32,6 +32,6 @@ PACKAGECONFIG[qtwebkit] = ",,qtwebkit"
 EXTRA_QMAKEVARS_PRE += "${@base_contains('PACKAGECONFIG', 'qtwebkit', '', 'CONFIG+=noqtwebkit', d)}"
 EXTRA_QMAKEVARS_PRE += "${@base_contains('PACKAGECONFIG', 'linguistonly', 'CONFIG+=linguistonly', '', d)}"
 
-SRCREV = "57301c0003e9d776d31953f1411cc06a395b752e"
+SRCREV = "eb59d8084af321d05b4ebdfb2c1e051dfdca0b62"
 
 BBCLASSEXTEND = "native nativesdk"
diff --git a/recipes-qt/qt5/qttranslations_git.bb b/recipes-qt/qt5/qttranslations_git.bb
index 72a29b3b..193e2039 100644
--- a/recipes-qt/qt5/qttranslations_git.bb
+++ b/recipes-qt/qt5/qttranslations_git.bb
@@ -21,6 +21,7 @@ PACKAGES =. " \
     ${PN}-qtlocation \
     ${PN}-qtdeclarative \
     ${PN}-qtquickcontrols \
+    ${PN}-qtquickcontrols2 \
     ${PN}-qtwebsockets \
     ${PN}-qtxmlpatterns \
     ${PN}-qtconfig \
@@ -68,6 +69,10 @@ FILES_${PN}-qtquickcontrols = " \
     ${OE_QMAKE_PATH_TRANSLATIONS}/qtquickcontrols_*.qm \
 "
 
+FILES_${PN}-qtquickcontrols2 = " \
+    ${OE_QMAKE_PATH_TRANSLATIONS}/qtquickcontrols2_*.qm \
+"
+
 FILES_${PN}-qtwebsockets = " \
     ${OE_QMAKE_PATH_TRANSLATIONS}/qtwebsockets_*.qm \
 "
@@ -104,4 +109,4 @@ FILES_${PN}-qt = " \
     ${OE_QMAKE_PATH_TRANSLATIONS}/qt_*.qm \
 "
 
-SRCREV = "9c6d1af76ac28de8d59be344ea3a21b2607fa118"
+SRCREV = "41d212290c3822b8eef151785d89ac5f5b246bde"
diff --git a/recipes-qt/qt5/qtwayland-native_git.bb b/recipes-qt/qt5/qtwayland-native_git.bb
index afe737a9..390f4e66 100644
--- a/recipes-qt/qt5/qtwayland-native_git.bb
+++ b/recipes-qt/qt5/qtwayland-native_git.bb
@@ -25,4 +25,4 @@ do_install() {
     oe_runmake install INSTALL_ROOT=${D}
 }
 
-SRCREV = "bd21beea9a433a8878c0e719a7bfb8c14df47840"
+SRCREV = "baec8be7294a176620253dbbc1b2938cf96c8360"
diff --git a/recipes-qt/qt5/qtwayland_git.bb b/recipes-qt/qt5/qtwayland_git.bb
index 059c2dbc..c4730a7e 100644
--- a/recipes-qt/qt5/qtwayland_git.bb
+++ b/recipes-qt/qt5/qtwayland_git.bb
@@ -38,4 +38,4 @@ SRC_URI += " \
     file://0001-examples-wayland-include-server-buffer-only-when-bui.patch \
 "
 
-SRCREV = "bd21beea9a433a8878c0e719a7bfb8c14df47840"
+SRCREV = "baec8be7294a176620253dbbc1b2938cf96c8360"
diff --git a/recipes-qt/qt5/qtwebchannel_git.bb b/recipes-qt/qt5/qtwebchannel_git.bb
index e070d13d..7d923d8d 100644
--- a/recipes-qt/qt5/qtwebchannel_git.bb
+++ b/recipes-qt/qt5/qtwebchannel_git.bb
@@ -15,4 +15,4 @@ LIC_FILES_CHKSUM = " \
 
 DEPENDS += "qtdeclarative qtwebsockets"
 
-SRCREV = "97577a0f27a1f427948871ae535645a2e0788bf7"
+SRCREV = "92d903d92b430222cd3f89eab08d61d947e5abea"
diff --git a/recipes-qt/qt5/qtwebengine_git.bb b/recipes-qt/qt5/qtwebengine_git.bb
index b5d0b586..8375fec7 100644
--- a/recipes-qt/qt5/qtwebengine_git.bb
+++ b/recipes-qt/qt5/qtwebengine_git.bb
@@ -110,15 +110,14 @@ SRC_URI += " \
     ${QT_GIT}/qtwebengine-chromium.git;name=chromium;branch=${QT_MODULE_BRANCH_CHROMIUM};destsuffix=git/src/3rdparty \
     file://0001-functions.prf-Don-t-match-QMAKE_EXT_CPP-or-QMAKE_EXT.patch \
     file://0002-functions.prf-Make-sure-we-only-use-the-file-name-to.patch \
-    file://0003-functions.prf-allow-build-for-linux-oe-g-platform.patch \
     file://0001-chromium-base.gypi-include-atomicops_internals_x86_g.patch \
     file://0002-media_capture_devices_dispatcher.h-Include-QCoreApplication-translate.patch \
     file://0003-WebEngine-qquickwebengineview_p_p.h-add-inc-QColor.patch \
     file://0001-chromium-jpeg_codec.cc_Change-false-to-FALSE-and-1-to-TRUE.patch \
 "
 
-SRCREV_qtwebengine = "40ef43e0d69c4a86c9430b7f264d2cde6340ee0f"
-SRCREV_chromium = "ec5b3304fc266dfdec7666b8b73d57a3971ea35f"
+SRCREV_qtwebengine = "87cc80fd8182b24ff42f0f5458cb82f139730536"
+SRCREV_chromium = "3f655a31b4979b0862e5aec1c8f47b597464749f"
 SRCREV = "${SRCREV_qtwebengine}"
 
 SRCREV_FORMAT = "qtwebengine_chromium"
diff --git a/recipes-qt/qt5/qtwebkit_git.bb b/recipes-qt/qt5/qtwebkit_git.bb
index a9523065..19b9c5a5 100644
--- a/recipes-qt/qt5/qtwebkit_git.bb
+++ b/recipes-qt/qt5/qtwebkit_git.bb
@@ -65,4 +65,4 @@ PACKAGES_remove = "${PN}-examples-dev ${PN}-examples-staticdev ${PN}-examples-db
 RUBY_SYS = "${@ '${BUILD_SYS}'.replace('i486', 'i386').replace('i586', 'i386').replace('i686', 'i386') }"
 export RUBYLIB="${STAGING_DATADIR_NATIVE}/rubygems:${STAGING_LIBDIR_NATIVE}/ruby:${STAGING_LIBDIR_NATIVE}/ruby/${RUBY_SYS}"
 
-SRCREV = "93cc8d306f8033551fb60e2e1f8f480330778a21"
+SRCREV = "be8e169ba38c84562194906047d0da04bf3ae91a"
diff --git a/recipes-qt/qt5/qtxmlpatterns_git.bb b/recipes-qt/qt5/qtxmlpatterns_git.bb
index 4b511d0c..2f24933b 100644
--- a/recipes-qt/qt5/qtxmlpatterns_git.bb
+++ b/recipes-qt/qt5/qtxmlpatterns_git.bb
@@ -13,6 +13,6 @@ LIC_FILES_CHKSUM = " \
 
 DEPENDS += "qtbase"
 
-SRCREV = "94136d42805abeaf3dd9d6ded7b74e3d27fd3777"
+SRCREV = "de2dadb8af67f9d425c3a8d2353a7d5b07588915"
 
 BBCLASSEXTEND =+ "native nativesdk"