From 92718d8abaac8584a7315b0836619c4b06335de5 Mon Sep 17 00:00:00 2001
From: Mitch Curtis <mitch.curtis@theqtcompany.com>
Date: Mon, 11 Apr 2016 11:02:17 +0200
Subject: 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>
---
 src/controls/qquickpluginutils.cpp | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

(limited to 'src')

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
-- 
cgit v1.2.3