diff options
| author | Pasi Petäjäjärvi <pasi.petajajarvi@theqtcompany.com> | 2015-06-03 13:42:06 +0300 |
|---|---|---|
| committer | Pasi Petäjäjärvi <pasi.petajajarvi@theqtcompany.com> | 2015-06-03 13:42:11 +0300 |
| commit | 142ee713a4cf9557ff48ee783ed56b3842337629 (patch) | |
| tree | fc0a2ff5752bdd5c3c35924bbf69e4769ed74785 /doc/src/external-resources.qdoc | |
| parent | 22f56ec593d4953f9b08180b2aa478352850dc1f (diff) | |
| parent | 06e55443ddcdcec107599f0a4072f8ce1b528b0b (diff) | |
| download | qtdoc-142ee713a4cf9557ff48ee783ed56b3842337629.tar.gz | |
Merge branch 'upstream-5.5' into vxworks-5.5
* upstream-5.5:
Prospective fix for cmake docs after -fPIC -> -fPIE changes
Doc: update the moc docs as to what can't be used with class templates
Use make as make sub-src is no longer valid for Qt 5
Update the Android OpenGL notes
Doc: Added \keyword entries for console.xxx
Doc: Link to Qt Visual Studio Add-in documentation
Doc: Update Qt Modules page and related information
Doc: Fix missing/broken links in Intro and What's New pages
Update deployment information for ffmpegsumo.dll on Windows.
Update the QNX platform notes
Update the getting started topic
Bump version
Doc: Removed a few redundant steps based on the latest Qt Creator ver
Change-Id: Ifdd4bf7d14dfbb5b2ab52a4ac058a59e94feb185
Diffstat (limited to 'doc/src/external-resources.qdoc')
| -rw-r--r-- | doc/src/external-resources.qdoc | 16 |
1 files changed, 11 insertions, 5 deletions
diff --git a/doc/src/external-resources.qdoc b/doc/src/external-resources.qdoc index 7a7256a7..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 @@ -234,11 +240,6 @@ */ /*! - \externalpage http://doc.qt.io/QtQuickEnterpriseControls - \title Qt Quick Enterprise Controls -*/ - -/*! \externalpage http://doc.qt.io/QtVirtualKeyboard \title Qt Virtual Keyboard */ @@ -292,3 +293,8 @@ \externalpage http://www.qt.io/qt-account/ \title Qt Account */ + +/*! + \externalpage http://doc.qt.io/vs-addin + \title Qt Visual Studio Add-in +*/ |