diff options
-rw-r--r-- | src/labs/platform/qquickplatformdialog.cpp | 2 | ||||
-rw-r--r-- | src/labs/platform/qquickplatformmenu.cpp | 2 | ||||
-rw-r--r-- | src/labs/platform/qquickplatformmenubar.cpp | 2 | ||||
-rw-r--r-- | src/qml/types/qqmlbind.cpp | 2 | ||||
-rw-r--r-- | src/qml/types/qqmlconnections.cpp | 2 | ||||
-rw-r--r-- | src/quick/items/qquickdroparea.cpp | 4 | ||||
-rw-r--r-- | src/quick/items/qquickitem.cpp | 4 | ||||
-rw-r--r-- | src/quick/items/qquickwindow.cpp | 2 | ||||
-rw-r--r-- | src/quick/util/qquickanimation.cpp | 12 | ||||
-rw-r--r-- | src/quick/util/qquickbehavior.cpp | 2 | ||||
-rw-r--r-- | src/quick/util/qquickpropertychanges.cpp | 2 | ||||
-rw-r--r-- | src/quickdialogs2/quickdialogs2/qquickabstractdialog.cpp | 2 | ||||
-rw-r--r-- | src/quicktemplates2/qquickapplicationwindow.cpp | 2 | ||||
-rw-r--r-- | src/quicktemplates2/qquickcontainer.cpp | 2 | ||||
-rw-r--r-- | src/quicktemplates2/qquickmenu.cpp | 2 | ||||
-rw-r--r-- | src/quicktemplates2/qquickpane.cpp | 2 | ||||
-rw-r--r-- | src/quicktemplates2/qquickpopup.cpp | 4 | ||||
-rw-r--r-- | src/quicktemplates2/qquickscrollview.cpp | 2 |
18 files changed, 26 insertions, 26 deletions
diff --git a/src/labs/platform/qquickplatformdialog.cpp b/src/labs/platform/qquickplatformdialog.cpp index 06a26237c1..5a78c7a432 100644 --- a/src/labs/platform/qquickplatformdialog.cpp +++ b/src/labs/platform/qquickplatformdialog.cpp @@ -112,7 +112,7 @@ QPlatformDialogHelper *QQuickPlatformDialog::handle() const /*! \qmldefault - \qmlproperty list<Object> Qt.labs.platform::Dialog::data + \qmlproperty list<QtObject> Qt.labs.platform::Dialog::data This default property holds the list of all objects declared as children of the dialog. diff --git a/src/labs/platform/qquickplatformmenu.cpp b/src/labs/platform/qquickplatformmenu.cpp index e7418df7aa..4b82687b41 100644 --- a/src/labs/platform/qquickplatformmenu.cpp +++ b/src/labs/platform/qquickplatformmenu.cpp @@ -317,7 +317,7 @@ void QQuickPlatformMenu::sync() /*! \qmldefault - \qmlproperty list<Object> Qt.labs.platform::Menu::data + \qmlproperty list<QtObject> Qt.labs.platform::Menu::data This default property holds the list of all objects declared as children of the menu. The data property includes objects that are not \l MenuItem instances, diff --git a/src/labs/platform/qquickplatformmenubar.cpp b/src/labs/platform/qquickplatformmenubar.cpp index 3b1f4b7420..c232cec622 100644 --- a/src/labs/platform/qquickplatformmenubar.cpp +++ b/src/labs/platform/qquickplatformmenubar.cpp @@ -130,7 +130,7 @@ QPlatformMenuBar *QQuickPlatformMenuBar::handle() const /*! \qmldefault - \qmlproperty list<Object> Qt.labs.platform::MenuBar::data + \qmlproperty list<QtObject> Qt.labs.platform::MenuBar::data This default property holds the list of all objects declared as children of the menubar. The data property includes objects that are not \l Menu instances, diff --git a/src/qml/types/qqmlbind.cpp b/src/qml/types/qqmlbind.cpp index be33a1f19a..5c5bbefb43 100644 --- a/src/qml/types/qqmlbind.cpp +++ b/src/qml/types/qqmlbind.cpp @@ -216,7 +216,7 @@ void QQmlBind::setWhen(bool v) } /*! - \qmlproperty Object QtQml::Binding::target + \qmlproperty QtObject QtQml::Binding::target The object to be updated. */ diff --git a/src/qml/types/qqmlconnections.cpp b/src/qml/types/qqmlconnections.cpp index d115c82b6d..73a3e60efc 100644 --- a/src/qml/types/qqmlconnections.cpp +++ b/src/qml/types/qqmlconnections.cpp @@ -138,7 +138,7 @@ QQmlConnections::QQmlConnections(QObject *parent) : } /*! - \qmlproperty Object QtQml::Connections::target + \qmlproperty QtObject QtQml::Connections::target This property holds the object that sends the signal. If this property is not set, the \c target defaults to the parent of the Connection. diff --git a/src/quick/items/qquickdroparea.cpp b/src/quick/items/qquickdroparea.cpp index e709db7181..a41aa355bb 100644 --- a/src/quick/items/qquickdroparea.cpp +++ b/src/quick/items/qquickdroparea.cpp @@ -181,7 +181,7 @@ QQuickDropAreaDrag *QQuickDropArea::drag() } /*! - \qmlproperty Object QtQuick::DropArea::drag.source + \qmlproperty QtObject QtQuick::DropArea::drag.source This property holds the source of a drag. */ @@ -370,7 +370,7 @@ void QQuickDropArea::dropEvent(QDropEvent *event) */ /*! - \qmlproperty Object QtQuick::DragEvent::drag.source + \qmlproperty QtObject QtQuick::DragEvent::drag.source This property holds the source of a drag event. */ diff --git a/src/quick/items/qquickitem.cpp b/src/quick/items/qquickitem.cpp index 408f02ea02..aad605721f 100644 --- a/src/quick/items/qquickitem.cpp +++ b/src/quick/items/qquickitem.cpp @@ -3293,7 +3293,7 @@ void QQuickItemPrivate::data_append(QQmlListProperty<QObject> *prop, QObject *o) } /*! - \qmlproperty list<Object> QtQuick::Item::data + \qmlproperty list<QtObject> QtQuick::Item::data \qmldefault The data property allows you to freely mix visual children and resources @@ -4955,7 +4955,7 @@ QQmlListProperty<QObject> QQuickItemPrivate::resources() /*! \qmlproperty list<Item> QtQuick::Item::children - \qmlproperty list<Object> QtQuick::Item::resources + \qmlproperty list<QtObject> QtQuick::Item::resources The children property contains the list of visual children of this item. The resources property contains non-visual resources that you want to diff --git a/src/quick/items/qquickwindow.cpp b/src/quick/items/qquickwindow.cpp index bb58f4467c..bd75dc4ed9 100644 --- a/src/quick/items/qquickwindow.cpp +++ b/src/quick/items/qquickwindow.cpp @@ -1664,7 +1664,7 @@ QPair<QQuickItem*, QQuickPointerHandler*> QQuickWindowPrivate::findCursorItemAnd #endif /*! - \qmlproperty list<Object> Window::data + \qmlproperty list<QtObject> Window::data \qmldefault The data property allows you to freely mix visual children, resources diff --git a/src/quick/util/qquickanimation.cpp b/src/quick/util/qquickanimation.cpp index b629196556..6605788ede 100644 --- a/src/quick/util/qquickanimation.cpp +++ b/src/quick/util/qquickanimation.cpp @@ -1129,8 +1129,8 @@ void QQuickPropertyAction::setProperty(const QString &n) } /*! - \qmlproperty Object QtQuick::PropertyAction::target - \qmlproperty list<Object> QtQuick::PropertyAction::targets + \qmlproperty QtObject QtQuick::PropertyAction::target + \qmlproperty list<QtObject> QtQuick::PropertyAction::targets \qmlproperty string QtQuick::PropertyAction::property \qmlproperty string QtQuick::PropertyAction::properties @@ -1165,7 +1165,7 @@ QQmlListProperty<QObject> QQuickPropertyAction::targets() } /*! - \qmlproperty list<Object> QtQuick::PropertyAction::exclude + \qmlproperty list<QtObject> QtQuick::PropertyAction::exclude This property holds the objects that should not be affected by this action. \sa targets @@ -2464,9 +2464,9 @@ void QQuickPropertyAnimation::setProperties(const QString &prop) /*! \qmlproperty string QtQuick::PropertyAnimation::properties - \qmlproperty list<Object> QtQuick::PropertyAnimation::targets + \qmlproperty list<QtObject> QtQuick::PropertyAnimation::targets \qmlproperty string QtQuick::PropertyAnimation::property - \qmlproperty Object QtQuick::PropertyAnimation::target + \qmlproperty QtObject QtQuick::PropertyAnimation::target These properties are used as a set to determine which properties should be animated. The singular and plural forms are functionally identical, e.g. @@ -2559,7 +2559,7 @@ QQmlListProperty<QObject> QQuickPropertyAnimation::targets() } /*! - \qmlproperty list<Object> QtQuick::PropertyAnimation::exclude + \qmlproperty list<QtObject> QtQuick::PropertyAnimation::exclude This property holds the items not to be affected by this animation. \sa PropertyAnimation::targets */ diff --git a/src/quick/util/qquickbehavior.cpp b/src/quick/util/qquickbehavior.cpp index 3ca77d66ee..b2caddb5a1 100644 --- a/src/quick/util/qquickbehavior.cpp +++ b/src/quick/util/qquickbehavior.cpp @@ -311,7 +311,7 @@ QVariant QQuickBehavior::targetValue() const \readonly \qmlpropertygroup QtQuick::Behavior::targetProperty \qmlproperty string QtQuick::Behavior::targetProperty.name - \qmlproperty Object QtQuick::Behavior::targetProperty.object + \qmlproperty QtObject QtQuick::Behavior::targetProperty.object \table \header diff --git a/src/quick/util/qquickpropertychanges.cpp b/src/quick/util/qquickpropertychanges.cpp index e7186d349e..b7e02f730d 100644 --- a/src/quick/util/qquickpropertychanges.cpp +++ b/src/quick/util/qquickpropertychanges.cpp @@ -134,7 +134,7 @@ QT_BEGIN_NAMESPACE */ /*! - \qmlproperty Object QtQuick::PropertyChanges::target + \qmlproperty QtObject QtQuick::PropertyChanges::target This property holds the object which contains the properties to be changed. */ diff --git a/src/quickdialogs2/quickdialogs2/qquickabstractdialog.cpp b/src/quickdialogs2/quickdialogs2/qquickabstractdialog.cpp index 262e2ee36d..2b532347c7 100644 --- a/src/quickdialogs2/quickdialogs2/qquickabstractdialog.cpp +++ b/src/quickdialogs2/quickdialogs2/qquickabstractdialog.cpp @@ -121,7 +121,7 @@ QPlatformDialogHelper *QQuickAbstractDialog::handle() const /*! \qmldefault - \qmlproperty list<Object> QtQuick.Dialogs::Dialog::data + \qmlproperty list<QtObject> QtQuick.Dialogs::Dialog::data This default property holds the list of all objects declared as children of the dialog. diff --git a/src/quicktemplates2/qquickapplicationwindow.cpp b/src/quicktemplates2/qquickapplicationwindow.cpp index eb1d12c930..4ed606b125 100644 --- a/src/quicktemplates2/qquickapplicationwindow.cpp +++ b/src/quicktemplates2/qquickapplicationwindow.cpp @@ -517,7 +517,7 @@ void QQuickApplicationWindow::setFooter(QQuickItem *footer) } /*! - \qmlproperty list<Object> QtQuick.Controls::ApplicationWindow::contentData + \qmlproperty list<QtObject> QtQuick.Controls::ApplicationWindow::contentData \qmldefault This default property holds the list of all objects declared as children of diff --git a/src/quicktemplates2/qquickcontainer.cpp b/src/quicktemplates2/qquickcontainer.cpp index c46d966079..71f79ff426 100644 --- a/src/quicktemplates2/qquickcontainer.cpp +++ b/src/quicktemplates2/qquickcontainer.cpp @@ -618,7 +618,7 @@ QVariant QQuickContainer::contentModel() const } /*! - \qmlproperty list<Object> QtQuick.Controls::Container::contentData + \qmlproperty list<QtObject> QtQuick.Controls::Container::contentData \qmldefault This property holds the list of content data. diff --git a/src/quicktemplates2/qquickmenu.cpp b/src/quicktemplates2/qquickmenu.cpp index e045375f89..9295b0902d 100644 --- a/src/quicktemplates2/qquickmenu.cpp +++ b/src/quicktemplates2/qquickmenu.cpp @@ -1067,7 +1067,7 @@ QVariant QQuickMenu::contentModel() const } /*! - \qmlproperty list<Object> QtQuick.Controls::Menu::contentData + \qmlproperty list<QtObject> QtQuick.Controls::Menu::contentData \qmldefault This property holds the list of content data. diff --git a/src/quicktemplates2/qquickpane.cpp b/src/quicktemplates2/qquickpane.cpp index e24eea8bea..620113db07 100644 --- a/src/quicktemplates2/qquickpane.cpp +++ b/src/quicktemplates2/qquickpane.cpp @@ -340,7 +340,7 @@ void QQuickPane::resetContentHeight() } /*! - \qmlproperty list<Object> QtQuick.Controls::Pane::contentData + \qmlproperty list<QtObject> QtQuick.Controls::Pane::contentData \qmldefault This property holds the list of content data. diff --git a/src/quicktemplates2/qquickpopup.cpp b/src/quicktemplates2/qquickpopup.cpp index ed67ff85cf..35eec88716 100644 --- a/src/quicktemplates2/qquickpopup.cpp +++ b/src/quicktemplates2/qquickpopup.cpp @@ -624,7 +624,7 @@ void QQuickPopupPrivate::setBottomMargin(qreal value, bool reset) /*! \since QtQuick.Controls 2.5 (Qt 5.12) - \qmlproperty Object QtQuick.Controls::Popup::anchors.centerIn + \qmlproperty Item QtQuick.Controls::Popup::anchors.centerIn Anchors provide a way to position an item by specifying its relationship with other items. @@ -1723,7 +1723,7 @@ void QQuickPopup::setContentItem(QQuickItem *item) } /*! - \qmlproperty list<Object> QtQuick.Controls::Popup::contentData + \qmlproperty list<QtObject> QtQuick.Controls::Popup::contentData \qmldefault This property holds the list of content data. diff --git a/src/quicktemplates2/qquickscrollview.cpp b/src/quicktemplates2/qquickscrollview.cpp index 1f5adbb7ff..381795f5b8 100644 --- a/src/quicktemplates2/qquickscrollview.cpp +++ b/src/quicktemplates2/qquickscrollview.cpp @@ -440,7 +440,7 @@ QQuickScrollView::QQuickScrollView(QQuickItem *parent) } /*! - \qmlproperty list<Object> QtQuick.Controls::ScrollView::contentData + \qmlproperty list<QtObject> QtQuick.Controls::ScrollView::contentData \qmldefault This property holds the list of content data. |