Code Review
/
staging
/
HomeScreen.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
review
|
tree
raw
|
inline
| side by side
Add 2017 to copyright
[staging/HomeScreen.git]
/
HomeScreen
/
qml
/
main.qml
diff --git
a/HomeScreen/qml/main.qml
b/HomeScreen/qml/main.qml
index
542f395
..
11bd9d5
100644
(file)
--- a/
HomeScreen/qml/main.qml
+++ b/
HomeScreen/qml/main.qml
@@
-1,6
+1,6
@@
/*
* Copyright (C) 2016 The Qt Company Ltd.
/*
* Copyright (C) 2016 The Qt Company Ltd.
- * Copyright (C) 2016 Mentor Graphics Development (Deutschland) GmbH
+ * Copyright (C) 2016
, 2017
Mentor Graphics Development (Deutschland) GmbH
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
@@
-18,6
+18,7
@@
import QtQuick 2.2
import QtQuick.Window 2.1
import QtQuick.Layouts 1.1
import QtQuick 2.2
import QtQuick.Window 2.1
import QtQuick.Layouts 1.1
+import HomeScreen 1.0
Window {
visible: true
Window {
visible: true
@@
-26,6
+27,10
@@
Window {
height: container.height * container.scale
title: 'HomeScreen'
height: container.height * container.scale
title: 'HomeScreen'
+ ApplicationLauncher {
+ id: launcher
+ }
+
Image {
id: container
anchors.centerIn: parent
Image {
id: container
anchors.centerIn: parent
@@
-48,6
+53,16
@@
Window {
Layout.fillWidth: true
Layout.fillHeight: true
Layout.preferredHeight: 1920 - 218 - 215
Layout.fillWidth: true
Layout.fillHeight: true
Layout.preferredHeight: 1920 - 218 - 215
+
+ visible: false
+ }
+
+ Home {
+ id: appLauncherAreaLauncher
+ Layout.fillWidth: true
+ Layout.fillHeight: true
+ Layout.preferredHeight: 1920 - 218 - 215
+ visible: true
}
MediaArea {
}
MediaArea {