aboutsummaryrefslogtreecommitdiffstats
path: root/src/controls
diff options
context:
space:
mode:
authorMitch Curtis <mitch.curtis@theqtcompany.com>2016-04-11 11:02:17 +0200
committerMitch Curtis <mitch.curtis@theqtcompany.com>2016-04-11 11:03:11 +0000
commit92718d8abaac8584a7315b0836619c4b06335de5 (patch)
tree131eb66db4ca590deb44522ddb3b03f694223364 /src/controls
parentdcf7ae894e5d6db7f0856f556a7c1983ba1ad7e9 (diff)
Take style name into account when creating static plugin base path
Non-default plugins aren't located under qrc:/qt-project.org/imports/Qt/labs/controls, but rather a sub-directory of it. Change-Id: I9b6e21da29dd50a4aeb7b080a0f7a1d45b744be9 Reviewed-by: Andy Shaw <andy.shaw@theqtcompany.com>
Diffstat (limited to 'src/controls')
-rw-r--r--src/controls/qquickpluginutils.cpp3
1 files changed, 1 insertions, 2 deletions
diff --git a/src/controls/qquickpluginutils.cpp b/src/controls/qquickpluginutils.cpp
index d08840a9..d67912ce 100644
--- a/src/controls/qquickpluginutils.cpp
+++ b/src/controls/qquickpluginutils.cpp
@@ -47,8 +47,7 @@ QT_BEGIN_NAMESPACE
QString QQuickPluginUtils::pluginBasePath(const QQmlExtensionPlugin &plugin)
{
#ifdef QT_STATIC
- Q_UNUSED(plugin);
- return QLatin1String("qrc:/qt-project.org/imports/Qt/labs/controls");
+ return QLatin1String("qrc") + plugin.baseUrl().path();
#else
return plugin.baseUrl().toString();
#endif