diff options
| author | Liang Qi <liang.qi@qt.io> | 2019-06-19 13:05:12 +0200 |
|---|---|---|
| committer | Liang Qi <liang.qi@qt.io> | 2019-06-19 13:05:12 +0200 |
| commit | a2d36c9ef566a3e0ec42e297a3d314f134c87da1 (patch) | |
| tree | 3cf02240bc190e0ae52c5cb1163e523635e443ab /src/quickshapes/qquickshape.cpp | |
| parent | 15b90204fa5126f339db551cf7429534f1359322 (diff) | |
| parent | e9520ec84c95e10a6826b2289e46552a2d446895 (diff) | |
Merge remote-tracking branch 'origin/5.12' into 5.13
Conflicts:
.qmake.conf
src/imports/sharedimage/qsharedimageloader.cpp
src/quick/items/qquickitemviewfxitem_p_p.h
Change-Id: I12ce7c32788f4a394188a934e689b4ebac78138b
Diffstat (limited to 'src/quickshapes/qquickshape.cpp')
| -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 } }; |