diff options
Diffstat (limited to 'src/imports/platform/doc')
14 files changed, 4 insertions, 3 deletions
diff --git a/src/imports/platform/doc/images/qtlabsplatform-colordialog-gtk.png b/src/imports/platform/doc/images/qtlabsplatform-colordialog-gtk.png Binary files differindex e0785a05..12197f7f 100644 --- a/src/imports/platform/doc/images/qtlabsplatform-colordialog-gtk.png +++ b/src/imports/platform/doc/images/qtlabsplatform-colordialog-gtk.png diff --git a/src/imports/platform/doc/images/qtlabsplatform-filedialog-gtk.png b/src/imports/platform/doc/images/qtlabsplatform-filedialog-gtk.png Binary files differindex 3bc963d0..9360d747 100644 --- a/src/imports/platform/doc/images/qtlabsplatform-filedialog-gtk.png +++ b/src/imports/platform/doc/images/qtlabsplatform-filedialog-gtk.png diff --git a/src/imports/platform/doc/images/qtlabsplatform-folderdialog-gtk.png b/src/imports/platform/doc/images/qtlabsplatform-folderdialog-gtk.png Binary files differindex ea4d929d..45f0585c 100644 --- a/src/imports/platform/doc/images/qtlabsplatform-folderdialog-gtk.png +++ b/src/imports/platform/doc/images/qtlabsplatform-folderdialog-gtk.png diff --git a/src/imports/platform/doc/images/qtlabsplatform-fontdialog-gtk.png b/src/imports/platform/doc/images/qtlabsplatform-fontdialog-gtk.png Binary files differindex 9f3dc2e7..0c6217bd 100644 --- a/src/imports/platform/doc/images/qtlabsplatform-fontdialog-gtk.png +++ b/src/imports/platform/doc/images/qtlabsplatform-fontdialog-gtk.png diff --git a/src/imports/platform/doc/images/qtlabsplatform-menu.png b/src/imports/platform/doc/images/qtlabsplatform-menu.png Binary files differindex 120d263b..7945b45f 100644 --- a/src/imports/platform/doc/images/qtlabsplatform-menu.png +++ b/src/imports/platform/doc/images/qtlabsplatform-menu.png diff --git a/src/imports/platform/doc/images/qtlabsplatform-menubar.png b/src/imports/platform/doc/images/qtlabsplatform-menubar.png Binary files differindex 685d03b3..7faa8141 100644 --- a/src/imports/platform/doc/images/qtlabsplatform-menubar.png +++ b/src/imports/platform/doc/images/qtlabsplatform-menubar.png diff --git a/src/imports/platform/doc/images/qtlabsplatform-messagedialog-android.png b/src/imports/platform/doc/images/qtlabsplatform-messagedialog-android.png Binary files differindex a1de1806..3986694f 100644 --- a/src/imports/platform/doc/images/qtlabsplatform-messagedialog-android.png +++ b/src/imports/platform/doc/images/qtlabsplatform-messagedialog-android.png diff --git a/src/imports/platform/doc/images/qtlabsplatform-messagedialog-informative-android.png b/src/imports/platform/doc/images/qtlabsplatform-messagedialog-informative-android.png Binary files differindex 7062ed90..b2d3cd37 100644 --- a/src/imports/platform/doc/images/qtlabsplatform-messagedialog-informative-android.png +++ b/src/imports/platform/doc/images/qtlabsplatform-messagedialog-informative-android.png diff --git a/src/imports/platform/doc/images/qtlabsplatform-systemtrayicon-menu.png b/src/imports/platform/doc/images/qtlabsplatform-systemtrayicon-menu.png Binary files differindex 0d0ecfab..670df8ed 100644 --- a/src/imports/platform/doc/images/qtlabsplatform-systemtrayicon-menu.png +++ b/src/imports/platform/doc/images/qtlabsplatform-systemtrayicon-menu.png diff --git a/src/imports/platform/doc/images/qtlabsplatform-systemtrayicon-message.png b/src/imports/platform/doc/images/qtlabsplatform-systemtrayicon-message.png Binary files differindex d929ca97..beaeed92 100644 --- a/src/imports/platform/doc/images/qtlabsplatform-systemtrayicon-message.png +++ b/src/imports/platform/doc/images/qtlabsplatform-systemtrayicon-message.png diff --git a/src/imports/platform/doc/images/qtlabsplatform-systemtrayicon.png b/src/imports/platform/doc/images/qtlabsplatform-systemtrayicon.png Binary files differindex 58c40d73..2f7a851c 100644 --- a/src/imports/platform/doc/images/qtlabsplatform-systemtrayicon.png +++ b/src/imports/platform/doc/images/qtlabsplatform-systemtrayicon.png diff --git a/src/imports/platform/doc/qtlabsplatform.qdocconf b/src/imports/platform/doc/qtlabsplatform.qdocconf index c4a217ab..ae1a63f1 100644 --- a/src/imports/platform/doc/qtlabsplatform.qdocconf +++ b/src/imports/platform/doc/qtlabsplatform.qdocconf @@ -1,4 +1,5 @@ include($QT_INSTALL_DOCS/global/qt-module-defaults.qdocconf) +include($QT_INSTALL_DOCS/config/exampleurl-qtquickcontrols2.qdocconf) project = QtLabsPlatform description = Qt Labs Platform Reference Documentation diff --git a/src/imports/platform/doc/src/qtlabsplatform-index.qdoc b/src/imports/platform/doc/src/qtlabsplatform-index.qdoc index b5fd3046..7b3f78fb 100644 --- a/src/imports/platform/doc/src/qtlabsplatform-index.qdoc +++ b/src/imports/platform/doc/src/qtlabsplatform-index.qdoc @@ -45,6 +45,6 @@ \list \li \l{Qt Quick} - \li \l{Qt Quick Controls 2} + \li \l{Qt Quick Controls} \endlist */ diff --git a/src/imports/platform/doc/src/qtlabsplatform-qmltypes.qdoc b/src/imports/platform/doc/src/qtlabsplatform-qmltypes.qdoc index 57f011ef..dec67b72 100644 --- a/src/imports/platform/doc/src/qtlabsplatform-qmltypes.qdoc +++ b/src/imports/platform/doc/src/qtlabsplatform-qmltypes.qdoc @@ -33,7 +33,7 @@ The experimental \l{Qt Labs Platform} module provides QML types for native platform extensions. These QML types work in conjunction with \l{Qt Quick} - and \l{Qt Quick Controls 2}. + and \l{Qt Quick Controls}. The QML types can be imported into your application using the following import statement in your .qml file: @@ -51,7 +51,7 @@ \section1 Related Information \list - \li \l {Qt Quick Controls 2 QML Types} + \li \l {Qt Quick Controls QML Types} \endlist \noautolist |
