feedc0de/qt-creator
1
0
Fork 0
forked from qt-creator/qt-creator
Code Pull Requests Activity

Merge remote-tracking branch 'origin/9.0' into 10.0

Browse Source 
Change-Id: Ib01e191652168b2c38e80678f2f804bb95143cc5
This commit is contained in:
Eike Ziller
2023-02-14 16:05:31 +01:00
parent ce6e5acea7 5c98eaf592
commit 364013b9ac
3 changed files with 10 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
scripts/build.py
View File

@@ -189,7 +189,7 @@ def build_qtcreator(args, paths):
if args.with_cpack: if args.with_cpack:
cmake_args += ['-DCPACK_PACKAGE_FILE_NAME=qtcreator' + args.zip_infix] cmake_args += ['-DCPACK_PACKAGE_FILE_NAME=qtcreator' + args.zip_infix]
if common.is_linux_platform(): if common.is_linux_platform():
cmake_args += ['-DCPACK_INSTALL_PREFIX=/opt'] cmake_args += ['-DCPACK_INSTALL_PREFIX=/opt/qt-creator']
cmake_args += args.config_args cmake_args += args.config_args

8
share/qtcreator/scripts/openTerminal.py
View File

@@ -100,7 +100,13 @@ def main():
shell_script.write(commands) shell_script.write(commands)
shell_script.flush() shell_script.flush()
os.chmod(shell_script.name, stat.S_IXUSR | stat.S_IRUSR | stat.S_IWUSR) 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__": if __name__ == "__main__":
main() main()

3
tests/system/suite_tools/tst_designer_autocomplete/test.py
View File

@@ -8,7 +8,8 @@ def main():
if not startedWithoutPluginError(): if not startedWithoutPluginError():
return return
projectName = "DesignerTestApp" 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) invokeMenuItem('Build', 'Build Project "%s"' % projectName)
selectFromLocator("mainwindow.ui") selectFromLocator("mainwindow.ui")
dragAndDrop(waitForObject("{container=':qdesigner_internal::WidgetBoxCategoryListView'" dragAndDrop(waitForObject("{container=':qdesigner_internal::WidgetBoxCategoryListView'"