diff options
9 files changed, 9 insertions, 9 deletions
diff --git a/src/imports/controls/MenuItem.qml b/src/imports/controls/MenuItem.qml index c0feff4c..0e66c1cc 100644 --- a/src/imports/controls/MenuItem.qml +++ b/src/imports/controls/MenuItem.qml @@ -70,7 +70,7 @@ T.MenuItem { y: control.topPadding + (control.availableHeight - height) / 2 visible: control.checked - source: control.checkable ? "qrc:/qt-project.org/imports/Qt/labs/controls/images/check.png" : "" + source: control.checkable ? "qrc:/qt-project.org/imports/QtQuick/Controls.2/images/check.png" : "" } //! [indicator] diff --git a/src/imports/controls/controls.pro b/src/imports/controls/controls.pro index 87601f5d..282c3217 100644 --- a/src/imports/controls/controls.pro +++ b/src/imports/controls/controls.pro @@ -22,7 +22,7 @@ include(controls.pri) !static: include(designer/designer.pri) qtquickcompiler { - qmlfiles.prefix = /qt-project.org/imports/Qt/labs/controls + qmlfiles.prefix = /qt-project.org/imports/QtQuick/Controls.2 qmlfiles.files += $$QML_CONTROLS RESOURCES += qmlfiles } diff --git a/src/imports/controls/material/CheckIndicator.qml b/src/imports/controls/material/CheckIndicator.qml index b41321fd..c1097d4a 100644 --- a/src/imports/controls/material/CheckIndicator.qml +++ b/src/imports/controls/material/CheckIndicator.qml @@ -78,7 +78,7 @@ Rectangle { y: (parent.height - height) / 2 width: 16 height: 16 - source: "qrc:/qt-project.org/imports/Qt/labs/controls/material/images/check.png" + source: "qrc:/qt-project.org/imports/QtQuick/Controls.2/Material/images/check.png" fillMode: Image.PreserveAspectFit scale: control.checked ? 1 : 0 diff --git a/src/imports/controls/material/ComboBox.qml b/src/imports/controls/material/ComboBox.qml index aeeca1ea..8b3ae358 100644 --- a/src/imports/controls/material/ComboBox.qml +++ b/src/imports/controls/material/ComboBox.qml @@ -99,7 +99,7 @@ T.ComboBox { x: parent.width - width - control.rightPadding y: (parent.height - height) / 2 opacity: !control.enabled ? 0.5 : 1.0 - source: "qrc:/qt-project.org/imports/Qt/labs/controls/material/images/drop-indicator.png" + source: "qrc:/qt-project.org/imports/QtQuick/Controls.2/Material/images/drop-indicator.png" } Rectangle { diff --git a/src/imports/controls/material/qtquickmaterialstyleplugin.qrc b/src/imports/controls/material/qtquickmaterialstyleplugin.qrc index 8398d505..47257ce4 100644 --- a/src/imports/controls/material/qtquickmaterialstyleplugin.qrc +++ b/src/imports/controls/material/qtquickmaterialstyleplugin.qrc @@ -1,5 +1,5 @@ <RCC> - <qresource prefix="/qt-project.org/imports/Qt/labs/controls/material"> + <qresource prefix="/qt-project.org/imports/QtQuick/Controls.2/Material"> <file>images/check.png</file> <file>images/check@2x.png</file> <file>images/check@3x.png</file> diff --git a/src/imports/controls/qtquickcontrols2plugin.cpp b/src/imports/controls/qtquickcontrols2plugin.cpp index b819765c..91ccda39 100644 --- a/src/imports/controls/qtquickcontrols2plugin.cpp +++ b/src/imports/controls/qtquickcontrols2plugin.cpp @@ -140,7 +140,7 @@ void QtQuickControls2Plugin::initializeEngine(QQmlEngine *engine, const char *ur { Q_UNUSED(uri); - engine->addImageProvider(QStringLiteral("default"), new QQuickColorImageProvider(QStringLiteral(":/qt-project.org/imports/Qt/labs/controls/images"))); + engine->addImageProvider(QStringLiteral("default"), new QQuickColorImageProvider(QStringLiteral(":/qt-project.org/imports/QtQuick/Controls.2/images"))); const QByteArray import = QByteArray(uri) + ".impl"; qmlRegisterType<QQuickBusyIndicatorRing>(import, 2, 0, "BusyRing"); diff --git a/src/imports/controls/qtquickcontrols2plugin.qrc b/src/imports/controls/qtquickcontrols2plugin.qrc index 71cd3032..0948a529 100644 --- a/src/imports/controls/qtquickcontrols2plugin.qrc +++ b/src/imports/controls/qtquickcontrols2plugin.qrc @@ -1,5 +1,5 @@ <RCC> - <qresource prefix="/qt-project.org/imports/Qt/labs/controls"> + <qresource prefix="/qt-project.org/imports/QtQuick/Controls.2"> <file>images/check.png</file> <file>images/check@2x.png</file> <file>images/check@3x.png</file> diff --git a/src/imports/controls/universal/qtquickuniversalstyleplugin.cpp b/src/imports/controls/universal/qtquickuniversalstyleplugin.cpp index e80e7d12..fa27d5bf 100644 --- a/src/imports/controls/universal/qtquickuniversalstyleplugin.cpp +++ b/src/imports/controls/universal/qtquickuniversalstyleplugin.cpp @@ -83,7 +83,7 @@ void QtQuickUniversalStylePlugin::initializeEngine(QQmlEngine *engine, const cha { QQuickStylePlugin::initializeEngine(engine, uri); - engine->addImageProvider(name(), new QQuickColorImageProvider(QStringLiteral(":/qt-project.org/imports/Qt/labs/controls/universal/images"))); + engine->addImageProvider(name(), new QQuickColorImageProvider(QStringLiteral(":/qt-project.org/imports/QtQuick/Controls.2/Universal/images"))); QByteArray import = QByteArray(uri) + ".impl"; qmlRegisterType<QQuickUniversalFocusRectangle>(import, 2, 0, "FocusRectangle"); diff --git a/src/imports/controls/universal/qtquickuniversalstyleplugin.qrc b/src/imports/controls/universal/qtquickuniversalstyleplugin.qrc index 5a0249d7..cd9ea61f 100644 --- a/src/imports/controls/universal/qtquickuniversalstyleplugin.qrc +++ b/src/imports/controls/universal/qtquickuniversalstyleplugin.qrc @@ -1,5 +1,5 @@ <!DOCTYPE RCC><RCC version="1.0"> -<qresource prefix="qt-project.org/imports/Qt/labs/controls/universal"> +<qresource prefix="qt-project.org/imports/QtQuick/Controls.2/Universal"> <file>images/checkmark.png</file> <file>images/checkmark@2x.png</file> <file>images/checkmark@3x.png</file> |