diff --git a/src/designer/default/Canvas3D.qml b/src/designer/default/Canvas3D.qml new file mode 100644 index 0000000000000000000000000000000000000000..cf361728cdb90d2a8451aabac284c04401966744 --- /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 0000000000000000000000000000000000000000..693d65ea83fcd8f2216ffb2135bb8e7e196b421c --- /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 Binary files /dev/null and b/src/designer/images/canvas3d-icon.png differ diff --git a/src/designer/images/canvas3d-icon16.png b/src/designer/images/canvas3d-icon16.png new file mode 100644 index 0000000000000000000000000000000000000000..29b11757e7eb0853693f1b394ebb4f772c4e9fe6 Binary files /dev/null and b/src/designer/images/canvas3d-icon16.png differ diff --git a/src/designer/qtcanvas3d.metainfo b/src/designer/qtcanvas3d.metainfo new file mode 100644 index 0000000000000000000000000000000000000000..f628f870e7ba2faa1be5a62c05de9b9797a4e962 --- /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 33a86d70839cfd643a50b633a22b6bd7c0b16e97..1ad338952b2c1da1df9b54659f98e2504109f1fd 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