diff options
author | J-P Nurmi <jpnurmi@qt.io> | 2016-10-07 17:20:24 +0200 |
---|---|---|
committer | J-P Nurmi <jpnurmi@qt.io> | 2016-10-07 17:24:19 +0200 |
commit | a3b706531b98c64137acaebf26756828cd43a2a0 (patch) | |
tree | b04490213d60519b8a0c90f9c166eef862ed185b /src/quicktemplates2/qquickapplicationwindow.cpp | |
parent | 2f4a059881dbec289d86abc7456b42d5eec77ceb (diff) | |
parent | c2b7e55af43518ae1898eddf8611ef617149ca8a (diff) |
Merge remote-tracking branch 'origin/5.7' into 5.8
Conflicts:
src/imports/controls/doc/snippets/screenshots/qtquickcontrols2-progressbar-disabled.qml
src/imports/controls/doc/snippets/screenshots/qtquickcontrols2-progressbar-normal.qml
src/imports/controls/doc/snippets/screenshots/qtquickcontrols2-radiobutton-checked.qml
src/imports/controls/doc/snippets/screenshots/qtquickcontrols2-radiobutton-disabled.qml
src/imports/controls/doc/snippets/screenshots/qtquickcontrols2-radiobutton-focused.qml
src/imports/controls/doc/snippets/screenshots/qtquickcontrols2-radiobutton-normal.qml
src/imports/controls/doc/snippets/screenshots/qtquickcontrols2-rangeslider-disabled.qml
src/imports/controls/doc/snippets/screenshots/qtquickcontrols2-rangeslider-first-handle-focused.qml
src/imports/controls/doc/snippets/screenshots/qtquickcontrols2-rangeslider-normal.qml
src/imports/controls/doc/snippets/screenshots/qtquickcontrols2-rangeslider-second-handle-focused.qml
src/imports/controls/doc/snippets/screenshots/qtquickcontrols2-rangeslider-second-handle.qml
src/imports/controls/doc/snippets/screenshots/qtquickcontrols2-slider-disabled.qml
src/imports/controls/doc/snippets/screenshots/qtquickcontrols2-slider-focused.qml
src/imports/controls/doc/snippets/screenshots/qtquickcontrols2-slider-normal.qml
src/imports/controls/doc/snippets/screenshots/qtquickcontrols2-tabbar-explicit.qml
src/quicktemplates2/qquickmenu.cpp
tests/auto/controls/data/tst_buttongroup.qml
tests/auto/controls/data/tst_swipedelegate.qml
Change-Id: Ib6042a0ad716f557927e7412d17ea8957d06c015
Diffstat (limited to 'src/quicktemplates2/qquickapplicationwindow.cpp')
-rw-r--r-- | src/quicktemplates2/qquickapplicationwindow.cpp | 32 |
1 files changed, 31 insertions, 1 deletions
diff --git a/src/quicktemplates2/qquickapplicationwindow.cpp b/src/quicktemplates2/qquickapplicationwindow.cpp index 7fb406c1..7f65b8bf 100644 --- a/src/quicktemplates2/qquickapplicationwindow.cpp +++ b/src/quicktemplates2/qquickapplicationwindow.cpp @@ -94,7 +94,7 @@ QT_BEGIN_NAMESPACE \note By default, an ApplicationWindow is not visible. - \sa Page, {Container Controls} + \sa {Customizing ApplicationWindow}, Page, {Container Controls} */ class QQuickApplicationWindowPrivate : public QQuickItemChangeListener @@ -275,9 +275,15 @@ QQuickApplicationWindow::~QQuickApplicationWindow() The background item is stacked under the \l {contentItem}{content item}, but above the \l {Window::color}{background color} of the window. + The background item is useful for images and gradients, for example, + but the \l {Window::}{color} property is preferable for solid colors, + as it doesn't need to create an item. + \note If the background item has no explicit size specified, it automatically follows the control's size. In most cases, there is no need to specify width or height for a background item. + + \sa {Customizing ApplicationWindow}, contentItem, header, footer, overlay */ QQuickItem *QQuickApplicationWindow::background() const { @@ -408,6 +414,17 @@ void QQuickApplicationWindow::setFooter(QQuickItem *footer) This default property holds the list of all objects declared as children of the window. + The data property allows you to freely mix visual children, resources and + other windows in an ApplicationWindow. + + If you assign an Item to the contentData list, it becomes a child of the + window's contentItem, so that it appears inside the window. The item's + parent will be the window's \l contentItem. + + It should not generally be necessary to refer to the contentData property, + as it is the default property for ApplicationWindow and thus all child + items are automatically assigned to this property. + \sa contentItem */ QQmlListProperty<QObject> QQuickApplicationWindow::contentData() @@ -420,6 +437,11 @@ QQmlListProperty<QObject> QQuickApplicationWindow::contentData() \readonly This property holds the window content item. + + The content item is stacked above the \l background item, and under the + \l header, \l footer, and \l overlay items. + + \sa background, header, footer, overlay */ QQuickItem *QQuickApplicationWindow::contentItem() const { @@ -476,6 +498,14 @@ QQuickItem *QQuickApplicationWindow::activeFocusControl() const \li This property holds a component to use as a visual item that implements background dimming for modeless popups. It is created for and stacked below visible dimming popups. + \row + \li overlay.pressed() + \li This signal is emitted when the overlay is pressed by the user while + a popup is visible. + \row + \li overlay.released() + \li This signal is emitted when the overlay is released by the user while + a modal popup is visible. \endtable \sa Popup::modal, Popup::dim |