From 45eff223f0a88375f52321bdd383cc8fa17acd2e Mon Sep 17 00:00:00 2001 From: Jake Petroules Date: Fri, 13 Oct 2017 15:49:00 +0200 Subject: [PATCH 1/3] Modernize the example for using asset catalogs Change-Id: I10d31e3cf74ec5faa6d5c1a7bc635ffbe2880a96 Reviewed-by: Leena Miettinen Reviewed-by: Oswald Buddenhagen --- doc/src/platforms/ios.qdoc | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) diff --git a/doc/src/platforms/ios.qdoc b/doc/src/platforms/ios.qdoc index e57b53998..8bd5c8813 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 From 053aea2e785df6361d86a5eb912d3ea25f72ee17 Mon Sep 17 00:00:00 2001 From: Jake Petroules Date: Sat, 21 Oct 2017 00:17:22 +0200 Subject: [PATCH 2/3] Remove mention of Apache Ant from Android documentation This no longer applies and has not for a while. Gradle is now used, and included automatically. Change-Id: Ic9c85329d75383b8dbf997a968f53a314f48c1e7 Reviewed-by: Leena Miettinen Reviewed-by: Oswald Buddenhagen --- doc/src/platforms/android.qdoc | 1 - 1 file changed, 1 deletion(-) diff --git a/doc/src/platforms/android.qdoc b/doc/src/platforms/android.qdoc index ce1c4abbd..cd2c6e864 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 From e4ccd4a7a2ac752b8f674f6b57dbaf9a33b9b5a8 Mon Sep 17 00:00:00 2001 From: Kai Koehne Date: Wed, 25 Oct 2017 10:29:10 +0200 Subject: [PATCH 3/3] Fix outdated FDL license header Change-Id: I612bcadea11f2ed87016e8ed4cc52ec3e0fa5be1 Reviewed-by: Jani Heikkinen --- doc/src/platforms/vxworks.qdoc | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/doc/src/platforms/vxworks.qdoc b/doc/src/platforms/vxworks.qdoc index 7bc891f27..e929b5caf 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$ ** ****************************************************************************/