From 79b1b3e00a5f0e2efc338145ed83561767bd6a56 Mon Sep 17 00:00:00 2001 From: Thomas Tuegel Date: Mon, 19 Oct 2015 18:59:00 -0500 Subject: [PATCH] plasma-desktop: fix more QML import paths --- .../0003-qt-5.5-QML-import-paths.patch | 36 ++++++++++++++++--- 1 file changed, 32 insertions(+), 4 deletions(-) diff --git a/pkgs/desktops/plasma-5.4/plasma-desktop/0003-qt-5.5-QML-import-paths.patch b/pkgs/desktops/plasma-5.4/plasma-desktop/0003-qt-5.5-QML-import-paths.patch index 56d74ee1e94f..6b143bd2eb04 100644 --- a/pkgs/desktops/plasma-5.4/plasma-desktop/0003-qt-5.5-QML-import-paths.patch +++ b/pkgs/desktops/plasma-5.4/plasma-desktop/0003-qt-5.5-QML-import-paths.patch @@ -1,13 +1,41 @@ -From d640d060109e552b333578abc80a36b47e521d4c Mon Sep 17 00:00:00 2001 +From 4231d70ec08d9bbb367b222d9ef04454c1dc7328 Mon Sep 17 00:00:00 2001 From: Thomas Tuegel Date: Mon, 19 Oct 2015 18:45:36 -0500 Subject: [PATCH 3/3] qt-5.5 QML import paths --- - containments/desktop/package/contents/ui/main.qml | 2 +- - containments/panel/contents/ui/main.qml | 2 +- - 2 files changed, 2 insertions(+), 2 deletions(-) + applets/pager/package/contents/ui/main.qml | 2 +- + containments/desktop/package/contents/ui/FolderView.qml | 2 +- + containments/desktop/package/contents/ui/main.qml | 2 +- + containments/panel/contents/ui/main.qml | 2 +- + 4 files changed, 4 insertions(+), 4 deletions(-) +diff --git a/applets/pager/package/contents/ui/main.qml b/applets/pager/package/contents/ui/main.qml +index 0c367c6..c9a82be 100644 +--- a/applets/pager/package/contents/ui/main.qml ++++ b/applets/pager/package/contents/ui/main.qml +@@ -23,7 +23,7 @@ import org.kde.plasma.components 2.0 as PlasmaComponents + import org.kde.kquickcontrolsaddons 2.0 as KQuickControlsAddonsComponents + import org.kde.draganddrop 2.0 + import org.kde.plasma.private.pager 2.0 +-import "utils.js" as Utils ++import "../code/utils.js" as Utils + + MouseArea { + id: root +diff --git a/containments/desktop/package/contents/ui/FolderView.qml b/containments/desktop/package/contents/ui/FolderView.qml +index 578ec87..04e088c 100644 +--- a/containments/desktop/package/contents/ui/FolderView.qml ++++ b/containments/desktop/package/contents/ui/FolderView.qml +@@ -27,7 +27,7 @@ import org.kde.plasma.extras 2.0 as PlasmaExtras + import org.kde.kquickcontrolsaddons 2.0 + + import org.kde.private.desktopcontainment.folder 0.1 as Folder +-import "FolderTools.js" as FolderTools ++import "../code/FolderTools.js" as FolderTools + + Item { + id: main diff --git a/containments/desktop/package/contents/ui/main.qml b/containments/desktop/package/contents/ui/main.qml index 8c42706..fc74433 100644 --- a/containments/desktop/package/contents/ui/main.qml