summaryrefslogtreecommitdiffstats
path: root/recipes-qt
diff options
context:
space:
mode:
authorSamuli Piippo <samuli.piippo@theqtcompany.com>2015-08-11 09:08:26 +0300
committerSamuli Piippo <samuli.piippo@theqtcompany.com>2015-08-11 10:23:17 +0000
commit7a77eb1760eb242a6a4b37bec71c2311a0a806d6 (patch)
treea56e6e9e0607cb45c7c8aa4b5ec55e7777ca34b4 /recipes-qt
parent96550b28fc28fd3b59f8bf1ac92686dea1ace3ce (diff)
downloadmeta-boot2qt-7a77eb1760eb242a6a4b37bec71c2311a0a806d6.tar.gz
Change all tab characters to spaces
Gerrit Sanity Bot does not like tabs, so remove them from recipes. Change-Id: Ic0bede29c9a4a01a2bd816e6771fafd76b2323e2 Reviewed-by: aavit <eirik.aavitsland@theqtcompany.com>
Diffstat (limited to 'recipes-qt')
-rw-r--r--recipes-qt/b2qt-addons/b2qt-appcontroller.bb8
-rw-r--r--recipes-qt/b2qt-addons/b2qt-emulator-proxy.bb4
-rw-r--r--recipes-qt/b2qt-addons/b2qt-emulator-sdcardmountd.bb4
-rw-r--r--recipes-qt/b2qt-addons/b2qt-launcher.bb4
-rw-r--r--recipes-qt/qt5-addons/qtdatavisualization_1.2.bb2
-rw-r--r--recipes-qt/qt5-addons/qtglesstream.bb16
-rw-r--r--recipes-qt/qt5/qtbase_%.bbappend6
7 files changed, 22 insertions, 22 deletions
diff --git a/recipes-qt/b2qt-addons/b2qt-appcontroller.bb b/recipes-qt/b2qt-addons/b2qt-appcontroller.bb
index dfea182..6766978 100644
--- a/recipes-qt/b2qt-addons/b2qt-appcontroller.bb
+++ b/recipes-qt/b2qt-addons/b2qt-appcontroller.bb
@@ -39,13 +39,13 @@ S = "${WORKDIR}/git"
39DEPENDS = "qtbase" 39DEPENDS = "qtbase"
40 40
41do_configure_append() { 41do_configure_append() {
42 sed -i -e '/^platform=/d' ${WORKDIR}/appcontroller.conf 42 sed -i -e '/^platform=/d' ${WORKDIR}/appcontroller.conf
43 echo platform=${MACHINE} >> ${WORKDIR}/appcontroller.conf 43 echo platform=${MACHINE} >> ${WORKDIR}/appcontroller.conf
44} 44}
45 45
46do_install_append() { 46do_install_append() {
47 install -m 0755 -d ${D}${sysconfdir} 47 install -m 0755 -d ${D}${sysconfdir}
48 install -m 0755 ${WORKDIR}/appcontroller.conf ${D}${sysconfdir}/ 48 install -m 0755 ${WORKDIR}/appcontroller.conf ${D}${sysconfdir}/
49} 49}
50 50
51FILES_${PN} += "${sysconfdir}/appcontroller.conf" 51FILES_${PN} += "${sysconfdir}/appcontroller.conf"
diff --git a/recipes-qt/b2qt-addons/b2qt-emulator-proxy.bb b/recipes-qt/b2qt-addons/b2qt-emulator-proxy.bb
index 6d17a58..e082735 100644
--- a/recipes-qt/b2qt-addons/b2qt-emulator-proxy.bb
+++ b/recipes-qt/b2qt-addons/b2qt-emulator-proxy.bb
@@ -39,8 +39,8 @@ S = "${WORKDIR}/git/src/helperlibs/proxy"
39DEPENDS = "qtbase qtsimulator" 39DEPENDS = "qtbase qtsimulator"
40 40
41do_install_append() { 41do_install_append() {
42 install -m 0755 -d ${D}${sysconfdir}/init.d 42 install -m 0755 -d ${D}${sysconfdir}/init.d
43 install -m 0755 ${WORKDIR}/emulatorproxyd.sh ${D}${sysconfdir}/init.d/ 43 install -m 0755 ${WORKDIR}/emulatorproxyd.sh ${D}${sysconfdir}/init.d/
44} 44}
45 45
46INITSCRIPT_NAME = "emulatorproxyd.sh" 46INITSCRIPT_NAME = "emulatorproxyd.sh"
diff --git a/recipes-qt/b2qt-addons/b2qt-emulator-sdcardmountd.bb b/recipes-qt/b2qt-addons/b2qt-emulator-sdcardmountd.bb
index cb0b2ce..d59ba2c 100644
--- a/recipes-qt/b2qt-addons/b2qt-emulator-sdcardmountd.bb
+++ b/recipes-qt/b2qt-addons/b2qt-emulator-sdcardmountd.bb
@@ -39,8 +39,8 @@ S = "${WORKDIR}/git/src/helperlibs/sdcarddaemon"
39DEPENDS = "qtbase qtsimulator" 39DEPENDS = "qtbase qtsimulator"
40 40
41do_install_append() { 41do_install_append() {
42 install -m 0755 -d ${D}${sysconfdir}/init.d 42 install -m 0755 -d ${D}${sysconfdir}/init.d
43 install -m 0755 ${WORKDIR}/sdcardmountd.sh ${D}${sysconfdir}/init.d/ 43 install -m 0755 ${WORKDIR}/sdcardmountd.sh ${D}${sysconfdir}/init.d/
44} 44}
45 45
46INITSCRIPT_NAME = "sdcardmountd.sh" 46INITSCRIPT_NAME = "sdcardmountd.sh"
diff --git a/recipes-qt/b2qt-addons/b2qt-launcher.bb b/recipes-qt/b2qt-addons/b2qt-launcher.bb
index 4c55008..7781031 100644
--- a/recipes-qt/b2qt-addons/b2qt-launcher.bb
+++ b/recipes-qt/b2qt-addons/b2qt-launcher.bb
@@ -40,8 +40,8 @@ DEPENDS = "qtbase qtdeclarative \
40 ${@base_contains('DISTRO_FEATURES', 'webengine', 'qtwebengine', '', d)}" 40 ${@base_contains('DISTRO_FEATURES', 'webengine', 'qtwebengine', '', d)}"
41 41
42do_install_append() { 42do_install_append() {
43 install -m 0755 -d ${D}${sysconfdir}/init.d 43 install -m 0755 -d ${D}${sysconfdir}/init.d
44 install -m 0755 ${WORKDIR}/b2qt-startup.sh ${D}${sysconfdir}/init.d/ 44 install -m 0755 ${WORKDIR}/b2qt-startup.sh ${D}${sysconfdir}/init.d/
45} 45}
46 46
47FILES_${PN} += "${sysdir}/init.d/b2qt-startup.h" 47FILES_${PN} += "${sysdir}/init.d/b2qt-startup.h"
diff --git a/recipes-qt/qt5-addons/qtdatavisualization_1.2.bb b/recipes-qt/qt5-addons/qtdatavisualization_1.2.bb
index f3d0935..1a06675 100644
--- a/recipes-qt/qt5-addons/qtdatavisualization_1.2.bb
+++ b/recipes-qt/qt5-addons/qtdatavisualization_1.2.bb
@@ -39,5 +39,5 @@ S = "${WORKDIR}/git"
39DEPENDS += "qtbase qtdeclarative qtmultimedia" 39DEPENDS += "qtbase qtdeclarative qtmultimedia"
40 40
41FILES_${PN}-qmlplugins += " \ 41FILES_${PN}-qmlplugins += " \
42 ${OE_QMAKE_PATH_QML}/QtDataVisualization/designer/* \ 42 ${OE_QMAKE_PATH_QML}/QtDataVisualization/designer/* \
43 " 43 "
diff --git a/recipes-qt/qt5-addons/qtglesstream.bb b/recipes-qt/qt5-addons/qtglesstream.bb
index c1922af..06cec02 100644
--- a/recipes-qt/qt5-addons/qtglesstream.bb
+++ b/recipes-qt/qt5-addons/qtglesstream.bb
@@ -41,17 +41,17 @@ RREPLACES_${PN} = "qtglesstream-dummy-client"
41RREPLACES_${PN}-dev = "qtglesstream-dummy-client-dev" 41RREPLACES_${PN}-dev = "qtglesstream-dummy-client-dev"
42 42
43do_install_append() { 43do_install_append() {
44 install -m 0755 -d ${D}${includedir}/EGL 44 install -m 0755 -d ${D}${includedir}/EGL
45 install -m 0755 ${S}/headers/EGL/* ${D}${includedir}/EGL 45 install -m 0755 ${S}/headers/EGL/* ${D}${includedir}/EGL
46 46
47 install -m 0755 -d ${D}${includedir}/GLES2 47 install -m 0755 -d ${D}${includedir}/GLES2
48 install -m 0755 ${S}/headers/GLES2/* ${D}${includedir}/GLES2 48 install -m 0755 ${S}/headers/GLES2/* ${D}${includedir}/GLES2
49 49
50 install -m 0755 -d ${D}${includedir}/GLES3 50 install -m 0755 -d ${D}${includedir}/GLES3
51 install -m 0755 ${S}/headers/GLES3/* ${D}${includedir}/GLES3 51 install -m 0755 ${S}/headers/GLES3/* ${D}${includedir}/GLES3
52 52
53 install -m 0755 -d ${D}${includedir}/KHR 53 install -m 0755 -d ${D}${includedir}/KHR
54 install -m 0755 ${S}/headers/KHR/* ${D}${includedir}/KHR 54 install -m 0755 ${S}/headers/KHR/* ${D}${includedir}/KHR
55} 55}
56 56
57# no not overwrite files from qtglesstream-dummy-client 57# no not overwrite files from qtglesstream-dummy-client
diff --git a/recipes-qt/qt5/qtbase_%.bbappend b/recipes-qt/qt5/qtbase_%.bbappend
index 340d308..658e068 100644
--- a/recipes-qt/qt5/qtbase_%.bbappend
+++ b/recipes-qt/qt5/qtbase_%.bbappend
@@ -41,9 +41,9 @@ SRC_URI += " \
41 " 41 "
42 42
43do_configure_prepend() { 43do_configure_prepend() {
44 install -m 0644 ${WORKDIR}/oe-device-extra.pri ${S}/mkspecs 44 install -m 0644 ${WORKDIR}/oe-device-extra.pri ${S}/mkspecs
45 sed -i 's!load(qt_config)!!' ${S}/mkspecs/linux-oe-g++/qmake.conf 45 sed -i 's!load(qt_config)!!' ${S}/mkspecs/linux-oe-g++/qmake.conf
46 cat >> ${S}/mkspecs/linux-oe-g++/qmake.conf <<EOF 46 cat >> ${S}/mkspecs/linux-oe-g++/qmake.conf <<EOF
47QMAKE_PLATFORM += boot2qt 47QMAKE_PLATFORM += boot2qt
48QT_QPA_DEFAULT_PLATFORM = eglfs 48QT_QPA_DEFAULT_PLATFORM = eglfs
49 49