diff options
| author | Thomas Hartmann <thomas.hartmann@qt.io> | 2018-10-31 09:05:54 +0100 |
|---|---|---|
| committer | Thomas Hartmann <thomas.hartmann@qt.io> | 2018-10-31 11:10:09 +0000 |
| commit | acf316d33ecfd07279aa0dd51cd1a8ae992cc450 (patch) | |
| tree | b1e33b02191b1a9c21bafafbe29faf719e16bb83 | |
| parent | 4fb53837b67da5ee57a66e719d3112290e55ff2a (diff) | |
Fix static builds
This reverts commit 4fb53837b67da5ee57a66e719d3112290e55ff2a
and fixes the argument of the Q_INIT_RESOURCE(qmake_QtQuick_Timeline).
Change-Id: Ib8efc7c7fff39ee13089eafecefba9fd4a98f2a9
Reviewed-by: Tim Jenssen <tim.jenssen@qt.io>
| -rw-r--r-- | src/imports/timeline/qtquicktimelineplugin.cpp | 9 |
1 files changed, 9 insertions, 0 deletions
diff --git a/src/imports/timeline/qtquicktimelineplugin.cpp b/src/imports/timeline/qtquicktimelineplugin.cpp index fe50d1e..96892b3 100644 --- a/src/imports/timeline/qtquicktimelineplugin.cpp +++ b/src/imports/timeline/qtquicktimelineplugin.cpp @@ -44,6 +44,14 @@ #include "qquicktimeline_p.h" #include "qquicktimelineanimation_p.h" +static inline void initResources() +{ + Q_INIT_RESOURCE(qtquicktimelineplugin); +#ifdef QT_STATIC + Q_INIT_RESOURCE(qmake_QtQuick_Timeline); +#endif +} + QT_BEGIN_NAMESPACE class QtQuickTimelinePlugin: public QQmlExtensionPlugin @@ -59,6 +67,7 @@ public: QtQuickTimelinePlugin::QtQuickTimelinePlugin(QObject *parent) : QQmlExtensionPlugin(parent) { + initResources(); } void QtQuickTimelinePlugin::registerTypes(const char *uri) |