forked from qt-creator/qt-creator
Merge remote-tracking branch 'origin/9.0' into 10.0
Change-Id: Ib01e191652168b2c38e80678f2f804bb95143cc5
This commit is contained in:
@@ -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
|
||||
|
||||
|
||||
@@ -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()
|
||||
|
||||
@@ -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'"
|
||||
|
||||
Reference in New Issue
Block a user