diff options
| author | Qt Forward Merge Bot <qt_forward_merge_bot@qt-project.org> | 2019-07-13 03:00:07 +0200 |
|---|---|---|
| committer | Qt Forward Merge Bot <qt_forward_merge_bot@qt-project.org> | 2019-07-13 03:00:07 +0200 |
| commit | a231e051e0a68a94486b2f82e79425d6aaff02c1 (patch) | |
| tree | 1b6ba6a0f34f4be127e1c88badbe6df0cddc0567 /src | |
| parent | 05a98e4db8a91447159eabb6ebc68c40cb7f6cf7 (diff) | |
| parent | 83813e43405109478769010acf2caf85a4229501 (diff) | |
Merge remote-tracking branch 'origin/5.13' into dev
Change-Id: I76bfa11f39261e03b52ad237a09ff623bc865e0f
Diffstat (limited to 'src')
| -rw-r--r-- | src/imports/calendar/doc/qtlabscalendar.qdocconf | 1 | ||||
| -rw-r--r-- | src/imports/controls/doc/qtquickcontrols.qdocconf | 1 | ||||
| -rw-r--r-- | src/imports/platform/doc/qtlabsplatform.qdocconf | 1 | ||||
| -rw-r--r-- | src/quicktemplates2/qquickcombobox.cpp | 1 |
4 files changed, 4 insertions, 0 deletions
diff --git a/src/imports/calendar/doc/qtlabscalendar.qdocconf b/src/imports/calendar/doc/qtlabscalendar.qdocconf index 899dce21..9a88cb25 100644 --- a/src/imports/calendar/doc/qtlabscalendar.qdocconf +++ b/src/imports/calendar/doc/qtlabscalendar.qdocconf @@ -1,4 +1,5 @@ include($QT_INSTALL_DOCS/global/qt-module-defaults.qdocconf) +include($QT_INSTALL_DOCS/config/exampleurl-qtquickcontrols2.qdocconf) project = QtLabsCalendar description = Qt Labs Calendar Reference Documentation diff --git a/src/imports/controls/doc/qtquickcontrols.qdocconf b/src/imports/controls/doc/qtquickcontrols.qdocconf index fd921562..3efe5799 100644 --- a/src/imports/controls/doc/qtquickcontrols.qdocconf +++ b/src/imports/controls/doc/qtquickcontrols.qdocconf @@ -1,4 +1,5 @@ include($QT_INSTALL_DOCS/global/qt-module-defaults.qdocconf) +include($QT_INSTALL_DOCS/config/exampleurl-qtquickcontrols2.qdocconf) include(manifest-meta.qdocconf) moduleheader = QtQuickControls2 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/quicktemplates2/qquickcombobox.cpp b/src/quicktemplates2/qquickcombobox.cpp index 7bcb60fb..71b4eaf1 100644 --- a/src/quicktemplates2/qquickcombobox.cpp +++ b/src/quicktemplates2/qquickcombobox.cpp @@ -840,6 +840,7 @@ void QQuickComboBox::setModel(const QVariant& m) d->model = model; d->createDelegateModel(); + emit countChanged(); if (isComponentComplete()) { setCurrentIndex(count() > 0 ? 0 : -1); d->updateCurrentText(); |