From 7529118204c1e09da8e27fff35401234c2c36363 Mon Sep 17 00:00:00 2001 From: Christian Kandeler Date: Mon, 8 Oct 2018 16:46:58 +0200 Subject: Documentation: Mention qmake's OTHER_FILES in the porting guide Fixes: QBS-1388 Change-Id: I3d4dadcf9e16d839289960252a068e29058255cf Reviewed-by: Mitch Curtis Reviewed-by: Leena Miettinen --- doc/appendix/qbs-porting.qdoc | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) (limited to 'doc') diff --git a/doc/appendix/qbs-porting.qdoc b/doc/appendix/qbs-porting.qdoc index ffe935ad9..e17d7b0ac 100644 --- a/doc/appendix/qbs-porting.qdoc +++ b/doc/appendix/qbs-porting.qdoc @@ -144,15 +144,16 @@ } \endcode - \section2 HEADERS, SOURCES, FORMS, RESOURCES + \section2 HEADERS, SOURCES, FORMS, RESOURCES, OTHER_FILES - Include header, source, form, and resource files as values of - \l{Product::files}{Product.files} property: + Include header, source, form, and resource files as well as any + other files as values of a \l{Product::files}{Product.files} + or \l{Group::files}{Group.files} property: \code QtApplication { name: "myapp" - files: ["myapp.h", "myapp.cpp", "myapp.ui", "myapp.qrc"] + files: ["myapp.h", "myapp.cpp", "myapp.ui", "myapp.qrc", "readme.txt"] } \endcode -- cgit v1.2.3 From 61ddc0685e0edc35b5fc39fdebacf08c64dbc991 Mon Sep 17 00:00:00 2001 From: Christian Kandeler Date: Wed, 10 Oct 2018 17:11:31 +0200 Subject: Android support: Adapt to changes in newer revisions Revision 17 dropped some architectures, revision 18 removed GCC. We also missed some earlier changes to clang-related paths. Change-Id: Ie2fa1891f7f4de28e18ea6caadce9eac964bb523 Reviewed-by: Alexandru Croitor --- doc/reference/modules/android-ndk-module.qdoc | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) (limited to 'doc') diff --git a/doc/reference/modules/android-ndk-module.qdoc b/doc/reference/modules/android-ndk-module.qdoc index 23c70eec7..529f2fb4d 100644 --- a/doc/reference/modules/android-ndk-module.qdoc +++ b/doc/reference/modules/android-ndk-module.qdoc @@ -94,12 +94,12 @@ \list \li \c "c++_shared" \li \c "c++_static" - \li \c "gabi++_shared" - \li \c "gabi++_static" - \li \c "gnustl_shared" - \li \c "gnustl_static" - \li \c "stlport_shared" - \li \c "stlport_static" + \li \c "gabi++_shared" (until r17) + \li \c "gabi++_static" (until r17) + \li \c "gnustl_shared" (until r17) + \li \c "gnustl_static" (until r17) + \li \c "stlport_shared" (until r17) + \li \c "stlport_static" (until r17) \li \c "system" \endlist -- cgit v1.2.3