mirror of
https://gitlab.com/kelteseth/ScreenPlay.git
synced 2024-09-01 16:19:47 +02:00
Change formatter to 6.1
6.1 actually now has support for some modern qml features like inline components.
This commit is contained in:
parent
4001d1ddd2
commit
3fd25dcbeb
@ -12,20 +12,20 @@ def format_file_function(file):
|
||||
executable = "qmlformat"
|
||||
if os.name == 'nt':
|
||||
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)
|
||||
|
||||
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))
|
||||
|
||||
|
||||
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!")
|
||||
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)
|
||||
if not git_staged_only:
|
||||
check_git_exit("QML Format")
|
||||
|
Loading…
Reference in New Issue
Block a user