diff options
| author | Samuli Piippo <samuli.piippo@qt.io> | 2019-08-02 15:35:03 +0300 |
|---|---|---|
| committer | Samuli Piippo <samuli.piippo@qt.io> | 2019-08-02 15:35:03 +0300 |
| commit | 61e0c9da397573d8ca3c4f7994f73864ba822aac (patch) | |
| tree | c89261ce7f6499cfeb60ba2e924abbb71cc3838e /qml/MainWindow.qml | |
| parent | 04cecef50d9316d98c11e8b82be5a492ef9bde70 (diff) | |
| parent | f89cf3ae354de42df46588d50a3ad0816cc8fc28 (diff) | |
Merge remote-tracking branch 'origin/5.12' into 5.135.13
* origin/5.12:
Use applicationsRoot path from settings file instead of hard-coding
Remove hard-coded values for default video and default location
Make demo header as overlay on top of loader and add auto-hide timer
Change-Id: Ie82098dcb0db6595fd27ba2231d73034c29d0874
Diffstat (limited to 'qml/MainWindow.qml')
| -rw-r--r-- | qml/MainWindow.qml | 6 |
1 files changed, 1 insertions, 5 deletions
diff --git a/qml/MainWindow.qml b/qml/MainWindow.qml index d957468..c1f4e54 100644 --- a/qml/MainWindow.qml +++ b/qml/MainWindow.qml @@ -180,11 +180,7 @@ Item { objectName: "applicationLoader" opacity: 0; visible: opacity > 0.1 - height: root.demoHeaderEnabled ? parent.height - (demoHeader.height + demoHeader.y) : parent.height - - anchors.top: root.demoHeaderEnabled ? demoHeader.bottom : root.top - anchors.left: parent.left - anchors.right: parent.right + anchors.fill: parent asynchronous: true; onStatusChanged: { |