Merge branch 'stable' into dev

Change-Id: I06694436322a7810a163b27b8a059cee2b046f06

7 files changed, 22 insertions, 21 deletions

diff --git a/mkspecs/devices/linux-arm-amlogic-8726M-g++/qeglfshooks_8726m.cpp b/mkspecs/devices/linux-arm-amlogic-8726M-g++/qeglfshooks_8726m.cpp
index cca9b98332..7c63625d39 100644
--- a/mkspecs/devices/linux-arm-amlogic-8726M-g++/qeglfshooks_8726m.cpp
+++ b/mkspecs/devices/linux-arm-amlogic-8726M-g++/qeglfshooks_8726m.cpp
@@ -54,7 +54,7 @@ class QEglFS8726MHooks : public QEglFSHooks
 {
 public:
     virtual QSize screenSize() const;
-    virtual EGLNativeWindowType createNativeWindow(const QSize &size, const QSurfaceFormat &format);
+    virtual EGLNativeWindowType createNativeWindow(QPlatformWindow *window, const QSize &size, const QSurfaceFormat &format);
     virtual void destroyNativeWindow(EGLNativeWindowType window);
 };
 
@@ -75,9 +75,10 @@ QSize QEglFS8726MHooks::screenSize() const
     return QSize(vinfo.xres, vinfo.yres);
 }
 
-EGLNativeWindowType QEglFS8726MHooks::createNativeWindow(const QSize &size, const QSurfaceFormat &format)
+EGLNativeWindowType QEglFS8726MHooks::createNativeWindow(QPlatformWindow *window, const QSize &size, const QSurfaceFormat &format)
 {
-    Q_UNUSED(format);
+    Q_UNUSED(window)
+    Q_UNUSED(format)
 
     fbdev_window *window = new fbdev_window;
     window->width = size.width();
diff --git a/mkspecs/devices/linux-imx6-g++/qeglfshooks_imx6.cpp b/mkspecs/devices/linux-imx6-g++/qeglfshooks_imx6.cpp
index 6f59b73921..2a5ee74648 100644
--- a/mkspecs/devices/linux-imx6-g++/qeglfshooks_imx6.cpp
+++ b/mkspecs/devices/linux-imx6-g++/qeglfshooks_imx6.cpp
@@ -49,7 +49,7 @@ class QEglFSImx6Hooks : public QEglFSHooks
 public:
     QEglFSImx6Hooks();
     virtual QSize screenSize() const;
-    virtual EGLNativeWindowType createNativeWindow(const QSize &size, const QSurfaceFormat &format);
+    virtual EGLNativeWindowType createNativeWindow(QPlatformWindow *window, const QSize &size, const QSurfaceFormat &format);
     virtual void destroyNativeWindow(EGLNativeWindowType window);
     virtual EGLNativeDisplayType platformDisplay() const;
 
@@ -78,9 +78,10 @@ EGLNativeDisplayType QEglFSImx6Hooks::platformDisplay() const
     return mNativeDisplay;
 }
 
-EGLNativeWindowType QEglFSImx6Hooks::createNativeWindow(const QSize &size, const QSurfaceFormat &format)
+EGLNativeWindowType QEglFSImx6Hooks::createNativeWindow(QPlatformWindow *window, const QSize &size, const QSurfaceFormat &format)
 {
-    Q_UNUSED(format);
+    Q_UNUSED(window)
+    Q_UNUSED(format)
 
     EGLNativeWindowType eglWindow = fbCreateWindow(mNativeDisplay, 0, 0, size.width(), size.height());
     return eglWindow;
diff --git a/mkspecs/devices/linux-rasp-pi-g++/qeglfshooks_pi.cpp b/mkspecs/devices/linux-rasp-pi-g++/qeglfshooks_pi.cpp
index add96bf14e..671f525250 100644
--- a/mkspecs/devices/linux-rasp-pi-g++/qeglfshooks_pi.cpp
+++ b/mkspecs/devices/linux-rasp-pi-g++/qeglfshooks_pi.cpp
@@ -226,7 +226,7 @@ public:
     virtual void platformDestroy();
     virtual EGLNativeDisplayType platformDisplay() const;
     virtual QSize screenSize() const;
-    virtual EGLNativeWindowType createNativeWindow(const QSize &size, const QSurfaceFormat &format);
+    virtual EGLNativeWindowType createNativeWindow(QPlatformWindow *window, const QSize &size, const QSurfaceFormat &format);
     virtual void destroyNativeWindow(EGLNativeWindowType window);
     virtual bool hasCapability(QPlatformIntegration::Capability cap) const;
 
@@ -258,8 +258,9 @@ QSize QEglFSPiHooks::screenSize() const
     return QSize(width, height);
 }
 
