From 14800665921dec1a4a40ce2f2169aac15d0f10f0 Mon Sep 17 00:00:00 2001
From: Oswald Buddenhagen <oswald.buddenhagen@qt.io>
Date: Wed, 28 Jun 2017 16:07:19 +0200
Subject: employ return() inside qt_example_installs.prf gainfully

reduces the indentation level.

Change-Id: I7851ffc5e9ecaaa3ae375d14fd245ea3747f61b2
Reviewed-by: Joerg Bornemann <joerg.bornemann@qt.io>
---
 mkspecs/features/qt_example_installs.prf | 169 ++++++++++++++++---------------
 1 file changed, 85 insertions(+), 84 deletions(-)

(limited to 'mkspecs')

diff --git a/mkspecs/features/qt_example_installs.prf b/mkspecs/features/qt_example_installs.prf
index 0a008374e5..9489d6c4f4 100644
--- a/mkspecs/features/qt_example_installs.prf
+++ b/mkspecs/features/qt_example_installs.prf
@@ -31,99 +31,100 @@ defineTest(addInstallFiles) {
 }
 
 probase = $$relative_path($$_PRO_FILE_PWD_, $$dirname(_QMAKE_CONF_)/examples)
-!isEmpty(probase):!contains(probase, ^\\..*):!isEmpty(_QMAKE_CACHE_) {
-    for(ex, EXAMPLE_FILES): \
-        sourcefiles += $$files($$absolute_path($$ex, $$_PRO_FILE_PWD_))
-    for(res, RESOURCES) {
-        rfile = $$cat($$absolute_path($$res, $$_PRO_FILE_PWD_), lines)
-        for(rline, rfile) {
-            resrc = $$replace(rline, ^[ \\t]*<file[^>]*>([^<]+)</file>[ \\t]*$, \\1)
-            !equals(resrc, $$rline): \
-                sourcefiles += $$resrc
-        }
+isEmpty(probase)|contains(probase, ^\\..*)|isEmpty(_QMAKE_CACHE_): \
+    return()
+
+for(ex, EXAMPLE_FILES): \
+    sourcefiles += $$files($$absolute_path($$ex, $$_PRO_FILE_PWD_))
+for(res, RESOURCES) {
+    rfile = $$cat($$absolute_path($$res, $$_PRO_FILE_PWD_), lines)
+    for(rline, rfile) {
+        resrc = $$replace(rline, ^[ \\t]*<file[^>]*>([^<]+)</file>[ \\t]*$, \\1)
+        !equals(resrc, $$rline): \
+            sourcefiles += $$resrc
     }
-    for(res, RC_FILE) {
-        rfile = $$cat($$absolute_path($$res, $$_PRO_FILE_PWD_), lines)
-        for(rline, rfile) {
-            resrc = $$replace(rline, "^\\d+\\s+ICON\\s+[^\"]*\"([^\"]+)\"\$", \\1)
-            !equals(resrc, $$rline): \
-                sourcefiles += $$resrc
-        }
+}
+for(res, RC_FILE) {
+    rfile = $$cat($$absolute_path($$res, $$_PRO_FILE_PWD_), lines)
+    for(rline, rfile) {
+        resrc = $$replace(rline, "^\\d+\\s+ICON\\s+[^\"]*\"([^\"]+)\"\$", \\1)
+        !equals(resrc, $$rline): \
+            sourcefiles += $$resrc
     }
-    sourcefiles += \
-        $$ANDROID_PACKAGE_SOURCE_DIR \
-        $$QMAKE_INFO_PLIST \
-        $$DISTFILES
-    extras = \
-        $$_PRO_FILE_PWD_/README \
-        $$_PRO_FILE_PWD_/README.TXT \
-        $$files($$_PRO_FILE_PWD_/*.pri) \
-        $$replace(_PRO_FILE_, \\.pro$, .qmlproject) \
-        $$replace(_PRO_FILE_, \\.pro$, .json) \
-        $$replace(_PRO_FILE_, \\.pro$, .inf)
-    for(extra, extras): \
-        exists($$extra): \
-            sourcefiles += $$extra
+}
+sourcefiles += \
+    $$ANDROID_PACKAGE_SOURCE_DIR \
+    $$QMAKE_INFO_PLIST \
+    $$DISTFILES
+extras = \
+    $$_PRO_FILE_PWD_/README \
+    $$_PRO_FILE_PWD_/README.TXT \
+    $$files($$_PRO_FILE_PWD_/*.pri) \
+    $$replace(_PRO_FILE_, \\.pro$, .qmlproject) \
+    $$replace(_PRO_FILE_, \\.pro$, .json) \
+    $$replace(_PRO_FILE_, \\.pro$, .inf)
+for(extra, extras): \
+    exists($$extra): \
+        sourcefiles += $$extra
 
-    # Just for Qt Creator
-    OTHER_FILES += $$sourcefiles
+# Just for Qt Creator
+OTHER_FILES += $$sourcefiles
 
-    sourcefiles += \
-        $$_PRO_FILE_ $$RC_FILE $$DEF_FILE \
-        $$SOURCES $$HEADERS $$FORMS $$RESOURCES $$TRANSLATIONS \
-        $$DBUS_ADAPTORS $$DBUS_INTERFACES
-    addInstallFiles(sources.files, $$sourcefiles)
-    sources.path = $$[QT_INSTALL_EXAMPLES]/$$probase
-    INSTALLS += sources
+sourcefiles += \
+    $$_PRO_FILE_ $$RC_FILE $$DEF_FILE \
+    $$SOURCES $$HEADERS $$FORMS $$RESOURCES $$TRANSLATIONS \
+    $$DBUS_ADAPTORS $$DBUS_INTERFACES
+addInstallFiles(sources.files, $$sourcefiles)
+sources.path = $$[QT_INSTALL_EXAMPLES]/$$probase
+INSTALLS += sources
 
-    check_examples {
-        srcfiles = $$sources.files
-        for(inst, INSTALLS): \
-            !equals(inst, target):!contains($${inst}.CONFIG, no_check_exist): \
-                for(file, $${inst}.files): \
-                    instfiles += $$files($$absolute_path($$file, $$_PRO_FILE_PWD_))
-        addInstallFiles(srcfiles, $$instfiles)
+check_examples {
+    srcfiles = $$sources.files
+    for(inst, INSTALLS): \
+        !equals(inst, target):!contains($${inst}.CONFIG, no_check_exist): \
+            for(file, $${inst}.files): \
+                instfiles += $$files($$absolute_path($$file, $$_PRO_FILE_PWD_))
+    addInstallFiles(srcfiles, $$instfiles)
 
-        thefiles = $$files($$_PRO_FILE_PWD_/*)
-        for(i, thefiles): \
-            allfiles += $$relative_path($$i, $$_PRO_FILE_PWD_)
-        for(i, srcfiles): \
-            allfiles -= $$relative_path($$i, $$_PRO_FILE_PWD_)
-        for(i, SUBDIRS) {
-            sd = $$eval($${i}.file)
-            !isEmpty(sd) {
-                sd ~= s,/.*,,
-            } else {
-                sd = $$eval($${i}.subdir)
-                isEmpty(sd): sd = $$i
-            }
-            allfiles -= $$sd
+    thefiles = $$files($$_PRO_FILE_PWD_/*)
+    for(i, thefiles): \
+        allfiles += $$relative_path($$i, $$_PRO_FILE_PWD_)
+    for(i, srcfiles): \
+        allfiles -= $$relative_path($$i, $$_PRO_FILE_PWD_)
+    for(i, SUBDIRS) {
+        sd = $$eval($${i}.file)
+        !isEmpty(sd) {
+            sd ~= s,/.*,,
+        } else {
+            sd = $$eval($${i}.subdir)
+            isEmpty(sd): sd = $$i
         }
-        allfiles -= doc
-        !isEmpty(allfiles): warning("remaining files in $$_PRO_FILE_PWD_: $$allfiles")
+        allfiles -= $$sd
     }
+    allfiles -= doc
+    !isEmpty(allfiles): warning("remaining files in $$_PRO_FILE_PWD_: $$allfiles")
+}
 
-    equals(TEMPLATE, app)|equals(TEMPLATE, lib) {
-        !contains(INSTALLS, target) {
-            !install_ok: \
-                error("$$_PRO_FILE_ is lacking an install target.")
-            else: check_examples: \
-                warning("$$_PRO_FILE_ is lacking an install target.")
-        } else: !equals(target.path, $$sources.path) {
-            !install_ok: \
-                error("$$_PRO_FILE_ installs target to unexpected location.")
-            else: check_examples: \
-                warning("$$_PRO_FILE_ installs target to unexpected location.")
-        }
+equals(TEMPLATE, app)|equals(TEMPLATE, lib) {
+    !contains(INSTALLS, target) {
+        !install_ok: \
+            error("$$_PRO_FILE_ is lacking an install target.")
+        else: check_examples: \
+            warning("$$_PRO_FILE_ is lacking an install target.")
+    } else: !equals(target.path, $$sources.path) {
+        !install_ok: \
+            error("$$_PRO_FILE_ installs target to unexpected location.")
+        else: check_examples: \
+            warning("$$_PRO_FILE_ installs target to unexpected location.")
     }
+}
 
-    !equals(TEMPLATE, subdirs):!compile_examples {
-        TEMPLATE = aux
-        CONFIG -= have_target qt staticlib dll
-        SOURCES =
-        OBJECTIVE_SOURCES =
-        INSTALLS -= target
-    } else {
-        CONFIG += relative_qt_rpath  # Examples built as part of Qt should be relocatable
-    }
+!equals(TEMPLATE, subdirs):!compile_examples {
+    TEMPLATE = aux
+    CONFIG -= have_target qt staticlib dll
+    SOURCES =
+    OBJECTIVE_SOURCES =
+    INSTALLS -= target
+} else {
+    CONFIG += relative_qt_rpath  # Examples built as part of Qt should be relocatable
 }
-- 
cgit v1.2.3