diff options
3 files changed, 7 insertions, 5 deletions
diff --git a/examples/quickcontrols2/chattutorial/doc/src/qtquickcontrols2-chattutorial.qdoc b/examples/quickcontrols2/chattutorial/doc/src/qtquickcontrols2-chattutorial.qdoc index bc0ca846..4c00d456 100644 --- a/examples/quickcontrols2/chattutorial/doc/src/qtquickcontrols2-chattutorial.qdoc +++ b/examples/quickcontrols2/chattutorial/doc/src/qtquickcontrols2-chattutorial.qdoc @@ -98,7 +98,7 @@ Let's modify the default QML code to suit our needs. \quotefromfile chattutorial/chapter1-settingup/main.qml \skipto import -\printuntil import QtQuick.Controls 2.12 +\printuntil import QtQuick.Controls First, import the \l {Qt Quick} module. This gives us access to graphical primitives such as \l Item, \l Rectangle, \l Text, and so @@ -667,8 +667,8 @@ changes to be done to \c ContactPage.qml. To be able to use the types, we must first import them using the URI we set in \c main.cpp: \quotefromfile chattutorial/chapter4-models/ContactPage.qml -\skipto import io.qt.examples.chattutorial 1.0 -\printline import io.qt.examples.chattutorial 1.0 +\skipto import io.qt.examples.chattutorial +\printline import io.qt.examples.chattutorial We then replace the dummy model with the proper one: diff --git a/src/imports/controls/doc/src/qtquickcontrols2-customize.qdoc b/src/imports/controls/doc/src/qtquickcontrols2-customize.qdoc index 58138a07..9b686070 100644 --- a/src/imports/controls/doc/src/qtquickcontrols2-customize.qdoc +++ b/src/imports/controls/doc/src/qtquickcontrols2-customize.qdoc @@ -711,8 +711,8 @@ \image qtquickcontrols2-popup-custom.png \quotefromfile qtquickcontrols2-popup-custom.qml - \skipto import QtQuick 2.12 - \printuntil import QtQuick.Controls 2.12 + \skipto import QtQuick + \printuntil import QtQuick.Controls \codeline \skipto Popup \printuntil { diff --git a/src/quicktemplates2/qquickcombobox.cpp b/src/quicktemplates2/qquickcombobox.cpp index 426adbd3..4a7492ba 100644 --- a/src/quicktemplates2/qquickcombobox.cpp +++ b/src/quicktemplates2/qquickcombobox.cpp @@ -849,6 +849,8 @@ qreal QQuickComboBoxPrivate::calculateWidestTextWidth() const } /*! + \internal + If the user requested it (and we haven't already done it, depending on the policy), update the implicit content width to the largest text in the model. */ |