From 11d36bd9eb29995629fe460bb1b24383b47ae5e5 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Christian=20Str=C3=B8mme?= Date: Mon, 26 Jun 2017 16:25:41 +0200 Subject: [PATCH 1/3] Revert "don't overwrite pre-existing INSTALL for target" This reverts commit c0e94dd0933c549f35d05318cdcd97572c61fabf, as it introduced a regression for applications that sets an installation target (on Android), which a lot of our examples do. The installation target for Android applications/libraries needs to be within in the application bundle's directory tree, or it won't work. Task-number: QTBUG-61635 Change-Id: I8c919ef3888d7679b0f9659796f5e590bc1faa57 Reviewed-by: Eskil Abrahamsen Blomfeldt --- mkspecs/features/android/android.prf | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) diff --git a/mkspecs/features/android/android.prf b/mkspecs/features/android/android.prf index 45eadc9fdb2..1dc8f87313a 100644 --- a/mkspecs/features/android/android.prf +++ b/mkspecs/features/android/android.prf @@ -1,6 +1,3 @@ -android_install:contains(INSTALLS, target):!isEmpty(target.path): \ - CONFIG -= android_install - contains(TEMPLATE, ".*app") { !android_app { !contains(TARGET, ".so"): TARGET = lib$${TARGET}.so @@ -11,7 +8,7 @@ contains(TEMPLATE, ".*app") { INSTALLS *= target } } -} else: contains(TEMPLATE, "lib"):!static:android_install { +} else: contains(TEMPLATE, "lib"):!static:!QTDIR_build:android_install { target.path = /libs/$$ANDROID_TARGET_ARCH/ INSTALLS *= target } From 081a7c9ba8557c78b4d78686d0bfb419a8383946 Mon Sep 17 00:00:00 2001 From: Thiago Macieira Date: Fri, 23 Jun 2017 10:49:24 -0700 Subject: [PATCH 2/3] Add the MSVC 2013 drop to the 5.9.1 changelog We should repeat it in 5.10 and 5.9 changelogs (until 5.11 is released). Change-Id: Ibe46a7253188480890f9fffd14cad187ac091e79 Reviewed-by: Lars Knoll Reviewed-by: Alex Blasche --- dist/changes-5.9.1 | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/dist/changes-5.9.1 b/dist/changes-5.9.1 index 1b6aea86ab4..0fc66430132 100644 --- a/dist/changes-5.9.1 +++ b/dist/changes-5.9.1 @@ -21,6 +21,13 @@ information about a particular change. * Qt 5.9.1 Changes * **************************************************************************** +Deprecation Notice +------------------ + + - The following platforms or toolchains are deprecated and will be + removed as of Qt 5.11: + * Microsoft Visual Studio 2013 + Important Behavior Changes -------------------------- From 160533328cae32c8647cecafad21233aa3529659 Mon Sep 17 00:00:00 2001 From: Eskil Abrahamsen Blomfeldt Date: Tue, 27 Jun 2017 14:45:45 +0200 Subject: [PATCH 3/3] Remove mention of reverted fix The fix for QTBUG-38452 was reverted by 11d36bd9eb29995629fe460bb1b24383b47ae5e5. Task-number: QTBUG-61635 Change-Id: If80939b75426c48249478e86cae7162132565912 --- dist/changes-5.9.1 | 2 -- 1 file changed, 2 deletions(-) diff --git a/dist/changes-5.9.1 b/dist/changes-5.9.1 index 0fc66430132..4458aee89bb 100644 --- a/dist/changes-5.9.1 +++ b/dist/changes-5.9.1 @@ -111,8 +111,6 @@ configure & build system qmake ----- - - [QTBUG-38452][Android] Fixed overwriting of INSTALLS for target, and the - resulting bogus attempts to write to /libs on the host system. - [QTBUG-42830][Android] INSTALL targets are no longer created for static libraries. - [QTBUG-40825][QTBUG-59457][Unix] Fixed various makespecs to append shared