diff options
| author | Liang Qi <liang.qi@theqtcompany.com> | 2015-05-29 16:10:23 +0200 |
|---|---|---|
| committer | Liang Qi <liang.qi@theqtcompany.com> | 2015-05-29 16:10:23 +0200 |
| commit | 06e55443ddcdcec107599f0a4072f8ce1b528b0b (patch) | |
| tree | 522c3a3a7ba5a4384b3e425629ede1079b16c95c /doc/src/external-resources.qdoc | |
| parent | 578329719374f2c55d60682e51013970f7afe44e (diff) | |
| parent | a390b74a20602dc716f4375a6c33d5d426eba3e6 (diff) | |
| download | qtdoc-06e55443ddcdcec107599f0a4072f8ce1b528b0b.tar.gz | |
Merge remote-tracking branch 'origin/5.4' into 5.5
Conflicts:
.qmake.conf
doc/src/external-resources.qdoc
Change-Id: I62bb845b837787385de233019436039e77a41f08
Diffstat (limited to 'doc/src/external-resources.qdoc')
| -rw-r--r-- | doc/src/external-resources.qdoc | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/doc/src/external-resources.qdoc b/doc/src/external-resources.qdoc index 922385f0..3eff9122 100644 --- a/doc/src/external-resources.qdoc +++ b/doc/src/external-resources.qdoc @@ -178,6 +178,12 @@ \externalpage http://doc.qt.io/qtcreator/creator-configuring.html \title Configuring Qt Creator */ + +/*! + \externalpage http://doc.qt.io/qtcreator/creator-deploying-android.html#specifying-settings-for-packages + \title Android APK +*/ + /*! \externalpage http://doc.qt.io/qtcreator/creator-build-example-application.html \title Building and Running Example |