diff options
author | Paolo Angelelli <paolo.angelelli@qt.io> | 2018-04-10 17:33:19 +0200 |
---|---|---|
committer | Simon Hausmann <simon.hausmann@qt.io> | 2018-06-21 12:29:09 +0000 |
commit | 55db3890f44c7bef9a6ecb2b2f3bf31e288a3cd8 (patch) | |
tree | 440c030ab4d4230e10b545c0547bf911374975eb /src | |
parent | 3c14450a3e08fdaf6fb4933e354e17e4944a084f (diff) |
Move QtQuick.Shapes implementation to qtquickshapes, privately exported
This change moves the implementation of QtQuick.Shapes into an own
qt module, where classes are privately exported.
In this way Shapes QML types can be internally (= from other Qt
modules) instantiated also from cpp.
Change-Id: I428f981f0a1f3083e6571cbeaffa706fd8ef7254
Reviewed-by: Shawn Rutledge <shawn.rutledge@qt.io>
Reviewed-by: Laszlo Agocs <laszlo.agocs@qt.io>
Diffstat (limited to 'src')
-rw-r--r-- | src/imports/shapes/plugin.cpp | 9 | ||||
-rw-r--r-- | src/imports/shapes/shapes.pro | 24 | ||||
-rw-r--r-- | src/quickshapes/qquicknvprfunctions.cpp (renamed from src/imports/shapes/qquicknvprfunctions.cpp) | 0 | ||||
-rw-r--r-- | src/quickshapes/qquicknvprfunctions_p.h (renamed from src/imports/shapes/qquicknvprfunctions_p.h) | 1 | ||||
-rw-r--r-- | src/quickshapes/qquicknvprfunctions_p_p.h (renamed from src/imports/shapes/qquicknvprfunctions_p_p.h) | 3 | ||||
-rw-r--r-- | src/quickshapes/qquickshape.cpp (renamed from src/imports/shapes/qquickshape.cpp) | 13 | ||||
-rw-r--r-- | src/quickshapes/qquickshape_p.h (renamed from src/imports/shapes/qquickshape_p.h) | 15 | ||||
-rw-r--r-- | src/quickshapes/qquickshape_p_p.h (renamed from src/imports/shapes/qquickshape_p_p.h) | 5 | ||||
-rw-r--r-- | src/quickshapes/qquickshapegenericrenderer.cpp (renamed from src/imports/shapes/qquickshapegenericrenderer.cpp) | 0 | ||||
-rw-r--r-- | src/quickshapes/qquickshapegenericrenderer_p.h (renamed from src/imports/shapes/qquickshapegenericrenderer_p.h) | 3 | ||||
-rw-r--r-- | src/quickshapes/qquickshapenvprrenderer.cpp (renamed from src/imports/shapes/qquickshapenvprrenderer.cpp) | 0 | ||||
-rw-r--r-- | src/quickshapes/qquickshapenvprrenderer_p.h (renamed from src/imports/shapes/qquickshapenvprrenderer_p.h) | 5 | ||||
-rw-r--r-- | src/quickshapes/qquickshapesglobal.h | 56 | ||||
-rw-r--r-- | src/quickshapes/qquickshapesglobal_p.h | 63 | ||||
-rw-r--r-- | src/quickshapes/qquickshapesoftwarerenderer.cpp (renamed from src/imports/shapes/qquickshapesoftwarerenderer.cpp) | 0 | ||||
-rw-r--r-- | src/quickshapes/qquickshapesoftwarerenderer_p.h (renamed from src/imports/shapes/qquickshapesoftwarerenderer_p.h) | 3 | ||||
-rw-r--r-- | src/quickshapes/qtquickshapes.qrc (renamed from src/imports/shapes/qtquickshapesplugin.qrc) | 0 | ||||
-rw-r--r-- | src/quickshapes/quickshapes.pro | 33 | ||||
-rw-r--r-- | src/quickshapes/shaders/blit.frag (renamed from src/imports/shapes/shaders/blit.frag) | 0 | ||||
-rw-r--r-- | src/quickshapes/shaders/blit.vert (renamed from src/imports/shapes/shaders/blit.vert) | 0 | ||||
-rw-r--r-- | src/quickshapes/shaders/blit_core.frag (renamed from src/imports/shapes/shaders/blit_core.frag) | 0 | ||||
-rw-r--r-- | src/quickshapes/shaders/blit_core.vert (renamed from src/imports/shapes/shaders/blit_core.vert) | 0 | ||||
-rw-r--r-- | src/quickshapes/shaders/conicalgradient.frag (renamed from src/imports/shapes/shaders/conicalgradient.frag) | 0 | ||||
-rw-r--r-- | src/quickshapes/shaders/conicalgradient.vert (renamed from src/imports/shapes/shaders/conicalgradient.vert) | 0 | ||||
-rw-r--r-- | src/quickshapes/shaders/conicalgradient_core.frag (renamed from src/imports/shapes/shaders/conicalgradient_core.frag) | 0 | ||||
-rw-r--r-- | src/quickshapes/shaders/conicalgradient_core.vert (renamed from src/imports/shapes/shaders/conicalgradient_core.vert) | 0 | ||||
-rw-r--r-- | src/quickshapes/shaders/lineargradient.frag (renamed from src/imports/shapes/shaders/lineargradient.frag) | 0 | ||||
-rw-r--r-- | src/quickshapes/shaders/lineargradient.vert (renamed from src/imports/shapes/shaders/lineargradient.vert) | 0 | ||||
-rw-r--r-- | src/quickshapes/shaders/lineargradient_core.frag (renamed from src/imports/shapes/shaders/lineargradient_core.frag) | 0 | ||||
-rw-r--r-- | src/quickshapes/shaders/lineargradient_core.vert (renamed from src/imports/shapes/shaders/lineargradient_core.vert) | 0 | ||||
-rw-r--r-- | src/quickshapes/shaders/radialgradient.frag (renamed from src/imports/shapes/shaders/radialgradient.frag) | 0 | ||||
-rw-r--r-- | src/quickshapes/shaders/radialgradient.vert (renamed from src/imports/shapes/shaders/radialgradient.vert) | 0 | ||||
-rw-r--r-- | src/quickshapes/shaders/radialgradient_core.frag (renamed from src/imports/shapes/shaders/radialgradient_core.frag) | 0 | ||||
-rw-r--r-- | src/quickshapes/shaders/radialgradient_core.vert (renamed from src/imports/shapes/shaders/radialgradient_core.vert) | 0 | ||||
-rw-r--r-- | src/src.pro | 5 |
35 files changed, 197 insertions, 41 deletions
diff --git a/src/imports/shapes/plugin.cpp b/src/imports/shapes/plugin.cpp index f2635d2995..e3a9017681 100644 --- a/src/imports/shapes/plugin.cpp +++ b/src/imports/shapes/plugin.cpp @@ -39,8 +39,7 @@ #include <QtQml/qqmlextensionplugin.h> #include <QtQml/qqml.h> - -#include "qquickshape_p.h" +#include <QtQuickShapes/private/qquickshape_p.h> QT_BEGIN_NAMESPACE @@ -50,7 +49,11 @@ class QmlShapesPlugin : public QQmlExtensionPlugin Q_PLUGIN_METADATA(IID QQmlExtensionInterface_iid) public: - QmlShapesPlugin(QObject *parent = nullptr) : QQmlExtensionPlugin(parent) { } + QmlShapesPlugin(QObject *parent = nullptr) + : QQmlExtensionPlugin(parent) + { + } + void registerTypes(const char *uri) override { Q_ASSERT(QByteArray(uri) == QByteArray("QtQuick.Shapes")); diff --git a/src/imports/shapes/shapes.pro b/src/imports/shapes/shapes.pro index 4d6e9508af..71bb456866 100644 --- a/src/imports/shapes/shapes.pro +++ b/src/imports/shapes/shapes.pro @@ -3,31 +3,9 @@ TARGET = qmlshapesplugin TARGETPATH = QtQuick/Shapes IMPORT_VERSION = 1.11 -QT = core gui-private qml quick-private - -HEADERS += \ - qquickshape_p.h \ - qquickshape_p_p.h \ - qquickshapegenericrenderer_p.h \ - qquickshapesoftwarerenderer_p.h +QT = core gui-private qml quick-private quickshapes-private SOURCES += \ plugin.cpp \ - qquickshape.cpp \ - qquickshapegenericrenderer.cpp \ - qquickshapesoftwarerenderer.cpp - -qtConfig(opengl) { - HEADERS += \ - qquicknvprfunctions_p.h \ - qquicknvprfunctions_p_p.h \ - qquickshapenvprrenderer_p.h - - SOURCES += \ - qquicknvprfunctions.cpp \ - qquickshapenvprrenderer.cpp -} - -RESOURCES += qtquickshapesplugin.qrc load(qml_plugin) diff --git a/src/imports/shapes/qquicknvprfunctions.cpp b/src/quickshapes/qquicknvprfunctions.cpp index 409a59be7f..409a59be7f 100644 --- a/src/imports/shapes/qquicknvprfunctions.cpp +++ b/src/quickshapes/qquicknvprfunctions.cpp diff --git a/src/imports/shapes/qquicknvprfunctions_p.h b/src/quickshapes/qquicknvprfunctions_p.h index 342e92cbc3..92246cf4c8 100644 --- a/src/imports/shapes/qquicknvprfunctions_p.h +++ b/src/quickshapes/qquicknvprfunctions_p.h @@ -51,6 +51,7 @@ // We mean it. // +#include <QtQuickShapes/private/qquickshapesglobal_p.h> #include <qopengl.h> #include <QtGui/qsurfaceformat.h> diff --git a/src/imports/shapes/qquicknvprfunctions_p_p.h b/src/quickshapes/qquicknvprfunctions_p_p.h index 6df20566af..3d9ca0de9f 100644 --- a/src/imports/shapes/qquicknvprfunctions_p_p.h +++ b/src/quickshapes/qquicknvprfunctions_p_p.h @@ -51,7 +51,8 @@ // We mean it. // -#include "qquicknvprfunctions_p.h" +#include <QtQuickShapes/private/qquickshapesglobal_p.h> +#include <QtQuickShapes/private/qquicknvprfunctions_p.h> QT_BEGIN_NAMESPACE diff --git a/src/imports/shapes/qquickshape.cpp b/src/quickshapes/qquickshape.cpp index 067a54736f..edfa308c4d 100644 --- a/src/imports/shapes/qquickshape.cpp +++ b/src/quickshapes/qquickshape.cpp @@ -658,9 +658,22 @@ void QQuickShapePrivate::setStatus(QQuickShape::Status newStatus) } } +struct QQuickShapeResourceInitializer +{ + QQuickShapeResourceInitializer() + { +#if defined(QT_STATIC) + Q_INIT_RESOURCE(qtquickshapes); +#endif + } +}; + +Q_GLOBAL_STATIC(QQuickShapeResourceInitializer, initQQuickShapeResources) + QQuickShape::QQuickShape(QQuickItem *parent) : QQuickItem(*(new QQuickShapePrivate), parent) { + initQQuickShapeResources(); setFlag(ItemHasContents); } diff --git a/src/imports/shapes/qquickshape_p.h b/src/quickshapes/qquickshape_p.h index 1dfeaf9228..cd242cafc3 100644 --- a/src/imports/shapes/qquickshape_p.h +++ b/src/quickshapes/qquickshape_p.h @@ -51,7 +51,8 @@ // We mean it. // -#include "qquickitem.h" +#include <QtQuickShapes/private/qquickshapesglobal_p.h> +#include <QtQuick/qquickitem.h> #include <private/qtquickglobal_p.h> #include <private/qquickpath_p_p.h> @@ -62,7 +63,7 @@ QT_BEGIN_NAMESPACE class QQuickShapePathPrivate; class QQuickShapePrivate; -class QQuickShapeGradient : public QQuickGradient +class Q_QUICKSHAPES_PRIVATE_EXPORT QQuickShapeGradient : public QQuickGradient { Q_OBJECT Q_PROPERTY(SpreadMode spread READ spread WRITE setSpread NOTIFY spreadChanged) @@ -88,7 +89,7 @@ private: SpreadMode m_spread; }; -class QQuickShapeLinearGradient : public QQuickShapeGradient +class Q_QUICKSHAPES_PRIVATE_EXPORT QQuickShapeLinearGradient : public QQuickShapeGradient { Q_OBJECT Q_PROPERTY(qreal x1 READ x1 WRITE setX1 NOTIFY x1Changed) @@ -120,7 +121,7 @@ private: QPointF m_end; }; -class QQuickShapeRadialGradient : public QQuickShapeGradient +class Q_QUICKSHAPES_PRIVATE_EXPORT QQuickShapeRadialGradient : public QQuickShapeGradient { Q_OBJECT Q_PROPERTY(qreal centerX READ centerX WRITE setCenterX NOTIFY centerXChanged) @@ -167,7 +168,7 @@ private: qreal m_focalRadius = 0; }; -class QQuickShapeConicalGradient : public QQuickShapeGradient +class Q_QUICKSHAPES_PRIVATE_EXPORT QQuickShapeConicalGradient : public QQuickShapeGradient { Q_OBJECT Q_PROPERTY(qreal centerX READ centerX WRITE setCenterX NOTIFY centerXChanged) @@ -197,7 +198,7 @@ private: qreal m_angle = 0; }; -class QQuickShapePath : public QQuickPath +class Q_QUICKSHAPES_PRIVATE_EXPORT QQuickShapePath : public QQuickPath { Q_OBJECT @@ -296,7 +297,7 @@ private: Q_PRIVATE_SLOT(d_func(), void _q_fillGradientChanged()) }; -class QQuickShape : public QQuickItem +class Q_QUICKSHAPES_PRIVATE_EXPORT QQuickShape : public QQuickItem { Q_OBJECT Q_PROPERTY(RendererType rendererType READ rendererType NOTIFY rendererChanged) diff --git a/src/imports/shapes/qquickshape_p_p.h b/src/quickshapes/qquickshape_p_p.h index ef2775885e..bf4a47f62c 100644 --- a/src/imports/shapes/qquickshape_p_p.h +++ b/src/quickshapes/qquickshape_p_p.h @@ -51,7 +51,8 @@ // We mean it. // -#include "qquickshape_p.h" +#include <QtQuickShapes/private/qquickshapesglobal_p.h> +#include <QtQuickShapes/private/qquickshape_p.h> #include <QtQuick/private/qquickitem_p.h> #include <QPainterPath> #include <QColor> @@ -122,7 +123,7 @@ struct QQuickShapeStrokeFillParams QQuickShapeGradient *fillGradient; }; -class QQuickShapePathPrivate : public QQuickPathPrivate +class Q_QUICKSHAPES_PRIVATE_EXPORT QQuickShapePathPrivate : public QQuickPathPrivate { Q_DECLARE_PUBLIC(QQuickShapePath) diff --git a/src/imports/shapes/qquickshapegenericrenderer.cpp b/src/quickshapes/qquickshapegenericrenderer.cpp index 8a4785a83a..8a4785a83a 100644 --- a/src/imports/shapes/qquickshapegenericrenderer.cpp +++ b/src/quickshapes/qquickshapegenericrenderer.cpp diff --git a/src/imports/shapes/qquickshapegenericrenderer_p.h b/src/quickshapes/qquickshapegenericrenderer_p.h index 11070ae7dc..9928d7ab72 100644 --- a/src/imports/shapes/qquickshapegenericrenderer_p.h +++ b/src/quickshapes/qquickshapegenericrenderer_p.h @@ -51,7 +51,8 @@ // We mean it. // -#include "qquickshape_p_p.h" +#include <QtQuickShapes/private/qquickshapesglobal_p.h> +#include <QtQuickShapes/private/qquickshape_p_p.h> #include <qsgnode.h> #include <qsggeometry.h> #include <qsgmaterial.h> diff --git a/src/imports/shapes/qquickshapenvprrenderer.cpp b/src/quickshapes/qquickshapenvprrenderer.cpp index 51af0d8961..51af0d8961 100644 --- a/src/imports/shapes/qquickshapenvprrenderer.cpp +++ b/src/quickshapes/qquickshapenvprrenderer.cpp diff --git a/src/imports/shapes/qquickshapenvprrenderer_p.h b/src/quickshapes/qquickshapenvprrenderer_p.h index f6c9fc169e..d40eb1bce9 100644 --- a/src/imports/shapes/qquickshapenvprrenderer_p.h +++ b/src/quickshapes/qquickshapenvprrenderer_p.h @@ -51,8 +51,9 @@ // We mean it. // -#include "qquickshape_p_p.h" -#include "qquicknvprfunctions_p.h" +#include <QtQuickShapes/private/qquickshapesglobal_p.h> +#include <QtQuickShapes/private/qquickshape_p_p.h> +#include <QtQuickShapes/private/qquicknvprfunctions_p.h> #include <qsgrendernode.h> #include <QColor> #include <QVector4D> diff --git a/src/quickshapes/qquickshapesglobal.h b/src/quickshapes/qquickshapesglobal.h new file mode 100644 index 0000000000..eb279c5d14 --- /dev/null +++ b/src/quickshapes/qquickshapesglobal.h @@ -0,0 +1,56 @@ +/**************************************************************************** +** +** Copyright (C) 2018 The Qt Company Ltd. +** Contact: http://www.qt.io/licensing/ +** +** This file is part of the QtQuick module of the Qt Toolkit. +** +** $QT_BEGIN_LICENSE:LGPL3$ +** 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 The Qt Company. For licensing terms +** and conditions see http://www.qt.io/terms-conditions. For further +** information use the contact form at http://www.qt.io/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$ +** +****************************************************************************/ +#ifndef QQUICKSHAPESGLOBAL_H +#define QQUICKSHAPESGLOBAL_H + +#include <QtCore/qglobal.h> + +QT_BEGIN_NAMESPACE + +#ifndef QT_STATIC +# if defined(QT_BUILD_QUICKSHAPES_LIB) +# define Q_QUICKSHAPES_EXPORT Q_DECL_EXPORT +# else +# define Q_QUICKSHAPES_EXPORT Q_DECL_IMPORT +# endif +#else +# define Q_QUICKSHAPES_EXPORT +#endif + +QT_END_NAMESPACE + +#endif // QQUICKSHAPESGLOBAL_H + diff --git a/src/quickshapes/qquickshapesglobal_p.h b/src/quickshapes/qquickshapesglobal_p.h new file mode 100644 index 0000000000..2f559b45a0 --- /dev/null +++ b/src/quickshapes/qquickshapesglobal_p.h @@ -0,0 +1,63 @@ +/**************************************************************************** +** +** Copyright (C) 2018 The Qt Company Ltd. +** Contact: https://www.qt.io/licensing/ +** +** This file is part of the QtQuick 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 The Qt Company. For licensing terms +** and conditions see https://www.qt.io/terms-conditions. For further +** information use the contact form at https://www.qt.io/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.LGPL3 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-3.0.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 (at your option) the GNU General +** Public license version 3 or any later version approved by the KDE Free +** Qt Foundation. The licenses are as published by the Free Software +** Foundation and appearing in the file LICENSE.GPL2 and LICENSE.GPL3 +** included in the packaging of this file. Please review the following +** information to ensure the GNU General Public License requirements will +** be met: https://www.gnu.org/licenses/gpl-2.0.html and +** https://www.gnu.org/licenses/gpl-3.0.html. +** +** $QT_END_LICENSE$ +** +****************************************************************************/ + +#ifndef QQUICKSHAPESGLOBAL_P_H +#define QQUICKSHAPESGLOBAL_P_H + +// +// W A R N I N G +// ------------- +// +// This file is not part of the Qt API. It exists purely as an +// implementation detail. This header file may change from version to +// version without notice, or even be removed. +// +// We mean it. +// + +#include "qquickshapesglobal.h" + +QT_BEGIN_NAMESPACE + +#define Q_QUICKSHAPES_PRIVATE_EXPORT Q_QUICKSHAPES_EXPORT + +QT_END_NAMESPACE + + +#endif // QQUICKSHAPESGLOBAL_P_H diff --git a/src/imports/shapes/qquickshapesoftwarerenderer.cpp b/src/quickshapes/qquickshapesoftwarerenderer.cpp index 0f5c3604b5..0f5c3604b5 100644 --- a/src/imports/shapes/qquickshapesoftwarerenderer.cpp +++ b/src/quickshapes/qquickshapesoftwarerenderer.cpp diff --git a/src/imports/shapes/qquickshapesoftwarerenderer_p.h b/src/quickshapes/qquickshapesoftwarerenderer_p.h index 0abc2e37b0..11e658b4b7 100644 --- a/src/imports/shapes/qquickshapesoftwarerenderer_p.h +++ b/src/quickshapes/qquickshapesoftwarerenderer_p.h @@ -51,7 +51,8 @@ // We mean it. // -#include "qquickshape_p_p.h" +#include <QtQuickShapes/private/qquickshapesglobal_p.h> +#include <QtQuickShapes/private/qquickshape_p_p.h> #include <qsgrendernode.h> #include <QPen> #include <QBrush> diff --git a/src/imports/shapes/qtquickshapesplugin.qrc b/src/quickshapes/qtquickshapes.qrc index f139861693..f139861693 100644 --- a/src/imports/shapes/qtquickshapesplugin.qrc +++ b/src/quickshapes/qtquickshapes.qrc diff --git a/src/quickshapes/quickshapes.pro b/src/quickshapes/quickshapes.pro new file mode 100644 index 0000000000..5a59dec18e --- /dev/null +++ b/src/quickshapes/quickshapes.pro @@ -0,0 +1,33 @@ +TARGET = QtQuickShapes + +QT = core gui-private qml quick-private + +CONFIG += simd optimize_full internal_module + +HEADERS += \ + qquickshapesglobal.h \ + qquickshapesglobal_p.h \ + qquickshape_p.h \ + qquickshape_p_p.h \ + qquickshapegenericrenderer_p.h \ + qquickshapesoftwarerenderer_p.h + +SOURCES += \ + qquickshape.cpp \ + qquickshapegenericrenderer.cpp \ + qquickshapesoftwarerenderer.cpp + +qtConfig(opengl) { + HEADERS += \ + qquicknvprfunctions_p.h \ + qquicknvprfunctions_p_p.h \ + qquickshapenvprrenderer_p.h + + SOURCES += \ + qquicknvprfunctions.cpp \ + qquickshapenvprrenderer.cpp +} + +RESOURCES += qtquickshapes.qrc + +load(qt_module) diff --git a/src/imports/shapes/shaders/blit.frag b/src/quickshapes/shaders/blit.frag index 505f0db179..505f0db179 100644 --- a/src/imports/shapes/shaders/blit.frag +++ b/src/quickshapes/shaders/blit.frag diff --git a/src/imports/shapes/shaders/blit.vert b/src/quickshapes/shaders/blit.vert index f8306bd945..f8306bd945 100644 --- a/src/imports/shapes/shaders/blit.vert +++ b/src/quickshapes/shaders/blit.vert diff --git a/src/imports/shapes/shaders/blit_core.frag b/src/quickshapes/shaders/blit_core.frag index 7073808fba..7073808fba 100644 --- a/src/imports/shapes/shaders/blit_core.frag +++ b/src/quickshapes/shaders/blit_core.frag diff --git a/src/imports/shapes/shaders/blit_core.vert b/src/quickshapes/shaders/blit_core.vert index 5246441da3..5246441da3 100644 --- a/src/imports/shapes/shaders/blit_core.vert +++ b/src/quickshapes/shaders/blit_core.vert diff --git a/src/imports/shapes/shaders/conicalgradient.frag b/src/quickshapes/shaders/conicalgradient.frag index af5fdd5ee0..af5fdd5ee0 100644 --- a/src/imports/shapes/shaders/conicalgradient.frag +++ b/src/quickshapes/shaders/conicalgradient.frag diff --git a/src/imports/shapes/shaders/conicalgradient.vert b/src/quickshapes/shaders/conicalgradient.vert index 3350b0675a..3350b0675a 100644 --- a/src/imports/shapes/shaders/conicalgradient.vert +++ b/src/quickshapes/shaders/conicalgradient.vert diff --git a/src/imports/shapes/shaders/conicalgradient_core.frag b/src/quickshapes/shaders/conicalgradient_core.frag index e18b80159a..e18b80159a 100644 --- a/src/imports/shapes/shaders/conicalgradient_core.frag +++ b/src/quickshapes/shaders/conicalgradient_core.frag diff --git a/src/imports/shapes/shaders/conicalgradient_core.vert b/src/quickshapes/shaders/conicalgradient_core.vert index f94a56401b..f94a56401b 100644 --- a/src/imports/shapes/shaders/conicalgradient_core.vert +++ b/src/quickshapes/shaders/conicalgradient_core.vert diff --git a/src/imports/shapes/shaders/lineargradient.frag b/src/quickshapes/shaders/lineargradient.frag index 7f4a739109..7f4a739109 100644 --- a/src/imports/shapes/shaders/lineargradient.frag +++ b/src/quickshapes/shaders/lineargradient.frag diff --git a/src/imports/shapes/shaders/lineargradient.vert b/src/quickshapes/shaders/lineargradient.vert index eb21b8886b..eb21b8886b 100644 --- a/src/imports/shapes/shaders/lineargradient.vert +++ b/src/quickshapes/shaders/lineargradient.vert diff --git a/src/imports/shapes/shaders/lineargradient_core.frag b/src/quickshapes/shaders/lineargradient_core.frag index 5908acfa67..5908acfa67 100644 --- a/src/imports/shapes/shaders/lineargradient_core.frag +++ b/src/quickshapes/shaders/lineargradient_core.frag diff --git a/src/imports/shapes/shaders/lineargradient_core.vert b/src/quickshapes/shaders/lineargradient_core.vert index 60b56f38e3..60b56f38e3 100644 --- a/src/imports/shapes/shaders/lineargradient_core.vert +++ b/src/quickshapes/shaders/lineargradient_core.vert diff --git a/src/imports/shapes/shaders/radialgradient.frag b/src/quickshapes/shaders/radialgradient.frag index 0f503bc0f7..0f503bc0f7 100644 --- a/src/imports/shapes/shaders/radialgradient.frag +++ b/src/quickshapes/shaders/radialgradient.frag diff --git a/src/imports/shapes/shaders/radialgradient.vert b/src/quickshapes/shaders/radialgradient.vert index 3350b0675a..3350b0675a 100644 --- a/src/imports/shapes/shaders/radialgradient.vert +++ b/src/quickshapes/shaders/radialgradient.vert diff --git a/src/imports/shapes/shaders/radialgradient_core.frag b/src/quickshapes/shaders/radialgradient_core.frag index 706ce53e4d..706ce53e4d 100644 --- a/src/imports/shapes/shaders/radialgradient_core.frag +++ b/src/quickshapes/shaders/radialgradient_core.frag diff --git a/src/imports/shapes/shaders/radialgradient_core.vert b/src/quickshapes/shaders/radialgradient_core.vert index f94a56401b..f94a56401b 100644 --- a/src/imports/shapes/shaders/radialgradient_core.vert +++ b/src/quickshapes/shaders/radialgradient_core.vert diff --git a/src/src.pro b/src/src.pro index 39127d7e10..92d79a9825 100644 --- a/src/src.pro +++ b/src/src.pro @@ -8,7 +8,8 @@ SUBDIRS += \ qtConfig(qml-animation) { SUBDIRS += \ - quick + quick \ + quickshapes qtConfig(testlib): \ SUBDIRS += qmltest @@ -30,3 +31,5 @@ qtConfig(qml-network) { QT_FOR_CONFIG += network qtConfig(localserver):qtConfig(qml-debug): SUBDIRS += qmldebug } + +DISTFILES += sync.profile configure.json |