summaryrefslogtreecommitdiff
path: root/src/extras/plugin.cpp
diff options
context:
space:
mode:
Diffstat (limited to 'src/extras/plugin.cpp')
-rw-r--r--src/extras/plugin.cpp8
1 files changed, 3 insertions, 5 deletions
diff --git a/src/extras/plugin.cpp b/src/extras/plugin.cpp
index a9e23321..5133a4ac 100644
--- a/src/extras/plugin.cpp
+++ b/src/extras/plugin.cpp
@@ -50,9 +50,7 @@
static void initResources()
{
-#ifndef QT_STATIC
- Q_INIT_RESOURCE(extras);
-#else
+#ifdef QT_STATIC
Q_INIT_RESOURCE(qmake_QtQuick_Extras);
#endif
}
@@ -75,7 +73,7 @@ QtQuickExtrasPlugin::QtQuickExtrasPlugin(QObject *parent) :
void QtQuickExtrasPlugin::registerTypes(const char *uri)
{
#ifndef QT_STATIC
- const QString prefix = "qrc:///ExtrasImports/QtQuick/Extras";
+ const QString prefix = baseUrl().toString();
#else
const QString prefix = "qrc:/qt-project.org/imports/QtQuick/Extras";
#endif
@@ -113,7 +111,7 @@ void QtQuickExtrasPlugin::initializeEngine(QQmlEngine *engine, const char *uri)
qmlRegisterSingletonType<QQuickMathUtils>("QtQuick.Extras.Private.CppUtils", 1, 0, "MathUtils", registerMathUtilsSingleton);
#ifndef QT_STATIC
- const QString prefix = "qrc:///ExtrasImports/QtQuick/Extras";
+ const QString prefix = baseUrl().toString();
#else
const QString prefix = "qrc:/qt-project.org/imports/QtQuick/Extras";
#endif