7 files changed, 79 insertions, 81 deletions

diff --git a/recipes-qt/qt5/qt5-5.0.0+git.inc b/recipes-qt/qt5/qt5-5.0.0+git.inc
index a1ac0e76..d44eeecf 100644
--- a/recipes-qt/qt5/qt5-5.0.0+git.inc
+++ b/recipes-qt/qt5/qt5-5.0.0+git.inc
@@ -2,7 +2,7 @@
 
 # each module needs to define valid SRCREV
 SRC_URI += " \
-  git://qt.gitorious.org/qt/${QT_MODULE}.git;protocol=git;branch=stable \
+    git://qt.gitorious.org/qt/${QT_MODULE}.git;protocol=git;branch=stable \
 "
 
 S = "${WORKDIR}/git"
diff --git a/recipes-qt/qt5/qt5.inc b/recipes-qt/qt5/qt5.inc
index b8d09fe3..b3ab2103 100644
--- a/recipes-qt/qt5/qt5.inc
+++ b/recipes-qt/qt5/qt5.inc
@@ -35,24 +35,24 @@ QT_EXAMPLES ?= "-nomake examples"
 QT_DEMOS ?= "-nomake demos"
 
 QT_CONFIG_FLAGS += " \
-  -release \
-  -reduce-relocations \
-  -shared \
-  -silent \
-  -glib \
-  -no-pch \
-  -no-rpath \
-  -pkg-config \
-  ${QT_SYSTEM_LIBS} \
-  ${QT_NIS} \
-  ${QT_CUPS} \
-  ${QT_SQL_DRIVER_FLAGS} \
-  ${QT_DISTRO_FLAGS} \
-  ${QT_MODULE_FLAGS} \
-  ${QT_GLFLAGS} \
-  ${QT_TESTS} \
-  ${QT_EXAMPLES} \
-  ${QT_DEMOS} \
+    -release \
+    -reduce-relocations \
+    -shared \
+    -silent \
+    -glib \
+    -no-pch \
+    -no-rpath \
+    -pkg-config \
+    ${QT_SYSTEM_LIBS} \
+    ${QT_NIS} \
+    ${QT_CUPS} \
+    ${QT_SQL_DRIVER_FLAGS} \
+    ${QT_DISTRO_FLAGS} \
+    ${QT_MODULE_FLAGS} \
+    ${QT_GLFLAGS} \
+    ${QT_TESTS} \
+    ${QT_EXAMPLES} \
+    ${QT_DEMOS} \
 "
 
 do_configure() {
@@ -64,7 +64,6 @@ do_configure() {
 }
 
 do_compile() {
-
     unset CFLAGS CXXFLAGS AR
 
     oe_runmake ${EXTRA_ENV}
@@ -80,8 +79,8 @@ FILES_${PN}-plugins = "${libdir}/${QT_DIR_NAME}/plugins/*/*${SOLIBSDEV}"
 FILES_${PN}-plugins-dbg = "${libdir}/${QT_DIR_NAME}/plugins/*/.debug/*"
 
 FILES_${PN}-dev += " \
-        ${libdir}/cmake/* \
-        ${libdir}/*.prl \
-        ${includedir}/qt5/* \
-        ${datadir}/qt5/* \
+    ${libdir}/cmake/* \
+    ${libdir}/*.prl \
+    ${includedir}/qt5/* \
+    ${datadir}/qt5/* \
 "
diff --git a/recipes-qt/qt5/qt5_arch.inc b/recipes-qt/qt5/qt5_arch.inc
index 7048d7a3..25fbf904 100644
--- a/recipes-qt/qt5/qt5_arch.inc
+++ b/recipes-qt/qt5/qt5_arch.inc
@@ -1,13 +1,13 @@
 inherit siteinfo
 
 set_arch() {
-   case ${TARGET_ARCH} in
-       arm*)     QT_ARCH=arm ;;
-       i*86*)    QT_ARCH=i386 ;;
-       mips*)    QT_ARCH=mips ;;
-       powerpc*) QT_ARCH=powerpc ;;
-       x86_64*)  QT_ARCH=x86_64 ;;
-   esac
+    case ${TARGET_ARCH} in
+        arm*)     QT_ARCH=arm ;;
+        i*86*)    QT_ARCH=i386 ;;
+        mips*)    QT_ARCH=mips ;;
+        powerpc*) QT_ARCH=powerpc ;;
+        x86_64*)  QT_ARCH=x86_64 ;;
+    esac
 }
 
 set_endian() {
diff --git a/recipes-qt/qt5/qtbase-native.inc b/recipes-qt/qt5/qtbase-native.inc
index 0f196e4e..d601d2ce 100644
--- a/recipes-qt/qt5/qtbase-native.inc
+++ b/recipes-qt/qt5/qtbase-native.inc
@@ -13,48 +13,48 @@ SSTATE_SCAN_FILES += "*.pri *.prl"
 QT_DIR_NAME ?= "qt5"
 
 SRC_URI += " \
-  file://0001-qlibraryinfo-allow-to-set-qt.conf-from-the-outside-u.patch \
-  file://0001-Always-build-uic.patch \
-  file://qmake.conf \
+    file://0001-qlibraryinfo-allow-to-set-qt.conf-from-the-outside-u.patch \
+    file://0001-Always-build-uic.patch \
+    file://qmake.conf \
 "
 
 EXTRA_ENV = 'MAKE="make -e ${PARALLEL_MAKE}"'
 EXTRA_OEMAKE = " MAKEFLAGS='${PARALLEL_MAKE}'"
 
 EXTRA_OECONF = " \
-  -prefix ${prefix} \
-  -L ${STAGING_LIBDIR_NATIVE} \
-  -I ${STAGING_INCDIR_NATIVE} \
-  -system-zlib \
-  -no-libjpeg \
-  -no-libpng \
-  -no-gif \
-  -no-accessibility \
-  -no-cups \
-  -no-nis \
-  -no-gui \
-  -no-qml-debug \
-  -no-sql-mysql \
-  -no-sql-sqlite \
-  -no-opengl \
-  -no-openssl \
-  -no-xcb \
-  -verbose -release \
-  -prefix ${prefix} \
-  -bindir ${bindir}/${QT_DIR_NAME} \
-  -headerdir ${includedir}/${QT_DIR_NAME} \
-  -archdatadir ${libdir}/${QT_DIR_NAME} \
-  -datadir ${datadir}/${QT_DIR_NAME} \
-  -docdir ${docdir}/${QT_DIR_NAME} \
-  -hostdatadir ${datadir}/${QT_DIR_NAME} \
-  -hostbindir ${bindir}/${QT_DIR_NAME} \
-  -no-glib \
-  -no-iconv \
-  -silent \
-  -nomake examples \
-  -nomake tests \
-  -nomake demos \
-  -no-rpath \
+    -prefix ${prefix} \
+    -L ${STAGING_LIBDIR_NATIVE} \
+    -I ${STAGING_INCDIR_NATIVE} \
+    -system-zlib \
+    -no-libjpeg \
+    -no-libpng \
+    -no-gif \
+    -no-accessibility \
+    -no-cups \
+    -no-nis \
+    -no-gui \
+    -no-qml-debug \
+    -no-sql-mysql \
+    -no-sql-sqlite \
+    -no-opengl \
+    -no-openssl \
+    -no-xcb \
+    -verbose -release \
+    -prefix ${prefix} \
+    -bindir ${bindir}/${QT_DIR_NAME} \
+    -headerdir ${includedir}/${QT_DIR_NAME} \
+    -archdatadir ${libdir}/${QT_DIR_NAME} \
+    -datadir ${datadir}/${QT_DIR_NAME} \
+    -docdir ${docdir}/${QT_DIR_NAME} \
+    -hostdatadir ${datadir}/${QT_DIR_NAME} \
+    -hostbindir ${bindir}/${QT_DIR_NAME} \
+    -no-glib \
+    -no-iconv \
+    -silent \
+    -nomake examples \
+    -nomake tests \
+    -nomake demos \
+    -no-rpath \
 "
 
 # qtbase is exception, we need to use mkspecs from ${S}
@@ -72,12 +72,12 @@ do_configure_prepend() {
 }
 
 do_configure() {
-        # Avoid setting QMAKE_LINK from LD (since we want the linker to be g++)
-        unset LD
+    # Avoid setting QMAKE_LINK from LD (since we want the linker to be g++)
+    unset LD
 
-        (echo o; echo yes) | ./configure ${EXTRA_OECONF} || die "Configuring qt failed. EXTRA_OECONF was ${EXTRA_OECONF}"
+    (echo o; echo yes) | ./configure ${EXTRA_OECONF} || die "Configuring qt failed. EXTRA_OECONF was ${EXTRA_OECONF}"
 }
 
 do_install() {
-        oe_runmake install INSTALL_ROOT=${D}
+    oe_runmake install INSTALL_ROOT=${D}
 }
diff --git a/recipes-qt/qt5/qtbase.inc b/recipes-qt/qt5/qtbase.inc
index 7a1c9452..ad559962 100644
--- a/recipes-qt/qt5/qtbase.inc
+++ b/recipes-qt/qt5/qtbase.inc
@@ -1,11 +1,11 @@
 require qt5.inc
 
 SRC_URI += " \
-  file://0001-qlibraryinfo-allow-to-set-qt.conf-from-the-outside-u.patch \
-  file://0002-qmake-is-already-built-in-qt5-tools-native.patch \
-  file://0003-Allow-building-a-separate-qmake-for-the-target.patch \
-  file://0004-configure-eval-QMAKE_CXX.patch \
-  file://qmake.conf \
+    file://0001-qlibraryinfo-allow-to-set-qt.conf-from-the-outside-u.patch \
+    file://0002-qmake-is-already-built-in-qt5-tools-native.patch \
+    file://0003-Allow-building-a-separate-qmake-for-the-target.patch \
+    file://0004-configure-eval-QMAKE_CXX.patch \
+    file://qmake.conf \
 "
 
 DEPENDS += "qtbase-native virtual/libgl freetype jpeg libpng zlib openssl glib-2.0 ${ICU} udev"
@@ -20,7 +20,6 @@ XCB_DEPENDS += "xcb-util-wm xcb-util-image xcb-util-keysyms dbus"
 
 QT_MODULE_FLAGS = "-no-xcb"
 
-
 INC_PR = "r0"
 
 QT_BASE_NAME = "qt5"
diff --git a/recipes-qt/qt5/qtdeclarative.inc b/recipes-qt/qt5/qtdeclarative.inc
index db944be6..57464134 100644
--- a/recipes-qt/qt5/qtdeclarative.inc
+++ b/recipes-qt/qt5/qtdeclarative.inc
@@ -12,7 +12,7 @@ inherit qmake5
 
 SRC_URI += " \
     file://module_qmake.conf \
-    "
+"
 
 export QT_CONF_PATH="${WORKDIR}/qt.conf"
 
diff --git a/recipes-qt/qt5/qtjsbackend.inc b/recipes-qt/qt5/qtjsbackend.inc
index 3da6cc76..3ee10178 100644
--- a/recipes-qt/qt5/qtjsbackend.inc
+++ b/recipes-qt/qt5/qtjsbackend.inc
@@ -22,10 +22,10 @@ PARALLEL_MAKE = ""
 export QT_CONF_PATH="${WORKDIR}/qt.conf"
 
 do_configure () {
-        # Avoid setting QMAKE_LINK from LD (since we want the linker to be g++)
-        unset LD
+    # Avoid setting QMAKE_LINK from LD (since we want the linker to be g++)
+    unset LD
 
-        # This should not be needed. Perhaps the lack of this file is an indication
+    # This should not be needed. Perhaps the lack of this file is an indication
     # of an error on the native recipe...
     cp ${WORKDIR}/module_qmake.conf ${S}/.qmake.conf