Merge branch 'master' into v2

.github/workflows/test.yml

@@ -1,6 +1,6 @@
 name: Test Installing Qt
 
-on: [push]
+on: [push, pull_request]
 
 jobs:
   test:

README.md

@@ -26,7 +26,6 @@ Possible values: `windows`, `mac`, or `linux`
 
 Defaults to the current platform it is being run on.
 
-
 ### `target`
 This is the target platform that you will be building for. You will want to set this if you are building for iOS or Android. 
 
@@ -65,6 +64,14 @@ Whether or not to automatically install Qt dependencies on Linux (you probably w
 
 Default: `true`
 
+### `modules`
+List of additional addon modules to install, with each entry seperated by a space. If you need one of these, you'll know it.
+
+Possible values: `qtcharts`, `qtdatavis3d`, `qtpurchasing`, `qtvirtualkeyboard`, `qtwebengine`, `qtnetworkauth`, `qtwebglplugin`, `qtscript`, `debug_info`, possibly others
+
+Default: none
+
+
 ## More info
 
 The Qt bin directory is added to your `path` environment variable. `Qt5_Dir` is also set appropriately for cmake. 

action.yml

@@ -20,7 +20,8 @@ inputs:
   install-deps:
     description: 'Whether or not to install Qt dependencies on Linux'
     default: 'true'
-
+  modules:
+    description: 'Additional Qt modules to install'
 runs:
   using: 'node12'
   main: 'lib/main.js'

src/main.ts

@@ -17,13 +17,14 @@ async function run() {
     }
 
     await exec.exec("pip3 install setuptools wheel");
-    await exec.exec("pip3 install \"aqtinstall==0.5.*\"");
+    await exec.exec("pip3 install \"aqtinstall==0.6.*\"");
 
     const dir = (core.getInput("dir") || process.env.RUNNER_WORKSPACE) + "/Qt";
     const version = core.getInput("version");
     let host = core.getInput("host");
     let target = core.getInput("target");
     let arch = core.getInput("arch");
+    let modules = core.getInput("modules");
 
     //set host automatically if omitted
     if (!host) {
@@ -57,6 +58,9 @@ async function run() {
     if (arch) {
       args.push(`${arch}`);
     }
+    if (modules) {
+      args.push(`-m ${modules}`);
+    }
 
     //accomodate for differences in python 3 executable name
     let pythonName = "python3";