From 3fc2c5329e09eb1a9db35797eca59d1ddf9f80bc Mon Sep 17 00:00:00 2001 From: Venugopal Shivashankar Date: Tue, 22 Mar 2016 15:48:01 +0100 Subject: Rename Qt Labs Controls to Qt Quick Controls 2 - doc update MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit - Change \title, \page, and \l instances that used "qtlabs" instead of "qtquick". - Renamed the qdocconf file and changed the qch parameters in it to use "Qt Quick Controls 2". - Added "2" as output suffix for the html filenames. Change-Id: Ia2fdd1c835229e5216f42a2fdfa5f7e11965e21d Reviewed-by: Mitch Curtis Reviewed-by: Topi Reiniƶ --- src/imports/controls/doc/src/calendar/qtlabscalendar-index.qdoc | 2 +- src/imports/controls/doc/src/calendar/qtlabscalendar.qdoc | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) (limited to 'src/imports/controls/doc/src/calendar') diff --git a/src/imports/controls/doc/src/calendar/qtlabscalendar-index.qdoc b/src/imports/controls/doc/src/calendar/qtlabscalendar-index.qdoc index 02e92bf0..dedfad4c 100644 --- a/src/imports/controls/doc/src/calendar/qtlabscalendar-index.qdoc +++ b/src/imports/controls/doc/src/calendar/qtlabscalendar-index.qdoc @@ -44,6 +44,6 @@ \list \li \l{Qt Quick} \li \l{Qt Quick Layouts} - \li \l{Qt Labs Controls} + \li \l{Qt Quick Controls 2} \endlist */ diff --git a/src/imports/controls/doc/src/calendar/qtlabscalendar.qdoc b/src/imports/controls/doc/src/calendar/qtlabscalendar.qdoc index f483ae91..b363195a 100644 --- a/src/imports/controls/doc/src/calendar/qtlabscalendar.qdoc +++ b/src/imports/controls/doc/src/calendar/qtlabscalendar.qdoc @@ -33,7 +33,7 @@ The \l{Qt Labs Calendar} module provides QML types for creating calendars. These QML types work in conjunction with \l{Qt Quick} and - \l{Qt Labs Controls}. + \l{Qt Quick Controls 2}. The QML types can be imported into your application using the following import statement in your .qml file: @@ -49,7 +49,7 @@ \section1 Related Information \list - \li \l {Qt Labs Controls QML Types} + \li \l {Qt Quick Controls 2 QML Types} \endlist \noautolist -- cgit v1.2.3