From 6b8003f521b94d99a299182fce7c0cbcbeac4299 Mon Sep 17 00:00:00 2001 From: Jens Bache-Wiig Date: Tue, 5 Feb 2013 17:51:14 +0100 Subject: Remove the "Window" declaration as it shadows QtQuick.Window Change-Id: I1e35a8cadf5c604f1f6a4b0ec2d80d8f634c4d74 Reviewed-by: Jens Bache-Wiig --- examples/gallery/content/ChildWindow.qml | 1 + 1 file changed, 1 insertion(+) (limited to 'examples/gallery/content/ChildWindow.qml') diff --git a/examples/gallery/content/ChildWindow.qml b/examples/gallery/content/ChildWindow.qml index 77daba8d..99d27251 100644 --- a/examples/gallery/content/ChildWindow.qml +++ b/examples/gallery/content/ChildWindow.qml @@ -39,6 +39,7 @@ ****************************************************************************/ import QtQuick 2.0 +import QtQuick.Window 2.0 import QtDesktop 1.0 Window { -- cgit v1.2.1 From 07a972ae45023d50d4f63420de4eba47e3653216 Mon Sep 17 00:00:00 2001 From: Jens Bache-Wiig Date: Tue, 5 Feb 2013 18:24:40 +0100 Subject: Remove the "Desktop" item This is mostly replaced by Screen and we should rather improve on that instead. Change-Id: Id21a3a67aaeaad1aca25c75a2f8a52df82b84157 Reviewed-by: Jens Bache-Wiig --- examples/gallery/content/ChildWindow.qml | 20 -------------------- 1 file changed, 20 deletions(-) (limited to 'examples/gallery/content/ChildWindow.qml') diff --git a/examples/gallery/content/ChildWindow.qml b/examples/gallery/content/ChildWindow.qml index 99d27251..9dd1f147 100644 --- a/examples/gallery/content/ChildWindow.qml +++ b/examples/gallery/content/ChildWindow.qml @@ -60,18 +60,6 @@ Window { anchors.top: parent.top width: parent.width horizontalAlignment: Text.AlignHCenter - - text: { - if (Desktop.screenCount == 1) { - "You have only a single screen.\nThe dimensions of your screen are: " + Desktop.screenWidth + " x " + Desktop.screenHeight; - } else { - var text = "You have " + Desktop.screenCount + " screens.\nThe dimensions of your screens are: " - for(var i=0; i Date: Wed, 20 Feb 2013 17:38:44 +0100 Subject: Rename QtDesktop to QtQuick.Controls Change-Id: Icc61dbfc74cc2a303b9847e7d2c7ace4a9002046 Reviewed-by: Jens Bache-Wiig --- examples/gallery/content/ChildWindow.qml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'examples/gallery/content/ChildWindow.qml') diff --git a/examples/gallery/content/ChildWindow.qml b/examples/gallery/content/ChildWindow.qml index 9dd1f147..312e2c63 100644 --- a/examples/gallery/content/ChildWindow.qml +++ b/examples/gallery/content/ChildWindow.qml @@ -40,7 +40,7 @@ import QtQuick 2.0 import QtQuick.Window 2.0 -import QtDesktop 1.0 +import QtQuick.Controls 1.0 Window { id: window1 -- cgit v1.2.1 From 83edbb617602a34c1e802118351b059f5bdd95af Mon Sep 17 00:00:00 2001 From: Shawn Rutledge Date: Thu, 21 Feb 2013 16:06:26 +0100 Subject: Replaced BSD with LGPL license to conform with Qt Project modules We want to use the same license as the other Qt modules. QML files stay as BSD for now. Change-Id: I10b1484f5ab0dfe2138ff7e045d0ecfd85556aa1 Reviewed-by: Jens Bache-Wiig --- examples/gallery/content/ChildWindow.qml | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) (limited to 'examples/gallery/content/ChildWindow.qml') diff --git a/examples/gallery/content/ChildWindow.qml b/examples/gallery/content/ChildWindow.qml index 312e2c63..409aa6e4 100644 --- a/examples/gallery/content/ChildWindow.qml +++ b/examples/gallery/content/ChildWindow.qml @@ -1,9 +1,9 @@ /**************************************************************************** ** -** Copyright (C) 2012 Digia Plc and/or its subsidiary(-ies). +** Copyright (C) 2013 Digia Plc and/or its subsidiary(-ies). ** Contact: http://www.qt-project.org/legal ** -** This file is part of the examples of the Qt Toolkit. +** This file is part of the Qt Quick Controls module of the Qt Toolkit. ** ** $QT_BEGIN_LICENSE:BSD$ ** You may use this file under the terms of the BSD license as follows: @@ -38,6 +38,10 @@ ** ****************************************************************************/ + + + + import QtQuick 2.0 import QtQuick.Window 2.0 import QtQuick.Controls 1.0 -- cgit v1.2.1 From 1ed438ccb1d545961d128983b213131e4bb75abb Mon Sep 17 00:00:00 2001 From: Jens Bache-Wiig Date: Sat, 23 Feb 2013 12:32:31 +0100 Subject: Update window example to use visibility MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Change-Id: Ic4837e04fd5be2d0f046ab84805b3faf30896c10 Reviewed-by: Samuel Rødal Reviewed-by: Jens Bache-Wiig --- examples/gallery/content/ChildWindow.qml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'examples/gallery/content/ChildWindow.qml') diff --git a/examples/gallery/content/ChildWindow.qml b/examples/gallery/content/ChildWindow.qml index 409aa6e4..74b05956 100644 --- a/examples/gallery/content/ChildWindow.qml +++ b/examples/gallery/content/ChildWindow.qml @@ -96,7 +96,7 @@ Window { text:"Maximize" width: 98 tooltip:"Press me, to maximize this window again" - onClicked: window1.windowState = Qt.WindowMaximized; + onClicked: window1.visibility = Window.Maximized; } Button { anchors.horizontalCenter: closeText.horizontalCenter @@ -105,7 +105,7 @@ Window { text:"Normalize" width: 98 tooltip:"Press me, to normalize this window again" - onClicked: window1.windowState = Qt.WindowNoState; + onClicked: window1.visibility = Window.Windowed; } Button { anchors.horizontalCenter: closeText.horizontalCenter @@ -114,7 +114,7 @@ Window { text:"Minimize" width: 98 tooltip:"Press me, to minimize this window again" - onClicked: window1.windowState = Qt.WindowMinimized; + onClicked: window1.visibility = Window.Minimized; } } } -- cgit v1.2.1 From 5145aec470344b43669a6e1e68ccade3886d5351 Mon Sep 17 00:00:00 2001 From: Caroline Chao Date: Thu, 14 Mar 2013 11:44:48 +0100 Subject: Change imports from QtQuick 2.0 to QtQuick 2.1 Change-Id: If9df032c76e36f385aacd30cc31d6f02574c6f11 Reviewed-by: J-P Nurmi Reviewed-by: Gabriel de Dietrich --- examples/gallery/content/ChildWindow.qml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'examples/gallery/content/ChildWindow.qml') diff --git a/examples/gallery/content/ChildWindow.qml b/examples/gallery/content/ChildWindow.qml index 74b05956..c4094209 100644 --- a/examples/gallery/content/ChildWindow.qml +++ b/examples/gallery/content/ChildWindow.qml @@ -42,8 +42,8 @@ -import QtQuick 2.0 -import QtQuick.Window 2.0 +import QtQuick 2.1 +import QtQuick.Window 2.1 import QtQuick.Controls 1.0 Window { -- cgit v1.2.1