diff options
| author | Qt Forward Merge Bot <qt_forward_merge_bot@qt-project.org> | 2020-04-21 01:00:10 +0200 |
|---|---|---|
| committer | Edward Welbourne <edward.welbourne@qt.io> | 2020-04-22 15:28:01 +0200 |
| commit | efd7757154e1fb946a51c7d90b8cbf56b4df8b6d (patch) | |
| tree | f757e14770d82ee8376fa10006973c0e750b1e16 /doc | |
| parent | 1c80d056e4f45b4ee7c4863cd792e83c889513c5 (diff) | |
| parent | e10e5318bc02a48a866b76b6f0b7f268d16af642 (diff) | |
Merge remote-tracking branch 'origin/5.15' into dev
Conflicts:
src/widgets/widgets/qabstractbutton.cpp
src/widgets/widgets/qbuttongroup.cpp
src/widgets/widgets/qbuttongroup.h
src/widgets/widgets/qsplashscreen.cpp
tests/auto/widgets/widgets/qbuttongroup/tst_qbuttongroup.cpp
tests/benchmarks/opengl/main.cpp
Needed update:
src/plugins/platforms/cocoa/CMakeLists.txt
Change-Id: I7be4baebb63844ec2b3e0de859ca9de1bc730bb5
Diffstat (limited to 'doc')
| -rw-r--r-- | doc/global/externalsites/external-resources.qdoc | 16 |
1 files changed, 16 insertions, 0 deletions
diff --git a/doc/global/externalsites/external-resources.qdoc b/doc/global/externalsites/external-resources.qdoc index cbb4345bcd..187c73da62 100644 --- a/doc/global/externalsites/external-resources.qdoc +++ b/doc/global/externalsites/external-resources.qdoc @@ -25,6 +25,22 @@ ** ****************************************************************************/ /*! + \externalpage https://source.android.com/setup/start/build-numbers + \title Android: Build Numbers +*/ +/*! + \externalpage https://developer.android.com/guide/topics/manifest/uses-feature-element + \title Android: <uses-feature> +*/ +/*! + \externalpage https://developer.android.com/guide/topics/manifest/uses-permission-element + \title Android: <uses-permission> +*/ +/*! + \externalpage https://developer.android.com/studio/publish/versioning#appversioning + \title Android: App Versioning +*/ +/*! \externalpage http://www.freedesktop.org/ \title freedesktop.org */ |