Mirrors/ScreenPlay
Mirrors/ScreenPlay
1
0
Fork 0
mirror of https://gitlab.com/kelteseth/ScreenPlay.git synced 2024-11-07 03:22:33 +01:00
Code Issues Projects Releases Activity

Change formatter to 6.1

Browse Source 
6.1 actually now has support for some modern
qml features like inline components.
This commit is contained in:
Elias Steurer 2021-05-16 19:35:05 +02:00
parent 4001d1ddd2
commit 3fd25dcbeb
1 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
Tools/qml_format.py
View File

@ -12,20 +12,20 @@ def format_file_function(file):
executable = "qmlformat" executable = "qmlformat"
if os.name == 'nt': if os.name == 'nt':
executable = "qmlformat.exe" executable = "qmlformat.exe"
qt_bin_path = os.path.join(find_absolute_qt_path("5.15.2"), "bin") qt_bin_path = os.path.join(find_absolute_qt_path("6.1.0"), "bin")
executable = os.path.join(qt_bin_path, executable) executable = os.path.join(qt_bin_path, executable)
process = subprocess.run( process = subprocess.run(
"%s -n -i %s" % (executable, file), capture_output=True, shell=True) "%s -i %s" % (executable, file), capture_output=True, shell=True)
print("Format: %s \t return: %s" % (file, process.returncode)) print("Format: %s \t return: %s" % (file, process.returncode))
def main(git_staged_only=False): def main(git_staged_only=False):
if "" == find_absolute_qt_path("5.15.2"): if "" == find_absolute_qt_path("6.1.0"):
print("No suitable qt version found!") print("No suitable qt version found!")
sys.exit(1) sys.exit(1)
file_list = find_files(('.qml'), "Apps/Client/qml", git_staged_only) file_list = find_files(('.qml'), os.path.abspath(os.path.join(os.getcwd(), "../")), git_staged_only)
execute_threaded(file_list, format_file_function) execute_threaded(file_list, format_file_function)
if not git_staged_only: if not git_staged_only:
check_git_exit("QML Format") check_git_exit("QML Format")