Skip to content

Commit

Permalink
Replace no_build_qt option with configure_qt_only
Browse files Browse the repository at this point in the history
  • Loading branch information
martinburchell committed Jun 8, 2024
1 parent 2e7ce50 commit dc39778
Showing 1 changed file with 9 additions and 5 deletions.
14 changes: 9 additions & 5 deletions tablet_qt/tools/build_qt.py
Original file line number Diff line number Diff line change
Expand Up @@ -1582,7 +1582,7 @@ def __init__(self, args: argparse.Namespace) -> None:

# General
self.show_config_only = args.show_config_only # type: bool
self.build_qt = args.build_qt
self.configure_qt_only = args.configure_qt_only
self.fetch = args.fetch
self.root_dir = args.root_dir # type: str
self.nparallel = args.nparallel # type: int
Expand Down Expand Up @@ -4332,7 +4332,7 @@ def build_for(os: str, cpu: str) -> None:

if cfg.build_qt and qt_needs_building(cfg, target_platform):
configure_qt(cfg, target_platform)
if cfg.build_qt:
if not cfg.configure_qt_only:
installdirs.append(build_qt(cfg, target_platform))
if target_platform.android and ADD_SO_VERSION_OF_LIBQTFORANDROID:
make_missing_libqtforandroid_so(cfg, target_platform)
Expand Down Expand Up @@ -4384,6 +4384,10 @@ def build_for(os: str, cpu: str) -> None:
build_for(Os.IOS, Cpu.X86_64)

if not cfg.build_qt:
log.info("Not building Qt.")
sys.exit(EXIT_SUCCESS)

if cfg.configure_qt_only:
log.info("Configuration only. Not building Qt.")
sys.exit(EXIT_SUCCESS)

Expand Down Expand Up @@ -4442,9 +4446,9 @@ def main() -> None:
),
)
general.add_argument(
"--no_build_qt",
dest="build_qt",
action="store_false",
"--configure_qt_only",
dest="configure_qt_only",
action="store_true",
help="Only run Qt configure, don't build Qt",
)
general.add_argument(
Expand Down

0 comments on commit dc39778

Please sign in to comment.