diff -r 528fb97cdb6c -r c87eb20797b7 scripts/install.py
--- a/scripts/install.py Sat Aug 28 17:51:43 2021 +0200
+++ b/scripts/install.py Sat Aug 28 19:48:56 2021 +0200
@@ -122,7 +122,7 @@
if sys.platform == "darwin":
print(" {0} [-chxz] [-a dir] [-b dir] [-d dir] [-f file] [-i dir]"
" [-m name] [-n path] [-p python] [--no-apis] [--no-info]"
- " [--yes]"
+ " [--no-tools] [--yes]"
.format(progName))
elif sys.platform.startswith(("win", "cygwin")):
print(" {0} [-chxz] [-a dir] [-b dir] [-d dir] [-f file]"
@@ -161,9 +161,7 @@
if sys.platform.startswith(("win", "cygwin")):
print(" --clean-desktop delete desktop links before installation")
print(" --no-info don't create the install info file")
- if sys.platform != "darwin":
- print(" --no-tools don't ask for installation of pyqt6-tools"
- "/qt6-applications")
+ print(" --no-tools don't install qt6-applications")
print(" -x don't perform dependency checks (use on your own"
" risk)")
print(" -z don't compile the installed python files")
@@ -1574,11 +1572,8 @@
"pyenchant": ("enchant", ""),
"wheel": ("wheel", ""),
}
- # dict with tuples of package name and install constraint
- # TODO: enable this once qt6_applications is released
- if False: # __IGNORE_WARNING_Y102__
- if sys.platform != "darwin" and not ignorePyqt6Tools:
- optionalModulesList["qt6-applications"] = ("qt6_applications", "")
+ if not ignorePyqt6Tools:
+ optionalModulesList["qt6-applications"] = ("qt6_applications", "")
# check mandatory modules
modulesOK = True
@@ -1917,7 +1912,7 @@
elif sys.platform == "darwin":
optlist, args = getopt.getopt(
argv[1:], "chxza:b:d:f:i:m:n:p:",
- ["help", "no-apis", "no-info", "yes"])
+ ["help", "no-apis", "no-info", "no-tools", "yes"])
else:
optlist, args = getopt.getopt(
argv[1:], "chxza:b:d:f:i:",
