plasma-desktop: fix QML import paths for Qt 5.5

This commit is contained in:
Thomas Tuegel 2015-10-19 18:48:26 -05:00
parent 361b1165ef
commit 67cfc9c8c9
4 changed files with 46 additions and 6 deletions

View File

@ -1,7 +1,7 @@
From bce620c9dcb25a4e603b22ead5c004b053dae7bf Mon Sep 17 00:00:00 2001
From 618d86f35b83ee9e57da12be9d0866e34e487b88 Mon Sep 17 00:00:00 2001
From: Thomas Tuegel <ttuegel@gmail.com>
Date: Fri, 28 Aug 2015 10:16:38 -0500
Subject: [PATCH 1/2] hwclock
Subject: [PATCH 1/3] hwclock
---
kcms/dateandtime/helper.cpp | 6 +-----
@ -32,5 +32,5 @@ index cec5ab8..fc4a6b9 100644
KProcess::execute(hwclock, QStringList() << "--systohc");
}
--
2.5.0
2.5.2

View File

@ -1,7 +1,7 @@
From 2778186be31a8f949135ed99232eafee201a668d Mon Sep 17 00:00:00 2001
From decdc77a7e89b6f1bb3d49268b08a43daf4a7147 Mon Sep 17 00:00:00 2001
From: Thomas Tuegel <ttuegel@gmail.com>
Date: Fri, 28 Aug 2015 10:16:53 -0500
Subject: [PATCH 2/2] zoneinfo
Subject: [PATCH 2/3] zoneinfo
---
kcms/dateandtime/helper.cpp | 7 ++++++-
@ -26,5 +26,5 @@ index fc4a6b9..7b64d05 100644
if (QFile::exists(tz)) { // make sure the new TZ really exists
QFile::remove("/etc/localtime");
--
2.5.0
2.5.2

View File

@ -0,0 +1,39 @@
From d640d060109e552b333578abc80a36b47e521d4c Mon Sep 17 00:00:00 2001
From: Thomas Tuegel <ttuegel@gmail.com>
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(-)
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
+++ b/containments/desktop/package/contents/ui/main.qml
@@ -28,7 +28,7 @@ import org.kde.draganddrop 2.0 as DragDrop
import org.kde.private.desktopcontainment.desktop 0.1 as Desktop
-import "LayoutManager.js" as LayoutManager
+import "../code/LayoutManager.js" as LayoutManager
DragDrop.DropArea {
id: root
diff --git a/containments/panel/contents/ui/main.qml b/containments/panel/contents/ui/main.qml
index 6a6f364..edba48e 100644
--- a/containments/panel/contents/ui/main.qml
+++ b/containments/panel/contents/ui/main.qml
@@ -25,7 +25,7 @@ import org.kde.plasma.components 2.0 as PlasmaComponents
import org.kde.kquickcontrolsaddons 2.0
import org.kde.draganddrop 2.0 as DragDrop
-import "LayoutManager.js" as LayoutManager
+import "../code/LayoutManager.js" as LayoutManager
DragDrop.DropArea {
id: root
--
2.5.2

View File

@ -37,6 +37,7 @@ plasmaPackage rec {
hwclock = "${utillinux}/sbin/hwclock";
})
./0002-zoneinfo.patch
./0003-qt-5.5-QML-import-paths.patch
];
NIX_CFLAGS_COMPILE = [ "-I${xorgserver}/include/xorg" ];
cmakeFlags = [