Andy Shaw ef4448f129 Always add the extra Android apk and aab targets ... The extra targets should be added to the project regardless so that qmake can handle it appropriately. This enables make apk to work correctly then from a SUBDIRS project. Fixes: QTBUG-80351 Change-Id: If5903e0d2f543babfdb4ebbb13502e32ab97c6fc Reviewed-by: Joerg Bornemann <joerg.bornemann@qt.io>		2020-01-02 14:27:05 +00:00
bin	Merge remote-tracking branch 'origin/5.13' into 5.14	2019-11-13 07:21:33 +01:00
config.tests	wasm: fix arch detect on windows with WASM_OBJECT_FILES	2019-10-14 17:40:41 +10:00
dist	Add changes file for Qt 5.14.0	2019-12-03 13:44:27 +01:00
doc	Doc: Move the common documentation to a qdocinc	2019-11-18 12:34:32 +01:00
examples	styles example: Implement standarPalette()	2020-01-02 14:14:38 +01:00
lib
mkspecs	Always add the extra Android apk and aab targets	2020-01-02 14:27:05 +00:00
qmake	Doc: Fix name of no_check_exist flag	2019-12-23 10:33:36 +01:00
src	Fix some qdoc warnings	2020-01-02 13:43:56 +01:00
tests	QTextDocument: Give fontFamily() precedence over fontFamilies()	2020-01-02 10:30:13 +01:00
util	Merge remote-tracking branch 'origin/5.13' into 5.14	2019-11-06 11:41:19 +01:00
.gitattributes
.gitignore	qfloat16: Check in the tables to Git	2019-06-03 10:42:53 -07:00
.qmake.conf	Bump version	2019-12-17 12:41:31 +01:00
.tag
config_help.txt	Doc: Add the relocatable feature to configure's help output	2019-12-24 13:28:54 +01:00
configure	Android: remove remaining reference to -android-toolchain-version	2019-11-18 14:13:32 +01:00
configure.bat	Configure: simplify logic	2019-03-14 12:13:58 +00:00
configure.json	wasm: enforce emscripten version	2019-12-11 06:06:45 +10:00
configure.pri	configure: Hacky fix to allow re-configuring on android	2019-12-16 19:17:47 +01:00
header.BSD
header.COMM
header.FDL
header.GPL
header.GPL-EXCEPT
header.LGPL
header.LGPL3
header.LGPL3-COMM
header.LGPL-NOGPL2
header.LGPL-ONLY
header.MIT	qsimd: add support for new x86 CPU features	2018-05-05 06:20:07 +00:00
INSTALL	INSTALL: Remove outdated reference to Windows CE	2019-02-13 13:01:57 +00:00
LICENSE.FDL
LICENSE.GPL2
LICENSE.GPL3
LICENSE.GPL3-EXCEPT
LICENSE.LGPL3
LICENSE.LGPLv3
LICENSE.QT-LICENSE-AGREEMENT	Update enterprise license agreement v4.2.1	2019-12-18 13:07:19 +02:00
qtbase.pro
sync.profile	CMake: Add support for auto-importing plugins in CMake	2019-08-12 18:23:58 +02:00