diff options
4 files changed, 8 insertions, 4 deletions
diff --git a/src/imports/controls/doc/src/external-pages.qdoc b/src/imports/controls/doc/src/external-pages.qdoc index d4a82fb8..05005798 100644 --- a/src/imports/controls/doc/src/external-pages.qdoc +++ b/src/imports/controls/doc/src/external-pages.qdoc @@ -29,3 +29,8 @@ \externalpage https://doc.qt.io/qt-5/qtquickcontrols2-differences.html \title Qt 5.15: Qt Quick Controls vs Qt Quick Controls 1 */ + +/*! + \externalpage https://doc.qt.io/qtcreator/creator-project-creating.html#selecting-project-type + \title Qt Creator: Project Types +*/ diff --git a/src/imports/controls/doc/src/qtquickcontrols2-customize.qdoc b/src/imports/controls/doc/src/qtquickcontrols2-customize.qdoc index 956c2c9d..321588b4 100644 --- a/src/imports/controls/doc/src/qtquickcontrols2-customize.qdoc +++ b/src/imports/controls/doc/src/qtquickcontrols2-customize.qdoc @@ -329,8 +329,8 @@ style will illustrate the elevation with a drop shadow; the higher the elevation, the larger the shadow. - The first step is to \l {Creating Qt Quick Projects}{create a new Qt Quick - Controls 2 application} in Qt Creator. After that, we + The first step is to \l {Qt Creator: Project Types}{create a new Qt Quick + Controls application} in Qt Creator. After that, we \l {Qt Creator: Creating C++ Classes}{add a C++ type} that stores the elevation. Since the type will be used for every control supported by our style, and because we may wish to add other attached properties later on, we'll call it diff --git a/src/imports/controls/doc/src/qtquickcontrols2-index.qdoc b/src/imports/controls/doc/src/qtquickcontrols2-index.qdoc index 4238ba41..7570acbb 100644 --- a/src/imports/controls/doc/src/qtquickcontrols2-index.qdoc +++ b/src/imports/controls/doc/src/qtquickcontrols2-index.qdoc @@ -172,7 +172,6 @@ \li \l{Deploying Qt Quick Controls Applications}{Deployment} \li \l{Qt Quick Controls Configuration File}{Configuration File} \li \l{Supported Environment Variables in Qt Quick Controls}{Environment Variables} - \li \l{Differences with Qt Quick Controls 1} \endlist \section1 Reference diff --git a/src/quicktemplates2/qquickdialog.cpp b/src/quicktemplates2/qquickdialog.cpp index d32f6272..6d8bd2ad 100644 --- a/src/quicktemplates2/qquickdialog.cpp +++ b/src/quicktemplates2/qquickdialog.cpp @@ -511,7 +511,7 @@ void QQuickDialog::reject() \li Emits \l accepted() or \l rejected() depending on whether the result is \c Dialog.Accepted or \c Dialog.Rejected, respectively. - \li Emits \l{Popup::}{closed()). + \li Emits \l{Popup::}{closed()}. \endlist \sa accept(), reject(), result |