Merge remote-tracking branch 'origin/10.0'

 Conflicts:
	src/plugins/python/pipsupport.cpp
	src/plugins/qtsupport/exampleslistmodel.cpp
	src/plugins/qtsupport/examplesparser.cpp
	tests/auto/examples/tst_examples.cpp

Change-Id: I00273622423fa99d41621969f6ecbbdaa0e18664

2 files changed, 18 insertions, 0 deletions

diff --git a/scripts/build.py b/scripts/build.py
index d6a30a18ff..2fced683b1 100755
--- a/scripts/build.py
+++ b/scripts/build.py
@@ -8,6 +8,7 @@ from __future__ import print_function
 import argparse
 import collections
 import os
+import shlex
 import shutil
 
 import common
@@ -43,6 +44,8 @@ def get_arguments():
     # signing
     parser.add_argument('--keychain-unlock-script',
                         help='Path to script for unlocking the keychain used for signing (macOS)')
+    parser.add_argument('--sign-command',
+                        help='Command to use for signing (Windows). The installation directory to sign is added at the end. Is run in the CWD.')
 
     # cdbextension
     parser.add_argument('--python-path',
@@ -262,6 +265,14 @@ def zipPatternForApp(paths):
 
 
 def package_qtcreator(args, paths):
+    if common.is_windows_platform() and args.sign_command:
+        command = shlex.split(args.sign_command)
+        if not args.no_qtcreator:
+            common.check_print_call(command + [paths.install])
+        common.check_print_call(command + [paths.wininterrupt_install])
+        if not args.no_cdb:
+            common.check_print_call(command + [paths.qtcreatorcdbext_install])
+
     if not args.no_zip:
         if not args.no_qtcreator:
             common.check_print_call(['7z', 'a', '-mmt' + args.zip_threads,
diff --git a/scripts/build_plugin.py b/scripts/build_plugin.py
index 38d247d4d5..4f4ddfdcb0 100755
--- a/scripts/build_plugin.py
+++ b/scripts/build_plugin.py
@@ -9,6 +9,7 @@ import argparse
 import collections
 import glob
 import os
+import shlex
 
 import common
 
@@ -46,6 +47,9 @@ def get_arguments():
     # signing
     parser.add_argument('--keychain-unlock-script',
                         help='Path to script for unlocking the keychain used for signing (macOS)')
+    parser.add_argument('--sign-command',
+                        help='Command to use for signing (Windows). The installation directory to sign is added at the end. Is run in the CWD.')
+
     args = parser.parse_args()
     args.with_debug_info = args.build_type == 'RelWithDebInfo'
     return args
@@ -140,6 +144,9 @@ def build(args, paths):
 def package(args, paths):
     if not os.path.exists(paths.result):
         os.makedirs(paths.result)
+    if common.is_windows_platform() and args.sign_command:
+        command = shlex.split(args.sign_command)
+        common.check_print_call(command + [paths.install])
     common.check_print_call(['7z', 'a', '-mmt2', os.path.join(paths.result, args.name + '.7z'), '*'],
                             paths.install)
     if os.path.exists(paths.dev_install):  # some plugins might not provide anything in Devel