1berry/qtbase
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Do not try to find .qmake.conf past the root directory

Browse Source 
In case of .qmake.conf not existing, this would result in an infinite loop.

Change-Id: I577aaed7a502efb7b01dc6b199dcf464358bf5a9
Reviewed-by: Alexandru Croitor <alexandru.croitor@qt.io>
This commit is contained in:
Frederik Gladhorn 2020-02-21 15:52:04 +01:00
parent 1826fa978a
commit e3c4870feb
1 changed files with 4 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
util/cmake/pro2cmake.py
View File

@ -286,7 +286,11 @@ def find_qmake_conf(project_file_path: str = "") -> str:
if os.path.isfile(maybe_file): if os.path.isfile(maybe_file):
return maybe_file return maybe_file
else: else:
last_cwd = cwd
cwd = os.path.dirname(cwd) cwd = os.path.dirname(cwd)
if last_cwd == cwd:
# reached the top level directory, stop looking
break
print(f"Warning: could not find .qmake.conf file") print(f"Warning: could not find .qmake.conf file")
return "" return ""