-EGLNativeWindowType QEglFSPiHooks::createNativeWindow(const QSize &size, const QSurfaceFormat &format)
+EGLNativeWindowType QEglFSPiHooks::createNativeWindow(QPlatformWindow *window, const QSize &size, const QSurfaceFormat &format)
 {
+    Q_UNUSED(window)
     return createDispmanxLayer(QPoint(0, 0), size, 1, format.hasAlpha() ? DISPMANX_FLAGS_ALPHA_FROM_SOURCE : DISPMANX_FLAGS_ALPHA_FIXED_ALL_PIXELS);
 }
 
diff --git a/mkspecs/features/android.prf b/mkspecs/features/android.prf
index 2a3086d4ad..5e21f0b845 100644
--- a/mkspecs/features/android.prf
+++ b/mkspecs/features/android.prf
@@ -2,13 +2,10 @@ contains(TEMPLATE, ".*app") {
     !android_app {
         !contains(TARGET, ".so"): TARGET = lib$${TARGET}.so
         QMAKE_LFLAGS += -Wl,-soname,$$TARGET
+
+        android_install: {
+            target.path=/libs/$$ANDROID_TARGET_ARCH/
+            INSTALLS *= target
+        }
     }
 }
-!QTDIR_build:android_install {
-    isEmpty(QT_BUILD_TREE) {
-        target.path=/libs/$$ANDROID_TARGET_ARCH/
-    } else {
-        target.path = /
-    }
-    INSTALLS *= target
-}
diff --git a/mkspecs/features/android_deployment_settings.prf b/mkspecs/features/android_deployment_settings.prf
index 2f64d47f04..1e54b67789 100644
--- a/mkspecs/features/android_deployment_settings.prf
+++ b/mkspecs/features/android_deployment_settings.prf
@@ -45,10 +45,10 @@ contains(TEMPLATE, ".*app"):!build_pass:!android-no-sdk {
         FILE_CONTENT += "    \"android-package\": \"$$ANDROID_PACKAGE\","
 
     !isEmpty(ANDROID_MINIMUM_VERSION): \
-        FILE_CONTENT += "    \"android-minimum-version\": \"$$ANDROID_MINIMUM_VERSION\","
+        FILE_CONTENT += "    \"android-minimum-version\": $$ANDROID_MINIMUM_VERSION,"
 
     !isEmpty(ANDROID_TARGET_VERSION): \
-        FILE_CONTENT += "    \"android-target-version\": \"$$ANDROID_TARGET_VERSION\","
+        FILE_CONTENT += "    \"android-target-version\": $$ANDROID_TARGET_VERSION,"
 
     !isEmpty(ANDROID_APP_NAME): \
         FILE_CONTENT += "    \"android-app-name\": \"$$ANDROID_APP_NAME\","
diff --git a/mkspecs/features/ios/default_post.prf b/mkspecs/features/ios/default_post.prf
index 654255eb1f..3322047788 100644
--- a/mkspecs/features/ios/default_post.prf
+++ b/mkspecs/features/ios/default_post.prf
@@ -19,7 +19,7 @@ equals(TEMPLATE, app) {
 
         # We use xcodebuild to do the actual build, but filter out the verbose
         # output that shows all environment variables for each build step.
-        xcodebuild_build.commands = "@xcodebuild build | grep -v setenv"
+        xcodebuild_build.commands = "@bash -o pipefail -c 'xcodebuild | grep -v setenv'"
         QMAKE_EXTRA_TARGETS += xcodebuild_build
         all.depends = xcodebuild_build
         QMAKE_EXTRA_TARGETS += all
diff --git a/mkspecs/unsupported/android-g++/qeglfshooks_surfaceflinger.cpp b/mkspecs/unsupported/android-g++/qeglfshooks_surfaceflinger.cpp
index 78a1eb183e..5f4b6a392c 100644
--- a/mkspecs/unsupported/android-g++/qeglfshooks_surfaceflinger.cpp
+++ b/mkspecs/unsupported/android-g++/qeglfshooks_surfaceflinger.cpp
@@ -62,7 +62,7 @@ class QEglFSPandaHooks : public QEglFSHooks
 {
 public:
     QEglFSPandaHooks();
-    virtual EGLNativeWindowType createNativeWindow(const QSize &size, const QSurfaceFormat &format);
+    virtual EGLNativeWindowType createNativeWindow(QPlatformWindow *window, const QSize &size, const QSurfaceFormat &format);
     virtual bool filterConfig(EGLDisplay display, EGLConfig config) const;
     virtual const char *fbDeviceName() const { return "/dev/graphics/fb0"; }
 
@@ -103,8 +103,9 @@ void QEglFSPandaHooks::ensureFramebufferNativeWindowCreated()
     window->query(window, NATIVE_WINDOW_FORMAT, &mFramebufferVisualId);
 }
 
-EGLNativeWindowType QEglFSPandaHooks::createNativeWindow(const QSize &size, const QSurfaceFormat &format)
+EGLNativeWindowType QEglFSPandaHooks::createNativeWindow(QPlatformWindow *window, const QSize &size, const QSurfaceFormat &format)
 {
+    Q_UNUSED(window)
     return mUseFramebuffer ? createNativeWindowFramebuffer(size, format) : createNativeWindowSurfaceFlinger(size, format);
 }