From: Alan Alpert Date: Mon, 28 Nov 2011 01:49:10 +0000 (+1000) Subject: Get the tutorial running again X-Git-Url: http://git.silmor.de/gitweb/?a=commitdiff_plain;h=ea2f93567f2d37ffdf6d8462be8a21e8640a2b76;p=konrad%2Fqtdeclarative.git Get the tutorial running again Note that it still uses QtQuick 1.0 Change-Id: I1b6e174c2ec06ba6108f11cb295e32bc76ac3e36 Reviewed-by: Michael Brasser --- diff --git a/examples/tutorials/gettingStarted/gsQml/core/button.qml b/examples/tutorials/gettingStarted/gsQml/core/Button.qml similarity index 100% rename from examples/tutorials/gettingStarted/gsQml/core/button.qml rename to examples/tutorials/gettingStarted/gsQml/core/Button.qml diff --git a/examples/tutorials/gettingStarted/gsQml/core/editMenu.qml b/examples/tutorials/gettingStarted/gsQml/core/EditMenu.qml similarity index 100% rename from examples/tutorials/gettingStarted/gsQml/core/editMenu.qml rename to examples/tutorials/gettingStarted/gsQml/core/EditMenu.qml diff --git a/examples/tutorials/gettingStarted/gsQml/core/fileDialog.qml b/examples/tutorials/gettingStarted/gsQml/core/FileDialog.qml similarity index 100% rename from examples/tutorials/gettingStarted/gsQml/core/fileDialog.qml rename to examples/tutorials/gettingStarted/gsQml/core/FileDialog.qml diff --git a/examples/tutorials/gettingStarted/gsQml/core/fileMenu.qml b/examples/tutorials/gettingStarted/gsQml/core/FileMenu.qml similarity index 99% rename from examples/tutorials/gettingStarted/gsQml/core/fileMenu.qml rename to examples/tutorials/gettingStarted/gsQml/core/FileMenu.qml index e723313..e8990dc 100644 --- a/examples/tutorials/gettingStarted/gsQml/core/fileMenu.qml +++ b/examples/tutorials/gettingStarted/gsQml/core/FileMenu.qml @@ -39,6 +39,7 @@ ****************************************************************************/ import QtQuick 1.0 +import "../filedialog" 1.0 Rectangle { id: fileMenu diff --git a/examples/tutorials/gettingStarted/gsQml/core/menuBar.qml b/examples/tutorials/gettingStarted/gsQml/core/MenuBar.qml similarity index 100% rename from examples/tutorials/gettingStarted/gsQml/core/menuBar.qml rename to examples/tutorials/gettingStarted/gsQml/core/MenuBar.qml diff --git a/examples/tutorials/gettingStarted/gsQml/core/textArea.qml b/examples/tutorials/gettingStarted/gsQml/core/TextArea.qml similarity index 100% rename from examples/tutorials/gettingStarted/gsQml/core/textArea.qml rename to examples/tutorials/gettingStarted/gsQml/core/TextArea.qml diff --git a/examples/tutorials/gettingStarted/gsQml/core/qmldir b/examples/tutorials/gettingStarted/gsQml/core/qmldir index bc40d0c..da1f373 100644 --- a/examples/tutorials/gettingStarted/gsQml/core/qmldir +++ b/examples/tutorials/gettingStarted/gsQml/core/qmldir @@ -1,49 +1,7 @@ -/**************************************************************************** -** -** Copyright (C) 2011 Nokia Corporation and/or its subsidiary(-ies). -** All rights reserved. -** Contact: Nokia Corporation (qt-info@nokia.com) -** -** This file is part of the QtDeclarative module of the Qt Toolkit. -** -** $QT_BEGIN_LICENSE:BSD$ -** You may use this file under the terms of the BSD license as follows: -** -** "Redistribution and use in source and binary forms, with or without -** modification, are permitted provided that the following conditions are -** met: -** * Redistributions of source code must retain the above copyright -** notice, this list of conditions and the following disclaimer. -** * Redistributions in binary form must reproduce the above copyright -** notice, this list of conditions and the following disclaimer in -** the documentation and/or other materials provided with the -** distribution. -** * Neither the name of Nokia Corporation and its Subsidiary(-ies) nor -** the names of its contributors may be used to endorse or promote -** products derived from this software without specific prior written -** permission. -** -** THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS -** "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT -** LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR -** A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT -** OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, -** SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT -** LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, -** DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY -** THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT -** (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE -** OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE." -** $QT_END_LICENSE$ -** -****************************************************************************/ - -Button ./button.qml -FileDialog ./fileDialog.qml -TextArea ./textArea.qml -TextEditor ./textEditor.qml -EditMenu ./editMenu.qml -MenuBar ./menuBar.qml -FileMenu ./fileMenu.qml - -plugin FileDialog ../plugins +Button ./Button.qml +FileDialog ./FileDialog.qml +TextArea ./TextArea.qml +TextEditor ./TextEditor.qml +EditMenu ./EditMenu.qml +MenuBar ./MenuBar.qml +FileMenu ./FileMenu.qml diff --git a/examples/tutorials/gettingStarted/gsQml/filedialog/qmldir b/examples/tutorials/gettingStarted/gsQml/filedialog/qmldir index c2b27da..4a8d13d 100644 --- a/examples/tutorials/gettingStarted/gsQml/filedialog/qmldir +++ b/examples/tutorials/gettingStarted/gsQml/filedialog/qmldir @@ -1 +1 @@ -plugin FileDialog plugins +plugin FileDialog ../plugins diff --git a/examples/tutorials/gettingStarted/gsQml/parts/part5/core/FileMenu.qml b/examples/tutorials/gettingStarted/gsQml/parts/part5/core/FileMenu.qml index 75b27ec..edcb3da 100644 --- a/examples/tutorials/gettingStarted/gsQml/parts/part5/core/FileMenu.qml +++ b/examples/tutorials/gettingStarted/gsQml/parts/part5/core/FileMenu.qml @@ -39,6 +39,7 @@ ****************************************************************************/ import QtQuick 1.0 +import "../filedialog" 1.0 Rectangle { id: fileMenu diff --git a/examples/tutorials/gettingStarted/gsQml/parts/part5/core/qmldir b/examples/tutorials/gettingStarted/gsQml/parts/part5/core/qmldir index 3f22778..b8b0c7c 100644 --- a/examples/tutorials/gettingStarted/gsQml/parts/part5/core/qmldir +++ b/examples/tutorials/gettingStarted/gsQml/parts/part5/core/qmldir @@ -6,8 +6,6 @@ TextEditor ./TextEditor.qml EditMenu ./EditMenu.qml MenuBar ./MenuBar.qml -plugin FileDialog ../plugins - diff --git a/examples/tutorials/gettingStarted/gsQml/parts/part5/filedialog/qmldir b/examples/tutorials/gettingStarted/gsQml/parts/part5/filedialog/qmldir index c2b27da..4a8d13d 100644 --- a/examples/tutorials/gettingStarted/gsQml/parts/part5/filedialog/qmldir +++ b/examples/tutorials/gettingStarted/gsQml/parts/part5/filedialog/qmldir @@ -1 +1 @@ -plugin FileDialog plugins +plugin FileDialog ../plugins diff --git a/examples/tutorials/gettingStarted/gsQml/parts/part5/TextEditor.qml b/examples/tutorials/gettingStarted/gsQml/parts/part5/textEditor.qml similarity index 100% rename from examples/tutorials/gettingStarted/gsQml/parts/part5/TextEditor.qml rename to examples/tutorials/gettingStarted/gsQml/parts/part5/textEditor.qml