]> code.ossystems Code Review - meta-freescale.git/commitdiff
qtbase: Fix indentation of recipe
authorOtavio Salvador <otavio@ossystems.com.br>
Thu, 23 Jul 2015 19:48:28 +0000 (16:48 -0300)
committerOtavio Salvador <otavio@ossystems.com.br>
Tue, 19 Apr 2016 18:03:14 +0000 (15:03 -0300)
The recipe had a mix of indentation styles which makes it hard to
read. Those are changed to avoid tabs and rely on spaces only.

Signed-off-by: Otavio Salvador <otavio@ossystems.com.br>
dynamic-layers/qt5-layer/recipes-qt/qt5/qtbase_%.bbappend

index a376a838c633bd93e3b34c28508d6e92ba5decad..e0979bf5c77f8a752240f99133db05d2e6096289 100644 (file)
@@ -15,13 +15,12 @@ QT_CONFIG_FLAGS_append_mx5 = "${@base_contains('DISTRO_FEATURES', 'x11', ' -no-e
 PACKAGECONFIG_GL_mx6q = "gles2"
 PACKAGECONFIG_GL_mx6dl = "gles2"
 PACKAGECONFIG_GL_mx6sx = "gles2"
-PACKAGECONFIG_GL_mx6sl = "${@base_contains('DISTRO_FEATURES', 'x11', \
-                            ' gl', '', d)}"
+PACKAGECONFIG_GL_mx6sl = "${@base_contains('DISTRO_FEATURES', 'x11', ' gl', '', d)}"
 QT_CONFIG_FLAGS_append_mx6q = "${@base_contains('DISTRO_FEATURES', 'x11', ' -no-eglfs', ' -eglfs', d)}"
 QT_CONFIG_FLAGS_append_mx6dl = "${@base_contains('DISTRO_FEATURES', 'x11', ' -no-eglfs', ' -eglfs', d)}"
 QT_CONFIG_FLAGS_append_mx6sx = "${@base_contains('DISTRO_FEATURES', 'x11', ' -no-eglfs', ' -eglfs', d)}"
-QT_CONFIG_FLAGS_append_mx6sl = "${@base_contains('DISTRO_FEATURES', 'x11', \
-                            ' -no-eglfs', ' -no-opengl -linuxfb -no-eglfs', d)}"
+QT_CONFIG_FLAGS_append_mx6sl = "${@base_contains('DISTRO_FEATURES', 'x11', ' -no-eglfs', \
+                                                 ' -no-opengl -linuxfb -no-eglfs', d)}"
 
 do_configure_prepend_mx5() {
     sed -i 's!load(qt_config)!!' ${S}/mkspecs/linux-oe-g++/qmake.conf
@@ -43,28 +42,28 @@ EOF
 }
 
 do_configure_prepend_mx6() {
-       # adapt qmake.conf to our needs
-       sed -i 's!load(qt_config)!!' ${S}/mkspecs/linux-oe-g++/qmake.conf
+    # adapt qmake.conf to our needs
+    sed -i 's!load(qt_config)!!' ${S}/mkspecs/linux-oe-g++/qmake.conf
     if test ${HAS_X11} -eq 0; then
-   if test ${IS_MX6SL} -eq 0; then
+        if test ${IS_MX6SL} -eq 0; then
     
-               cat >> ${S}/mkspecs/linux-oe-g++/qmake.conf <<EOF
+            cat >> ${S}/mkspecs/linux-oe-g++/qmake.conf <<EOF
 EGLFS_PLATFORM_HOOKS_SOURCES = \$\$PWD/qeglfshooks_imx6.cpp
 IMX6_CFLAGS             = -DLINUX=1 -DEGL_API_FB=1
 EOF
-   else
-cat >> ${S}/mkspecs/linux-oe-g++/qmake.conf <<EOF
+        else
+            cat >> ${S}/mkspecs/linux-oe-g++/qmake.conf <<EOF
 IMX6_CFLAGS             = -DLINUX=1
 EOF
-fi
-               # copy the hook in the mkspecs directory OE is using
-               cp ${S}/mkspecs/devices/linux-imx6-g++/qeglfshooks_imx6.cpp ${S}/mkspecs/linux-oe-g++/
-       else
-       cat >> ${S}/mkspecs/linux-oe-g++/qmake.conf <<EOF
+        fi
+        # copy the hook in the mkspecs directory OE is using
+        cp ${S}/mkspecs/devices/linux-imx6-g++/qeglfshooks_imx6.cpp ${S}/mkspecs/linux-oe-g++/
+    else
+        cat >> ${S}/mkspecs/linux-oe-g++/qmake.conf <<EOF
 IMX6_CFLAGS             = -DLINUX=1
 EOF
-       fi
-       cat >> ${S}/mkspecs/linux-oe-g++/qmake.conf <<EOF
+    fi
+    cat >> ${S}/mkspecs/linux-oe-g++/qmake.conf <<EOF
 QMAKE_LIBS_EGL         += -lEGL
 QMAKE_LIBS_OPENGL_ES2  += -lGLESv2 -lEGL -lGAL
 QMAKE_LIBS_OPENVG      += -lOpenVG -lEGL -lGAL