diff options
| author | Oswald Buddenhagen <oswald.buddenhagen@theqtcompany.com> | 2015-04-16 18:09:01 +0200 |
|---|---|---|
| committer | Oswald Buddenhagen <oswald.buddenhagen@theqtcompany.com> | 2015-04-21 12:05:56 +0000 |
| commit | 497974abe3d03d9927fdaa1783c4b8e6dff601bf (patch) | |
| tree | 4bebfa18b1e27e4b7c09f8e4cea57a999423f04e /mkspecs/features/qt_module_pris.prf | |
| parent | e662dc21b8a4aa02a9a769916da6822eed8456ac (diff) | |
don't try to include non-existing private module .pri
amends b8f79e7095d1.
Change-Id: If4358634a66947d7644224466b239e470d15afda
Reviewed-by: Joerg Bornemann <joerg.bornemann@theqtcompany.com>
Diffstat (limited to 'mkspecs/features/qt_module_pris.prf')
| -rw-r--r-- | mkspecs/features/qt_module_pris.prf | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/mkspecs/features/qt_module_pris.prf b/mkspecs/features/qt_module_pris.prf index b40e1391ac..46971ba604 100644 --- a/mkspecs/features/qt_module_pris.prf +++ b/mkspecs/features/qt_module_pris.prf @@ -26,8 +26,11 @@ else: \ mod_inst_pfx = $$mod_work_pfx !internal_module { MODULE_ID = $$MODULE - MODULE_PRIVATE_PRI = $$mod_inst_pfx/qt_lib_$${MODULE}_private.pri - mods_to_load = $$MODULE $${MODULE}_private + mods_to_load = $$MODULE + !no_private_module { + MODULE_PRIVATE_PRI = $$mod_inst_pfx/qt_lib_$${MODULE}_private.pri + mods_to_load += $${MODULE}_private + } } else { MODULE_ID = $${MODULE}_private mods_to_load = $${MODULE}_private |