diff options
| author | Laszlo Agocs <laszlo.agocs@qt.io> | 2017-12-14 11:15:12 +0100 |
|---|---|---|
| committer | Laszlo Agocs <laszlo.agocs@qt.io> | 2017-12-14 12:23:23 +0000 |
| commit | 50692eb148f9fca8befa14adc0b942a782a1d767 (patch) | |
| tree | 870cc87144a349a617c8d4198a0afe19a367c95c /src/imports | |
| parent | 735b588e64d29c5336402c8e1d43f77e8b2cbe31 (diff) | |
Rename Shapes plugin's qrc to something more unique
shapes.qrc conflicted with the shapes example's shapes.qrc. The Q_INIT_RESOURCE
was probably calling the example's initResource, leading to not finding the
plugin's files in the resource system at runtime in static builds.
Task-number: QTBUG-65173
Change-Id: Ic9187c818119b1984c3748bb032d98b3716733a9
Reviewed-by: Shawn Rutledge <shawn.rutledge@qt.io>
Diffstat (limited to 'src/imports')
| -rw-r--r-- | src/imports/shapes/plugin.cpp | 2 | ||||
| -rw-r--r-- | src/imports/shapes/qtquickshapesplugin.qrc (renamed from src/imports/shapes/shapes.qrc) | 0 | ||||
| -rw-r--r-- | src/imports/shapes/shapes.pro | 2 |
3 files changed, 2 insertions, 2 deletions
diff --git a/src/imports/shapes/plugin.cpp b/src/imports/shapes/plugin.cpp index 239ef78e55..545cfda0e4 100644 --- a/src/imports/shapes/plugin.cpp +++ b/src/imports/shapes/plugin.cpp @@ -47,7 +47,7 @@ static void initResources() #ifdef QT_STATIC Q_INIT_RESOURCE(qmake_QtQuick_Shapes); #endif - Q_INIT_RESOURCE(shapes); + Q_INIT_RESOURCE(qtquickshapesplugin); } QT_BEGIN_NAMESPACE diff --git a/src/imports/shapes/shapes.qrc b/src/imports/shapes/qtquickshapesplugin.qrc index f139861693..f139861693 100644 --- a/src/imports/shapes/shapes.qrc +++ b/src/imports/shapes/qtquickshapesplugin.qrc diff --git a/src/imports/shapes/shapes.pro b/src/imports/shapes/shapes.pro index 4406474c3f..99bad8ba6e 100644 --- a/src/imports/shapes/shapes.pro +++ b/src/imports/shapes/shapes.pro @@ -28,6 +28,6 @@ qtConfig(opengl) { qquickshapenvprrenderer.cpp } -RESOURCES += shapes.qrc +RESOURCES += qtquickshapesplugin.qrc load(qml_plugin) |