diff options
author | Oswald Buddenhagen <oswald.buddenhagen@qt.io> | 2017-11-20 13:49:02 +0100 |
---|---|---|
committer | Oswald Buddenhagen <oswald.buddenhagen@qt.io> | 2017-11-20 13:49:02 +0100 |
commit | 664965b6def2e1161551b8db2fcc1d2bf1b28c10 (patch) | |
tree | a2ed8366659f27c16c95ca0062bbd42369c3e60e | |
parent | a8fe3e596af1b603bbdee0de7e27316189473c9d (diff) | |
parent | 08bd2bd92c1ce9694d1182609c131747eed7165f (diff) | |
download | qtdoc-664965b6def2e1161551b8db2fcc1d2bf1b28c10.tar.gz |
Merge 5.10 into 5.10.0
Change-Id: I1e8270b76fdabe0fcb3ef3475e2b51726b2359a8
-rw-r--r-- | doc/src/platforms/android.qdoc | 1 | ||||
-rw-r--r-- | doc/src/platforms/ios.qdoc | 5 | ||||
-rw-r--r-- | doc/src/platforms/vxworks.qdoc | 6 |
3 files changed, 4 insertions, 8 deletions
diff --git a/doc/src/platforms/android.qdoc b/doc/src/platforms/android.qdoc index ce1c4abb..cd2c6e86 100644 --- a/doc/src/platforms/android.qdoc +++ b/doc/src/platforms/android.qdoc @@ -151,7 +151,6 @@ In order to use \l{Qt for Android}, you need the following: \li \l{http://developer.android.com/tools/sdk/ndk/index.html}{The Android NDK} (recommended version 10e) \li \l{http://www.oracle.com/technetwork/java/javase/downloads/jdk7-downloads-1880260.html}{Java SE Development Kit} (JDK) v6 or later. You can also use \l{http://openjdk.java.net}{OpenJDK} on Linux. -\li \l{http://ant.apache.org/bindownload.cgi}{Apache Ant} v1.8 or later \endlist After installing these tools, update the Android SDK by installing the API diff --git a/doc/src/platforms/ios.qdoc b/doc/src/platforms/ios.qdoc index e57b5399..8bd5c881 100644 --- a/doc/src/platforms/ios.qdoc +++ b/doc/src/platforms/ios.qdoc @@ -238,12 +238,9 @@ {asset catalogs} in Xcode, which can be added in a similar way: \badcode ios { - assets_catalogs.files = $$files($$PWD/*.xcassets) - QMAKE_BUNDLE_DATA += assets_catalogs + QMAKE_ASSET_CATALOGS += ios/Assets.xcassets } \endcode - Important: resources are compiled only if the .path variable is not set. - It is possible to recursively copy and compile directories though. \section2 Icons diff --git a/doc/src/platforms/vxworks.qdoc b/doc/src/platforms/vxworks.qdoc index 7bc891f2..e929b5ca 100644 --- a/doc/src/platforms/vxworks.qdoc +++ b/doc/src/platforms/vxworks.qdoc @@ -11,8 +11,8 @@ ** accordance with the commercial license agreement provided with the ** Software or, alternatively, in accordance with the terms contained in ** a written agreement between you and The Qt Company. For licensing terms -** and conditions see http://www.qt.io/terms-conditions. For further -** information use the contact form at http://www.qt.io/contact-us. +** and conditions see https://www.qt.io/terms-conditions. For further +** information use the contact form at https://www.qt.io/contact-us. ** ** GNU Free Documentation License Usage ** Alternatively, this file may be used under the terms of the GNU Free @@ -20,7 +20,7 @@ ** Foundation and appearing in the file included in the packaging of ** this file. Please review the following information to ensure ** the GNU Free Documentation License version 1.3 requirements -** will be met: http://www.gnu.org/copyleft/fdl.html. +** will be met: https://www.gnu.org/licenses/fdl-1.3.html. ** $QT_END_LICENSE$ ** ****************************************************************************/ |