From 7ca0f93d630f05a7bcce491bed053635c870c2cd Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Tomi=20Korpip=C3=A4=C3=A4?= <tomi.korpipaa@digia.com>
Date: Thu, 16 Oct 2014 08:38:03 +0300
Subject: [PATCH] Designer plugin added
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
Images are just placeholders for now. Actual ones will be added at some
point.
Change-Id: Iae78d1437f2e900c72091c48b77b0b2437e36452
Reviewed-by: Pasi Keränen <pasi.keranen@digia.com>
---
src/designer/default/Canvas3D.qml | 47 ++++++++++++++++++++++++
src/designer/designer.pri | 10 +++++
src/designer/images/canvas3d-icon.png | Bin 0 -> 112 bytes
src/designer/images/canvas3d-icon16.png | Bin 0 -> 103 bytes
src/designer/qtcanvas3d.metainfo | 16 ++++++++
src/src.pro | 6 ++-
6 files changed, 78 insertions(+), 1 deletion(-)
create mode 100644 src/designer/default/Canvas3D.qml
create mode 100644 src/designer/designer.pri
create mode 100644 src/designer/images/canvas3d-icon.png
create mode 100644 src/designer/images/canvas3d-icon16.png
create mode 100644 src/designer/qtcanvas3d.metainfo
diff --git a/src/designer/default/Canvas3D.qml b/src/designer/default/Canvas3D.qml
new file mode 100644
index 0000000..cf36172
--- /dev/null
+++ b/src/designer/default/Canvas3D.qml
@@ -0,0 +1,47 @@
+/****************************************************************************
+**
+** Copyright (C) 2014 Digia Plc and/or its subsidiary(-ies).
+** Contact: http://www.qt-project.org/legal
+**
+** This file is part of the QtCanvas3D module of the Qt Toolkit.
+**
+** $QT_BEGIN_LICENSE:LGPL$
+** Commercial License Usage
+** Licensees holding valid commercial Qt licenses may use this file in
+** accordance with the commercial license agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Digia. For licensing terms and
+** conditions see http://qt.digia.com/licensing. For further information
+** use the contact form at http://qt.digia.com/contact-us.
+**
+** GNU Lesser General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU Lesser
+** General Public License version 3 as published by the Free Software
+** Foundation and appearing in the file LICENSE.LGPLv3 included in the
+** packaging of this file. Please review the following information to
+** ensure the GNU Lesser General Public License version 3 requirements
+** will be met: https://www.gnu.org/licenses/lgpl.html.
+**
+** GNU General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU
+** General Public License version 2.0 or later as published by the Free
+** Software Foundation and appearing in the file LICENSE.GPL included in
+** the packaging of this file. Please review the following information to
+** ensure the GNU General Public License version 2.0 requirements will be
+** met: http://www.gnu.org/licenses/gpl-2.0.html.
+**
+** $QT_END_LICENSE$
+**
+****************************************************************************/
+
+import QtQuick 2.0
+import QtCanvas3D 1.0
+
+Canvas3D {
+ id: canvas3d
+ anchors.fill: parent
+ logAllCalls: false
+ logAllErrors: false
+ imageLoader: TextureImageLoader {
+ }
+}
diff --git a/src/designer/designer.pri b/src/designer/designer.pri
new file mode 100644
index 0000000..693d65e
--- /dev/null
+++ b/src/designer/designer.pri
@@ -0,0 +1,10 @@
+QML_FILES += \
+ $$PWD/default/Canvas3D.qml
+
+QML_FILES += $$PWD/qtcanvas3d.metainfo
+
+# Images
+QML_FILES += \
+ $$PWD/images/canvas3d-icon.png \
+ $$PWD/images/canvas3d-icon16.png
+
diff --git a/src/designer/images/canvas3d-icon.png b/src/designer/images/canvas3d-icon.png
new file mode 100644
index 0000000000000000000000000000000000000000..4b3401efdde0d707dcb216a12c69d4f17bfbc12e
GIT binary patch
literal 112
zcmeAS@N?(olHy`uVBq!ia0vp^5+KaM1SIoCSFHz9oCO|{#S9F5M?jcysy3fAP*BO!
z#WAE}PO?qG0|sVO2H{X2Nz;rg3j&+nc%^_0g)X3h9ZUtPdnfGys%G$X^>bP0l+XkK
D$X6Ni
literal 0
HcmV?d00001
diff --git a/src/designer/images/canvas3d-icon16.png b/src/designer/images/canvas3d-icon16.png
new file mode 100644
index 0000000000000000000000000000000000000000..29b11757e7eb0853693f1b394ebb4f772c4e9fe6
GIT binary patch
literal 103
zcmeAS@N?(olHy`uVBq!ia0vp^0wB!61SBU+%rFB|oCO|{#S9F5M?jcysy3fAP*Bp-
w#WAE}PO?qG0|sWzhEA2Mi>2I5c{F($gnu$6#Lumg2P$IlboFyt=akR{0OGM0y#N3J
literal 0
HcmV?d00001
diff --git a/src/designer/qtcanvas3d.metainfo b/src/designer/qtcanvas3d.metainfo
new file mode 100644
index 0000000..f628f87
--- /dev/null
+++ b/src/designer/qtcanvas3d.metainfo
@@ -0,0 +1,16 @@
+MetaInfo {
+ Type {
+ name: "QtCanvas3D.Canvas3D"
+ icon: "images/canvas3d-icon16.png"
+
+ ItemLibraryEntry {
+ name: "Canvas3D"
+ category: "Qt Canvas 3D"
+ libraryIcon: "images/canvas3d-icon.png"
+ version: "1.0"
+ requiredImport: "QtCanvas3D"
+
+ QmlSource { source: "default/Canvas3D.qml" }
+ }
+ }
+}
diff --git a/src/src.pro b/src/src.pro
index 33a86d7..1ad3389 100644
--- a/src/src.pro
+++ b/src/src.pro
@@ -10,6 +10,8 @@ IMPORT_VERSION = $$MODULE_VERSION
# Only build qml plugin static if Qt itself is also built static
!contains(QT_CONFIG, static): CONFIG -= static staticlib
+include($$PWD/designer/designer.pri)
+
QMAKE_DOCS = $$PWD/doc/qtcanvas3d.qdocconf
SOURCES += qcanvas3d_plugin.cpp \
@@ -86,7 +88,9 @@ OTHER_FILES = qmldir \
doc/src/* \
doc/images/* \
doc/snippets/* \
- plugins.qmltypes
+ plugins.qmltypes \
+ designer/* \
+ designer/default/*
CONFIG += no_cxx_module
--
GitLab