From d16f084b267140b4a901e437c3facebbdf08d89f Mon Sep 17 00:00:00 2001 From: Jan Arve Saether Date: Tue, 15 Oct 2013 17:39:13 +0200 Subject: Expose contentArea as contentItem in ApplicationWindow This will intentionally shadow the QQuickWindow::contentItem This enables users of ApplicationWindow to correctly set the {min,max}imumHeight for the contents of the ApplicationWindow (excluding menubar, toolbar and statusbar). With this information at hand, the ApplicationWindow can easily deduct the correct total size of its {min,max}imumHeight *including* the menubar, toolbar and statusbar. Previously, it was for instance not possible to set an exact minimumHeight because it didn't take the toolbar, statusbar or menubar into consideration One small disadvantage is that the contentItem.minimumWidth cannot be autocompleted. qmlplugindump does not inspect the members of ContentItem. Task-number: QTBUG-32443 Change-Id: I9903e7d4b5e6db7bd7c3c46351a2bb5578f67a57 Reviewed-by: J-P Nurmi --- src/controls/Private/qmldir | 1 + 1 file changed, 1 insertion(+) (limited to 'src/controls/Private/qmldir') diff --git a/src/controls/Private/qmldir b/src/controls/Private/qmldir index 351387806..5dc8061cd 100644 --- a/src/controls/Private/qmldir +++ b/src/controls/Private/qmldir @@ -19,4 +19,5 @@ ToolButtonStyle 1.0 ../Styles/Base/ToolButtonStyle.qml MenuContentItem 1.0 MenuContentItem.qml MenuContentScroller 1.0 MenuContentScroller.qml ColumnMenuContent 1.0 ColumnMenuContent.qml +ContentItem 1.0 ContentItem.qml singleton TextSingleton 1.0 TextSingleton.qml -- cgit v1.2.3