diff options
author | Liang Qi <liang.qi@qt.io> | 2017-07-02 16:24:12 +0000 |
---|---|---|
committer | The Qt Project <gerrit-noreply@qt-project.org> | 2017-07-02 16:24:12 +0000 |
commit | ab2c1f9509c76d61773ad0df3eaeb0ea1c2bbddf (patch) | |
tree | b7ca70f4a94e08db082e3173816f4a38470905c9 | |
parent | d23e18189c371eca5725e2ff394d720724625d2c (diff) | |
parent | 339dd36b27bffcb7598f1e80509a53b3e9ff3c5e (diff) |
Merge "Merge remote-tracking branch 'origin/5.9.1' into 5.9" into refs/staging/5.9
-rw-r--r-- | dist/changes-5.9.1 | 9 | ||||
-rw-r--r-- | mkspecs/features/android/android.prf | 5 |
2 files changed, 8 insertions, 6 deletions
diff --git a/dist/changes-5.9.1 b/dist/changes-5.9.1 index 1b6aea86ab..4458aee89b 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 -------------------------- @@ -104,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 diff --git a/mkspecs/features/android/android.prf b/mkspecs/features/android/android.prf index 45eadc9fdb..1dc8f87313 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 } |