diff options
| author | Qt Forward Merge Bot <qt_forward_merge_bot@qt-project.org> | 2019-06-20 01:00:05 +0200 |
|---|---|---|
| committer | Qt Forward Merge Bot <qt_forward_merge_bot@qt-project.org> | 2019-06-20 01:00:05 +0200 |
| commit | 4050d0eddd33c9a77d4ffe285e137280ec5dd5fe (patch) | |
| tree | 11580451e6478254d0c38a41f6670ea40c7a68a7 /src/quickshapes | |
| parent | 8068e7b98cde09565efe27585b84e120f9c5ea99 (diff) | |
| parent | af0d8632d8895373287bdf8f917272a0fa1820e0 (diff) | |
Merge remote-tracking branch 'origin/5.13' into dev
Change-Id: I71b1212085da85f03f4ff0e3ee5cb56a401998ae
Diffstat (limited to 'src/quickshapes')
| -rw-r--r-- | src/quickshapes/qquickshape.cpp | 9 |
1 files changed, 8 insertions, 1 deletions
diff --git a/src/quickshapes/qquickshape.cpp b/src/quickshapes/qquickshape.cpp index 262d0b3e9a..74cbf52a95 100644 --- a/src/quickshapes/qquickshape.cpp +++ b/src/quickshapes/qquickshape.cpp @@ -48,6 +48,13 @@ #include <QOpenGLFunctions> #include <QLoggingCategory> +#if defined(QT_STATIC) +static void initResources() +{ + Q_INIT_RESOURCE(qtquickshapes); +} +#endif + QT_BEGIN_NAMESPACE Q_LOGGING_CATEGORY(QQSHAPE_LOG_TIME_DIRTY_SYNC, "qt.shape.time.sync") @@ -662,7 +669,7 @@ struct QQuickShapeResourceInitializer QQuickShapeResourceInitializer() { #if defined(QT_STATIC) - Q_INIT_RESOURCE(qtquickshapes); + initResources(); #endif } }; |