diff options
| author | Liang Qi <liang.qi@qt.io> | 2017-06-27 07:50:05 +0200 |
|---|---|---|
| committer | Liang Qi <liang.qi@qt.io> | 2017-06-27 07:50:05 +0200 |
| commit | 8b36cdd25761348c285305edec1bf861a924e858 (patch) | |
| tree | f4b96b64ad5d93d92ae82e7d18ad60e8d72ce236 /src/extras/plugin.cpp | |
| parent | d13e4db9d74aefc0bd08ca946b789155a11361fb (diff) | |
| parent | f19b1bf1bfee79178bf5cd75df86863be49c21f0 (diff) | |
Merge remote-tracking branch 'origin/5.9' into dev
Conflicts:
.qmake.conf
Change-Id: Ie6ad3e9490dcf85bd5deb4c6d7004a4aa8b81433
Diffstat (limited to 'src/extras/plugin.cpp')
| -rw-r--r-- | src/extras/plugin.cpp | 8 |
1 files changed, 3 insertions, 5 deletions
diff --git a/src/extras/plugin.cpp b/src/extras/plugin.cpp index a9e23321e..5133a4ac2 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 |