From b7f235edb694cce4f0b974eccff8c230b2f23bfd Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Robert=20L=C3=B6hning?= Date: Thu, 9 Feb 2023 23:41:43 +0100 Subject: SquishTests: Avoid known bug with CMake-based Widgets projects ...and start testing it again as soon as the report is closed. Task-number: QTCREATORBUG-28787 Change-Id: Ib33efb6ef2851726a183576bfde5db0a1a5d8c38 Reviewed-by: Reviewed-by: Christian Stenger --- tests/system/suite_tools/tst_designer_autocomplete/test.py | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/tests/system/suite_tools/tst_designer_autocomplete/test.py b/tests/system/suite_tools/tst_designer_autocomplete/test.py index f9e6b0bdc0..10e5a635f4 100644 --- a/tests/system/suite_tools/tst_designer_autocomplete/test.py +++ b/tests/system/suite_tools/tst_designer_autocomplete/test.py @@ -8,7 +8,8 @@ def main(): if not startedWithoutPluginError(): return projectName = "DesignerTestApp" - createProject_Qt_GUI(tempDir(), projectName) + createProject_Qt_GUI(tempDir(), projectName, + buildSystem="qmake" if JIRA.isBugStillOpen(28787) else "CMake") invokeMenuItem('Build', 'Build Project "%s"' % projectName) selectFromLocator("mainwindow.ui") dragAndDrop(waitForObject("{container=':qdesigner_internal::WidgetBoxCategoryListView'" -- cgit v1.2.3 From a069ed838e7226817dd8064a6c92272666cf252b Mon Sep 17 00:00:00 2001 From: Eike Ziller Date: Tue, 14 Feb 2023 08:56:24 +0100 Subject: Let Debian packages install to /opt/qt-creator instead of /opt directly. Seems to be more conventional Change-Id: I6d3b0b973684b6f72c096eeb4f2b572012f30351 Reviewed-by: Reviewed-by: Cristian Adam Reviewed-by: hjk --- scripts/build.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/scripts/build.py b/scripts/build.py index ee83021fb9..29b459f412 100755 --- a/scripts/build.py +++ b/scripts/build.py @@ -189,7 +189,7 @@ def build_qtcreator(args, paths): if args.with_cpack: cmake_args += ['-DCPACK_PACKAGE_FILE_NAME=qtcreator' + args.zip_infix] if common.is_linux_platform(): - cmake_args += ['-DCPACK_INSTALL_PREFIX=/opt'] + cmake_args += ['-DCPACK_INSTALL_PREFIX=/opt/qt-creator'] cmake_args += args.config_args -- cgit v1.2.3 From 5c98eaf5929ed4e2d5b56344e3aa11b7ae596647 Mon Sep 17 00:00:00 2001 From: Eike Ziller Date: Tue, 7 Feb 2023 15:34:42 +0100 Subject: Fix opening Terminal on macOS 13 When Qt Creator is notarized. Using "open" results in a privacy error. A workaround is to use osascript. Unfortunately then the terminal window does not close automatically anymore. Fixes: QTCREATORBUG-28683 Change-Id: I9861d7bd5100fd28b46b774fa465c970758a3a3f Reviewed-by: Marcus Tillmanns Reviewed-by: Reviewed-by: Christian Stenger --- share/qtcreator/scripts/openTerminal.py | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/share/qtcreator/scripts/openTerminal.py b/share/qtcreator/scripts/openTerminal.py index 6db94bb258..c00a51c9b8 100755 --- a/share/qtcreator/scripts/openTerminal.py +++ b/share/qtcreator/scripts/openTerminal.py @@ -100,7 +100,13 @@ def main(): shell_script.write(commands) shell_script.flush() os.chmod(shell_script.name, stat.S_IXUSR | stat.S_IRUSR | stat.S_IWUSR) - subprocess.call(['/usr/bin/open', '-a', 'Terminal', shell_script.name]) + # TODO /usr/bin/open doesn't work with notarized app in macOS 13, + # use osascript instead (QTCREATORBUG-28683). + # This has the disadvantage that the Terminal windows doesn't close + # automatically anymore. + # subprocess.call(['/usr/bin/open', '-a', 'Terminal', shell_script.name]) + subprocess.call(['/usr/bin/osascript', '-e', 'tell app "Terminal" to activate']) + subprocess.call(['/usr/bin/osascript', '-e', 'tell app "Terminal" to do script "' + shell_script.name + '"']) if __name__ == "__main__": main() -- cgit v1.2.3