diff options
| author | Miikka Heikkinen <miikka.heikkinen@qt.io> | 2016-06-21 12:30:18 +0300 |
|---|---|---|
| committer | Miikka Heikkinen <miikka.heikkinen@qt.io> | 2016-06-21 09:35:15 +0000 |
| commit | 65d9db329b71a6e1ad5f000b32cd69e5256a3af8 (patch) | |
| tree | 901d7aa23ecd203a67e94b0607507e26385731ea /editorlib | |
| parent | 3d6da732d6aab1f193c63bd9eb59a411c2a6adad (diff) | |
Use QtQuick.Controls 2.0 ApplicationWindow
Now that menubar is gone, we don't need to use old version anymore.
Change-Id: I104f877caa1bfb9a4abebb834ed2014fcfc877cb
Reviewed-by: Tomi Korpipää <tomi.korpipaa@qt.io>
Diffstat (limited to 'editorlib')
| -rw-r--r-- | editorlib/qml/main.qml | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/editorlib/qml/main.qml b/editorlib/qml/main.qml index c818bdb..1ca98d6 100644 --- a/editorlib/qml/main.qml +++ b/editorlib/qml/main.qml @@ -29,13 +29,14 @@ import QtQuick 2.5 import QtQuick.Controls 1.4 import QtQuick.Layouts 1.2 import QtQuick.Dialogs 1.2 +import QtQuick.Controls 2.0 as QQC2 import QtQml.Models 2.2 import QtQml 2.2 import Qt3D.Core 2.0 import Qt.labs.settings 1.0 import com.theqtcompany.SceneEditor3D 1.0 -ApplicationWindow { +QQC2.ApplicationWindow { id: mainwindow title: qsTr("Qt 3D Scene Editor") + editorScene.emptyString + saveFileTitleAddition width: 1280 @@ -125,7 +126,7 @@ ApplicationWindow { property string systemLanguage: editorScene.language - toolBar: EditorToolbar {} + header: EditorToolbar {} FileDialog { id: loadFileDialog |