Changeset 391:3327e78ca8ea in SMSSender

Timestamp:

Apr 30, 2014 2:26:47 PM (4 years ago)

Author:

Sämy Zehnder <saemy.zehnder@…>

Branch:

separation-frontend-backend

Message:

• Adds some workarounds for lupdate to interpret our projects correctly. Translations from base were included in the gui ts-files and vice versa.
• Generalizes the check for frontend-definitions in the DEFINES variable.

Files:

• additional_installs.pri (modified) (1 diff)
• smssender-gui.pri (modified) (1 diff)
• smssender.prf (modified) (2 diffs)

additional_installs.pri

@@ -9 +9 @@
 
 for(header, ADDITIONAL_INSTALLS) {
-    path = $${ADDITIONAL_INSTALLS_BASE}/$${dirname(header)}
+    path = $${ADDITIONAL_INSTALLS_BASE}/$$dirname(header)
     eval(install_$${path}.files += $$header)
     eval(install_$${path}.path = $$path)
     eval(INSTALLS *= install_$${path})
+
+    unset(path)
 }
+
+# Workaround for lupdate that keeps the values of a variable around and appends
+# new values to it even in the case of an assignment (foo = "" becomes foo += "")
+unset(ADDITIONAL_INSTALLS)
+unset(ADDITIONAL_INSTALLS_BASE)

smssender-gui.pri

@@ -1 @@
-# TODO: check for any FRONTEND_ definition
-contains(DEFINES, FRONTEND_CLI) {
-    error("FRONTEND_CLI is defined in FRONTEND_GUI environment.")
+# Checks for any FRONTEND_xxx definitions.
+definedFrontends = $$find(DEFINES, FRONTEND_.*)
+!isEmpty(definedFrontends) {
+    error("The following frontends are defined but must not: " $$definedFrontends)
 }
 

smssender.prf

@@ -12 +12 @@
         export($$var)
         export(IMPORT_BASE_BACKUP_$${var})
+
+        clear(value)
     }
 }
@@ -17 +19 @@
     # Changes the path in the file-variables and applies the backup from before.
     variables = $$fileVariables()
+
     for(var, variables) {
+        # Reads the backup and the actual value into variables.
+        eval(value = $$join($$var, " ../", ../))
         eval(value_bak = $$join(IMPORT_BASE_BACKUP_$${var}, " "))
-        eval(value = $$join($$var, " ../", ../) $$value_bak)
-        eval($$var = $$value)
-        eval($${var}_BASE = $$value)
+
+        !isLupdate {
+            # Combines them.
+            eval($$var = $$value $$value_bak)
+            eval($${var}_BASE = $$value)
+            export($${var}_BASE)
+        } else {
+            # lupdate runs through all conditional scopes.
+            # Removes any value set to variables in the previous scope.
+            unset($$var)
+            unset($${var}_BASE)
+
+            # Reverts the include by setting the variables to the old values.
+            eval($$var = $$value_bak)
+        }
+
         export($$var)
-        export($${var}_BASE)
+
+        # Workaround for lupdate that keeps the values of a variable around and
+        # appends new values to it even in the case of an assignment (foo = ""
+        # becomes foo += "")
+        unset(value)
+        unset(value_bak)
     }
+
+    unset(variables)
 }