Fix lupdate bug

Author: Skycoder42

README.md

@@ -368,19 +368,19 @@ This is the documentation of the qmake feature that is generated by qdep and loa
 - `qdep_depends`: Can be added to any variable passed to `SUBDIRS` in a project that uses `QDEP_PROJECT_SUBDIRS` to specify that a certain subdir project depends on that specific package. This does **not** take care of linkage etc. It only ensures that the make targets are build in the correct order.
 
 ##### Advanced Variables
- Name                       | Direction | Default                               | Descriptions
-----------------------------|-----------|---------------------------------------|--------------
- QDEP_TOOL                  | in/out    | `<system>`                            | The escaped command line base for qdep commands run from within qmake
- QDEP_CACHE_SCOPE           | in        | `stash`                               | The method of caching to be used to cache various qmake related stuff. Can be &lt;empty>, super or stash
- QDEP_GENERATED_SOURCES_DIR | out       | `$$QDEP_GENERATED_DIR/<type>`         | The directory where generated source files are placed. Is determined by the build configuration to take debug/release builds into account
- QDEP_GENERATED_TS_DIR      | in        | `$$QDEP_GENERATED_DIR/.qdepts/<type>` | The directory where generated translation sources are placed.
- QDEP_LCONVERT              | in        | `lconvert -sort-contexts`             | The path to the lconvert tool and additional arguments to be used to combine translations
- QDEP_EXPORT_NAME           | in/out    | `<pro-file-name>_export.pri`          | The name of a generated library import file. Must be only the name of the file, use QDEP_EXPORT_PATH to specify the location
- QDEP_EXPORTED_DEFINES      | out       | `<empty>`                             | DEFINES that come from QDEP_PACKAGE_EXPORTS or DEFINES from any directly included qdep dependency
- QDEP_EXPORTED_INCLUDEPATH  | out       | `<empty>`                             | INCLUDEPATHs that come from any directly included qdep dependency
- QDEP_EXPORTED_LIBS         | out       | `<empty>`                             | LIBS that come from any directly included qdep dependency
- QDEP_HOOK_FNS              | out       | `<empty>`                             | Holds all names of functions to be run as startup hook by qdep
- QDEP_LUPDATE_ARGS          | in        | `-recursive -locations relative`      | Additional arguments for lupdate in the `make lupdate` command to control it's behaviour
+ Name                       | Direction | Default                                  | Descriptions
+----------------------------|-----------|------------------------------------------|--------------
+ QDEP_TOOL                  | in/out    | `<system>`                               | The escaped command line base for qdep commands run from within qmake
+ QDEP_CACHE_SCOPE           | in        | `stash`                                  | The method of caching to be used to cache various qmake related stuff. Can be &lt;empty>, super or stash
+ QDEP_GENERATED_SOURCES_DIR | out       | `$$QDEP_GENERATED_DIR/<type>`            | The directory where generated source files are placed. Is determined by the build configuration to take debug/release builds into account
+ QDEP_GENERATED_TS_DIR      | in        | `$$QDEP_GENERATED_DIR/.qdepts/<type>`    | The directory where generated translation sources are placed.
+ QDEP_LUPDATE               | in        | `lupdate -recursive -locations relative` | The path to the lupdate tool and additional arguments for lupdate in the `make lupdate` command to control it's behaviour
+ QDEP_LCONVERT              | in        | `lconvert -sort-contexts`                | The path to the lconvert tool and additional arguments to be used to combine translations
+ QDEP_EXPORT_NAME           | in/out    | `<pro-file-name>_export.pri`             | The name of a generated library import file. Must be only the name of the file, use QDEP_EXPORT_PATH to specify the location
+ QDEP_EXPORTED_DEFINES      | out       | `<empty>`                                | DEFINES that come from QDEP_PACKAGE_EXPORTS or DEFINES from any directly included qdep dependency
+ QDEP_EXPORTED_INCLUDEPATH  | out       | `<empty>`                                | INCLUDEPATHs that come from any directly included qdep dependency
+ QDEP_EXPORTED_LIBS         | out       | `<empty>`                                | LIBS that come from any directly included qdep dependency
+ QDEP_HOOK_FNS              | out       | `<empty>`                                | Holds all names of functions to be run as startup hook by qdep
 
 #### Configuration values
 ##### Input value
@@ -416,7 +416,6 @@ This is the documentation of the qmake feature that is generated by qdep and loa
 - `__QDEP_ORIGINAL_TRANSLATIONS`: All original translation that were in TRANSLATIONS before apply translation combination with QDEP_TRANSLATIONS from included packages
 - `__QDEP_HOOK_FILES`: Paths to header files that contain hook definitions that must be included and loaded by a project
 - `__QDEP_EXPORT_QMAKE_INCLUDE_GUARD`: a cache of included exported pri files to ensure each gets included only once
-- `__QDEP_LUPDATE`: The generated qmake tool for lupdate, using the `QDEP_LUPDATE_ARGS`
 
 ##### Configuration values
 - `__qdep_script_version`: The version detected at runtime as reported by the qdep executable

qdep/internal/prf.py

@@ -14,6 +14,11 @@
 isEmpty(QDEP_GENERATED_TS_DIR): QDEP_GENERATED_TS_DIR = $$QDEP_GENERATED_DIR/.qdepts
 debug_and_release:CONFIG(release, debug|release): QDEP_GENERATED_TS_DIR = $${QDEP_GENERATED_TS_DIR}/release
 else:debug_and_release:CONFIG(debug, debug|release): QDEP_GENERATED_TS_DIR = $${QDEP_GENERATED_TS_DIR}/debug
+isEmpty(QDEP_LUPDATE) {
+	qtPrepareTool(QDEP_LUPDATE, lupdate)
+	QDEP_LUPDATE += -recursive -locations relative
+    qdep_lupdate_no_obsolete: QDEP_LUPDATE += -no-obsolete
+}
 isEmpty(QDEP_LCONVERT) {
 	qtPrepareTool(QDEP_LCONVERT, lconvert)
 	QDEP_LCONVERT += -sort-contexts 
@@ -481,12 +486,6 @@
 }
 
 # Create lupdate target
-isEmpty(QDEP_LUPDATE_ARGS): QDEP_LUPDATE_ARGS = -recursive -locations relative
-isEmpty(__QDEP_LUPDATE) {
-	qtPrepareTool(__QDEP_LUPDATE, lupdate)
-	__QDEP_LUPDATE += $$QDEP_LUPDATE_ARGS
-}
-
 __qdep_lupdate_target.target = lupdate
 __qdep_lupdate_target.commands = $$QDEP_LUPDATE $$qdepShellQuote($$_PRO_FILE_PWD_ $$QDEP_LUPDATE_INPUTS) -ts $$qdepShellQuote($$TRANSLATIONS)
 __qdep_lupdate_target.depends += $$QDEP_LUPDATE_EXE $$_PRO_FILE_PWD_ $$QDEP_LUPDATE_INPUTS

qdep/qdep.py

@@ -2,7 +2,7 @@
 from qdep.internal.prf import *
 
 
-version = "1.1.0"
+version = "1.1.1"
 
 
 def prfgen(script_path, qmake="qmake", data_dir=None):