summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMax Krummenacher <max.krummenacher@toradex.com>2020-01-07 16:03:22 +0100
committerMax Krummenacher <max.krummenacher@toradex.com>2020-01-09 19:49:58 +0100
commitf4fac16e1033b3f8679b94e258e8c5d276167946 (patch)
treee79fac1b6964f40d82c5a0a91a5bbca08c9d9220
parent888c731f3867e4f7bdcf851e6d81428295ac57eb (diff)
qt5: do not require meta-qt5
Move all qt5 relevant stuff where it only gets parsed if meta-qt5 is available. Signed-off-by: Max Krummenacher <max.krummenacher@toradex.com>
-rw-r--r--qt5-layer/recipes-qt/falkon/falkon_3.1.0.bb (renamed from recipes-qt/falkon/falkon_3.1.0.bb)0
-rw-r--r--qt5-layer/recipes-qt/qedit/files/0001-Options.cpp-provide-default-for-SIDE_PANEL_TOOLBAR_T.patch (renamed from recipes-qt/qedit/files/0001-Options.cpp-provide-default-for-SIDE_PANEL_TOOLBAR_T.patch)0
-rw-r--r--qt5-layer/recipes-qt/qedit/files/qedit.desktop (renamed from recipes-qt/qedit/files/qedit.desktop)0
-rw-r--r--qt5-layer/recipes-qt/qedit/qedit_2.8.2.bb (renamed from recipes-qt/qedit/qedit_2.8.2.bb)0
-rw-r--r--qt5-layer/recipes-qt/qt5/packagegroup-qt5.bb (renamed from recipes-qt/qt5/packagegroup-qt5.bb)0
-rw-r--r--qt5-layer/recipes-qt/qt5/qt3d/0001-qt3d-do-not-set-resources_big.patch (renamed from recipes-qt/qt5/qt3d/0001-qt3d-do-not-set-resources_big.patch)0
-rw-r--r--qt5-layer/recipes-qt/qt5/qt3d_%.bbappend (renamed from recipes-qt/qt5/qt3d_%.bbappend)0
-rw-r--r--qt5-layer/recipes-qt/qt5/qt5-x11-free-systemd.bb (renamed from recipes-qt/qt5/qt5-x11-free-systemd.bb)0
-rw-r--r--qt5-layer/recipes-qt/qt5/qt5-x11-free-systemd/qt5-x11-demo-init (renamed from recipes-qt/qt5/qt5-x11-free-systemd/qt5-x11-demo-init)0
-rw-r--r--qt5-layer/recipes-qt/qt5/qt5-x11-free-systemd/qt5-x11-demo.service (renamed from recipes-qt/qt5/qt5-x11-free-systemd/qt5-x11-demo.service)0
-rw-r--r--qt5-layer/recipes-qt/qt5/qtbase_%.bbappend (renamed from recipes-qt/qt5/qtbase_%.bbappend)0
-rw-r--r--recipes-qt/qt-demo/qt-demo-init/keyboard.rules48
-rw-r--r--recipes-qt/qt-demo/qt-demo-init/mouse.rules48
13 files changed, 0 insertions, 96 deletions
diff --git a/recipes-qt/falkon/falkon_3.1.0.bb b/qt5-layer/recipes-qt/falkon/falkon_3.1.0.bb
index 4e2627d..4e2627d 100644
--- a/recipes-qt/falkon/falkon_3.1.0.bb
+++ b/qt5-layer/recipes-qt/falkon/falkon_3.1.0.bb
diff --git a/recipes-qt/qedit/files/0001-Options.cpp-provide-default-for-SIDE_PANEL_TOOLBAR_T.patch b/qt5-layer/recipes-qt/qedit/files/0001-Options.cpp-provide-default-for-SIDE_PANEL_TOOLBAR_T.patch
index 7c7f563..7c7f563 100644
--- a/recipes-qt/qedit/files/0001-Options.cpp-provide-default-for-SIDE_PANEL_TOOLBAR_T.patch
+++ b/qt5-layer/recipes-qt/qedit/files/0001-Options.cpp-provide-default-for-SIDE_PANEL_TOOLBAR_T.patch
diff --git a/recipes-qt/qedit/files/qedit.desktop b/qt5-layer/recipes-qt/qedit/files/qedit.desktop
index 14f5669..14f5669 100644
--- a/recipes-qt/qedit/files/qedit.desktop
+++ b/qt5-layer/recipes-qt/qedit/files/qedit.desktop
diff --git a/recipes-qt/qedit/qedit_2.8.2.bb b/qt5-layer/recipes-qt/qedit/qedit_2.8.2.bb
index 112a8c0..112a8c0 100644
--- a/recipes-qt/qedit/qedit_2.8.2.bb
+++ b/qt5-layer/recipes-qt/qedit/qedit_2.8.2.bb
diff --git a/recipes-qt/qt5/packagegroup-qt5.bb b/qt5-layer/recipes-qt/qt5/packagegroup-qt5.bb
index 32700ad..32700ad 100644
--- a/recipes-qt/qt5/packagegroup-qt5.bb
+++ b/qt5-layer/recipes-qt/qt5/packagegroup-qt5.bb
diff --git a/recipes-qt/qt5/qt3d/0001-qt3d-do-not-set-resources_big.patch b/qt5-layer/recipes-qt/qt5/qt3d/0001-qt3d-do-not-set-resources_big.patch
index d2c143f..d2c143f 100644
--- a/recipes-qt/qt5/qt3d/0001-qt3d-do-not-set-resources_big.patch
+++ b/qt5-layer/recipes-qt/qt5/qt3d/0001-qt3d-do-not-set-resources_big.patch
diff --git a/recipes-qt/qt5/qt3d_%.bbappend b/qt5-layer/recipes-qt/qt5/qt3d_%.bbappend
index 85d7eab..85d7eab 100644
--- a/recipes-qt/qt5/qt3d_%.bbappend
+++ b/qt5-layer/recipes-qt/qt5/qt3d_%.bbappend
diff --git a/recipes-qt/qt5/qt5-x11-free-systemd.bb b/qt5-layer/recipes-qt/qt5/qt5-x11-free-systemd.bb
index f6ba46d..f6ba46d 100644
--- a/recipes-qt/qt5/qt5-x11-free-systemd.bb
+++ b/qt5-layer/recipes-qt/qt5/qt5-x11-free-systemd.bb
diff --git a/recipes-qt/qt5/qt5-x11-free-systemd/qt5-x11-demo-init b/qt5-layer/recipes-qt/qt5/qt5-x11-free-systemd/qt5-x11-demo-init
index 76922ec..76922ec 100644
--- a/recipes-qt/qt5/qt5-x11-free-systemd/qt5-x11-demo-init
+++ b/qt5-layer/recipes-qt/qt5/qt5-x11-free-systemd/qt5-x11-demo-init
diff --git a/recipes-qt/qt5/qt5-x11-free-systemd/qt5-x11-demo.service b/qt5-layer/recipes-qt/qt5/qt5-x11-free-systemd/qt5-x11-demo.service
index 053f273..053f273 100644
--- a/recipes-qt/qt5/qt5-x11-free-systemd/qt5-x11-demo.service
+++ b/qt5-layer/recipes-qt/qt5/qt5-x11-free-systemd/qt5-x11-demo.service
diff --git a/recipes-qt/qt5/qtbase_%.bbappend b/qt5-layer/recipes-qt/qt5/qtbase_%.bbappend
index 0b6f29b..0b6f29b 100644
--- a/recipes-qt/qt5/qtbase_%.bbappend
+++ b/qt5-layer/recipes-qt/qt5/qtbase_%.bbappend
diff --git a/recipes-qt/qt-demo/qt-demo-init/keyboard.rules b/recipes-qt/qt-demo/qt-demo-init/keyboard.rules
deleted file mode 100644
index 9ff3fa0..0000000
--- a/recipes-qt/qt-demo/qt-demo-init/keyboard.rules
+++ /dev/null
@@ -1,48 +0,0 @@
-# There are a number of modifiers that are allowed to be used in some
-# of the different fields. They provide the following subsitutions:
-#
-# %n the "kernel number" of the device.
-# For example, 'sda3' has a "kernel number" of '3'
-# %e the smallest number for that name which does not matches an existing node
-# %k the kernel name for the device
-# %M the kernel major number for the device
-# %m the kernel minor number for the device
-# %b the bus id for the device
-# %c the string returned by the PROGRAM
-# %s{filename} the content of a sysfs attribute
-# %% the '%' char itself
-#
-
-# make sysmlink for mouse and keyboard input event devicesudevadm info --name /dev/input/event2
-#P: /devices/platform/fsl-ehci.0/usb1/1-1/1-1.3/1-1.3.4/1-1.3.4.1/1-1.3.4.1:1.1/input/input2/event2
-#N: input/event2
-#S: input/by-id/usb-Logitech_USB_Receiver-if01-event-mouse
-#S: input/by-path/platform-fsl-ehci.0-usb-0:1.3.4.1:1.1-event-mouse
-#E: DEVLINKS=/dev/input/by-id/usb-Logitech_USB_Receiver-if01-event-mouse /dev/input/by-path/platform-fsl-ehci.0-usb-0:1.3.4.1:1.1-event-mouse
-#E: DEVNAME=/dev/input/event2
-#E: DEVPATH=/devices/platform/fsl-ehci.0/usb1/1-1/1-1.3/1-1.3.4/1-1.3.4.1/1-1.3.4.1:1.1/input/input2/event2
-#E: ID_BUS=usb
-#E: ID_INPUT=1
-#E: ID_INPUT_KEY=1
-#E: ID_INPUT_MOUSE=1
-#E: ID_MODEL=USB_Receiver
-#E: ID_MODEL_ENC=USB\x20Receiver
-#E: ID_MODEL_ID=c52b
-#E: ID_PATH=platform-fsl-ehci.0-usb-0:1.3.4.1:1.1
-#E: ID_PATH_TAG=platform-fsl-ehci_0-usb-0_1_3_4_1_1_1
-#E: ID_REVISION=1201
-#E: ID_SERIAL=Logitech_USB_Receiver
-#E: ID_TYPE=hid
-#E: ID_USB_DRIVER=usbhid
-#E: ID_USB_INTERFACES=:030101:030102:030000:
-#E: ID_USB_INTERFACE_NUM=01
-#E: ID_VENDOR=Logitech
-#E: ID_VENDOR_ENC=Logitech
-#E: ID_VENDOR_ID=046d
-#E: MAJOR=13
-#E: MINOR=66
-#E: SUBSYSTEM=input
-#E: USEC_INITIALIZED=4737491
-
-SUBSYSTEM=="input", KERNEL=="event[0-9]*", ENV{ID_INPUT_KEYBOARD}=="1", SYMLINK+="input/event-keyboard"
-
diff --git a/recipes-qt/qt-demo/qt-demo-init/mouse.rules b/recipes-qt/qt-demo/qt-demo-init/mouse.rules
deleted file mode 100644
index d1d33d7..0000000
--- a/recipes-qt/qt-demo/qt-demo-init/mouse.rules
+++ /dev/null
@@ -1,48 +0,0 @@
-# There are a number of modifiers that are allowed to be used in some
-# of the different fields. They provide the following subsitutions:
-#
-# %n the "kernel number" of the device.
-# For example, 'sda3' has a "kernel number" of '3'
-# %e the smallest number for that name which does not matches an existing node
-# %k the kernel name for the device
-# %M the kernel major number for the device
-# %m the kernel minor number for the device
-# %b the bus id for the device
-# %c the string returned by the PROGRAM
-# %s{filename} the content of a sysfs attribute
-# %% the '%' char itself
-#
-
-# make sysmlink for mouse and keyboard input event devicesudevadm info --name /dev/input/event2
-#P: /devices/platform/fsl-ehci.0/usb1/1-1/1-1.3/1-1.3.4/1-1.3.4.1/1-1.3.4.1:1.1/input/input2/event2
-#N: input/event2
-#S: input/by-id/usb-Logitech_USB_Receiver-if01-event-mouse
-#S: input/by-path/platform-fsl-ehci.0-usb-0:1.3.4.1:1.1-event-mouse
-#E: DEVLINKS=/dev/input/by-id/usb-Logitech_USB_Receiver-if01-event-mouse /dev/input/by-path/platform-fsl-ehci.0-usb-0:1.3.4.1:1.1-event-mouse
-#E: DEVNAME=/dev/input/event2
-#E: DEVPATH=/devices/platform/fsl-ehci.0/usb1/1-1/1-1.3/1-1.3.4/1-1.3.4.1/1-1.3.4.1:1.1/input/input2/event2
-#E: ID_BUS=usb
-#E: ID_INPUT=1
-#E: ID_INPUT_KEY=1
-#E: ID_INPUT_MOUSE=1
-#E: ID_MODEL=USB_Receiver
-#E: ID_MODEL_ENC=USB\x20Receiver
-#E: ID_MODEL_ID=c52b
-#E: ID_PATH=platform-fsl-ehci.0-usb-0:1.3.4.1:1.1
-#E: ID_PATH_TAG=platform-fsl-ehci_0-usb-0_1_3_4_1_1_1
-#E: ID_REVISION=1201
-#E: ID_SERIAL=Logitech_USB_Receiver
-#E: ID_TYPE=hid
-#E: ID_USB_DRIVER=usbhid
-#E: ID_USB_INTERFACES=:030101:030102:030000:
-#E: ID_USB_INTERFACE_NUM=01
-#E: ID_VENDOR=Logitech
-#E: ID_VENDOR_ENC=Logitech
-#E: ID_VENDOR_ID=046d
-#E: MAJOR=13
-#E: MINOR=66
-#E: SUBSYSTEM=input
-#E: USEC_INITIALIZED=4737491
-
-SUBSYSTEM=="input", KERNEL=="event[0-9]*", ENV{ID_INPUT_MOUSE}=="1", SYMLINK+="input/event-mouse"
-