From da9183da38513d5531af3753d14d040991e04132 Mon Sep 17 00:00:00 2001
From: Simon Hausmann <simon.hausmann@qt.io>
Date: Mon, 3 Apr 2017 11:41:33 +0200
Subject: Remove qrc based default qml distribution for QQC extras

This is consistent with the other modules and prepares for the use of
qml caching.

Change-Id: Ifab9187ac60a52d0464c5afe46772a9da1489c73
Reviewed-by: J-P Nurmi <jpnurmi@qt.io>
---
 src/extras/extras.pro |  5 +----
 src/extras/extras.qrc | 19 -------------------
 src/extras/plugin.cpp |  4 ++--
 3 files changed, 3 insertions(+), 25 deletions(-)
 delete mode 100644 src/extras/extras.qrc

(limited to 'src/extras')

diff --git a/src/extras/extras.pro b/src/extras/extras.pro
index ab2f69cd..3604044d 100644
--- a/src/extras/extras.pro
+++ b/src/extras/extras.pro
@@ -8,7 +8,7 @@ QT += qml
 
 QMAKE_DOCS = $$PWD/doc/qtquickextras.qdocconf
 
-CONTROLS_QML_FILES = \
+QML_FILES += \
     CircularGauge.qml \
     DelayButton.qml \
     Dial.qml \
@@ -30,9 +30,6 @@ include(designer/designer.pri)
 
 OTHER_FILES += doc/src/*
 
-!static:RESOURCES += extras.qrc
-else: QML_FILES += $$CONTROLS_QML_FILES
-
 TR_EXCLUDE += designer/*
 
 CONFIG += no_cxx_module
diff --git a/src/extras/extras.qrc b/src/extras/extras.qrc
deleted file mode 100644
index fcb8da57..00000000
--- a/src/extras/extras.qrc
+++ /dev/null
@@ -1,19 +0,0 @@
-<RCC>
-    <qresource prefix="/ExtrasImports/QtQuick/Extras">
-        <file>StatusIndicator.qml</file>
-        <file>ToggleButton.qml</file>
-        <file>Tumbler.qml</file>
-        <file>PieMenu.qml</file>
-        <file>Gauge.qml</file>
-        <file>Dial.qml</file>
-        <file>CircularGauge.qml</file>
-        <file>TumblerColumn.qml</file>
-        <file>DelayButton.qml</file>
-        <file>Private/CircularButton.qml</file>
-        <file>Private/Handle.qml</file>
-        <file>Private/PieMenuIcon.qml</file>
-        <file>Private/CircularButtonStyleHelper.qml</file>
-        <file>Private/CircularTickmarkLabel.qml</file>
-        <file>Private/TextSingleton.qml</file>
-    </qresource>
-</RCC>
diff --git a/src/extras/plugin.cpp b/src/extras/plugin.cpp
index 2f58510b..5133a4ac 100644
--- a/src/extras/plugin.cpp
+++ b/src/extras/plugin.cpp
@@ -73,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
@@ -111,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
-- 
cgit v1.2.1