426 Commits

Author SHA1 Message Date
Tim Jenssen
119993747e Merge remote-tracking branch 'origin/qds/dev'
Conflicts:
	share/qtcreator/templates/wizards/projects/qtquickuiprototype/wizard.json
	src/libs/sqlite/sqliteids.h
	src/plugins/effectcomposer/effectshaderscodeeditor.cpp
	src/plugins/qmldesigner/qmlpreviewplugin/qmlpreviewactions.cpp
	src/tools/tools.qbs

Change-Id: Ia89da2e6704c10f91f4066210cddd1f3239e85b9
2025-01-06 18:17:48 +01:00
Tim Jenßen
9bf7e8e2f6 QmlDesigner: improve terminology consistency
- Removed secondary name "QML Emulation Layer," which was introduced
  to hide the term "QML Puppet" from normal users
- "QML Puppet" settings are nowadays hidden from normal users anyway
- Added crash info indicating it is an internal process; this is the
  only location where "QML Puppet" is exposed to normal users
- Removed outdated CMake comments

Task-number: QDS-13345
Change-Id: Idb8b909580269a8396842f1cc4ad056649075d01
Reviewed-by: Thomas Hartmann <thomas.hartmann@qt.io>
Reviewed-by: Miikka Heikkinen <miikka.heikkinen@qt.io>
2024-12-12 10:30:09 +00:00
Tim Jenßen
e35b6faf9c rename qml2puppet to qmlpuppet
Reduce confusion that the 2 does not mean qml is transported.

It was the version when we had 1 and 2, but one is gone long ago.

Task-number: QDS-13345
Change-Id: Ie1664f4fd489182e5e234e31b4bf92a5f547323e
Reviewed-by: Tim Jenssen <tim.jenssen@qt.io>
2024-12-12 10:10:04 +00:00
Marcus Tillmanns
9a94da70da KArchive: Add creator specific changes
Change-Id: I8227bffd0e83d69d456e49a9d5f66a5ef00ba60e
Reviewed-by: Eike Ziller <eike.ziller@qt.io>
2024-12-10 14:23:10 +00:00
Tim Jenßen
ef4cddc9bb Build/deploy: solve missing QtWebEngineProcess dependency
Task-number: QDS-14292
Change-Id: Ib464df3e0f11d48625c78b35c7d39b3e7b693076
Reviewed-by: Eike Ziller <eike.ziller@qt.io>
2024-12-09 10:17:33 +00:00
Eike Ziller
f415fc424b Scripts: Small download improvements
- better readable message
- first download to temporary (-part), then move to target
  (makes it more obvious which files have finished on disk)
- add option for skipping downloading existing files

Change-Id: Ie36b4b65b7e7a206a54cec8d643095970d85ff07
Reviewed-by: David Schulz <david.schulz@qt.io>
2024-11-22 08:01:59 +00:00
Eike Ziller
e484dc5994 Scripts: Share a useful function
To be used in upcoming scripts

Change-Id: I56bb024f35b1feb156deae122235d09116d4eaa1
Reviewed-by: David Schulz <david.schulz@qt.io>
2024-11-12 13:50:51 +00:00
Eike Ziller
9fea21c103 Build: Unify archive creation
Between building Qt Creator, extra plugins, and sdktool.
This adds avoiding arm-specific 7zip methods to the sdktool build, which
cannot be extracted with p7zip on Linux.

Change-Id: Ibc8a18967b6c4e7869a4a86680da9005f70d498b
Reviewed-by: David Schulz <david.schulz@qt.io>
2024-11-11 14:47:33 +00:00
Eike Ziller
c327cb08f4 COIN: Add instructions for oldest supported Qt version
And fix installation of ICU, that was installed at the wrong location
(the toplevel Qt directory instead of lib/, which didn't matter on
systems where the right ICU version was preinstalled anyway)

Change-Id: I53dcd6126b7b46358dd9aa0622e58a8c614bff3f
Reviewed-by: David Schulz <david.schulz@qt.io>
2024-11-07 13:10:53 +00:00
Eike Ziller
fec8e320de Build: Fix zipping of dev package on Linux
Official 7zip normally checks for the existence of symlink targets, and
fails if they do not. That can be avoided with a command line flag. This
is important for the dev packages on Linux, where the libFoo.so is a
symlink to the actual library, and the symlink is part of the dev
package, but the actual library part of the non-dev package.

Change-Id: Ibd5855c4e106c96058a693d87e84d0f2d8f93365
Reviewed-by: Eike Ziller <eike.ziller@qt.io>
Reviewed-by: Patrik Teivonen <patrik.teivonen@qt.io>
2024-11-07 07:28:52 +00:00
Eike Ziller
cf1f4b050f COIN: Make independent from internal scripts
The coin scripts may no longer access the repository with the internal
build scripts. Move (adapted versions of) the needed scripts into the
repository itself.

Change-Id: I0515b8d66bd917e32eaabf64a1c76cc852fbe5df
Reviewed-by: Marcus Tillmanns <marcus.tillmanns@qt.io>
2024-10-28 09:54:36 +00:00
Eike Ziller
20a21b3472 Build: Fix 7zip command for ARM machines also for plugins
Amends 14e04c0325

Change-Id: Ice95e62d451f1d4d65245337d01ce7481501fdbb
Reviewed-by: Antti Kokko <antti.kokko@qt.io>
2024-10-11 12:29:58 +00:00
Eike Ziller
ad7ea80c07 Merge remote-tracking branch 'origin/14.0'
Conflicts:
	coin/instructions/build.yaml
	src/plugins/cppeditor/cpptoolsreuse.cpp
	src/plugins/projectexplorer/projectexplorer.cpp

Change-Id: I26748c67ed58114b392704bbf4eba978b1048c80
2024-09-25 09:50:57 +02:00
Eike Ziller
14e04c0325 Build: Fix archive creation on ARM Windows
Prevent 7z from using the "arm executable" compression algorithm, that
cannot be extracted by pk7zip

Task-number: QTCREATORBUG-31331
Change-Id: I1c6358bad90f4fc0f8e065cdda802c72a97bd129
Reviewed-by: Cristian Adam <cristian.adam@qt.io>
2024-09-24 07:38:46 +00:00
Eike Ziller
95ab67a332 Remove outdated copyright related scripts
Change-Id: Ic805db07cf384eb2c654c4366bc89a9c725aab57
Reviewed-by: David Schulz <david.schulz@qt.io>
Reviewed-by: Christian Stenger <christian.stenger@qt.io>
2024-09-12 14:16:05 +00:00
Friedemann Kleint
32af4964ce Add a converter for converting an exported Axivion JSON table into a task file
Change-Id: If722af7472cc174e23a9d98e266874660e86842f
Reviewed-by: Christian Stenger <christian.stenger@qt.io>
2024-07-10 08:11:57 +00:00
Eike Ziller
2e9e107191 build.py: Avoid ARM 7z compression filter
Which fails to extract with (older?) p7zip from Linux distributions,
which is used for building online repositories.

Change-Id: Ia9032293841cf192b9b2e0ff820ca4a8b7f47763
Reviewed-by: Patrik Teivonen <patrik.teivonen@qt.io>
Reviewed-by: David Schulz <david.schulz@qt.io>
2024-06-10 07:28:25 +00:00
Eike Ziller
50c4046593 Deploy qtplugininfo
It is useful for inspecting Qt Creator plugins and doesn't hurt.

Change-Id: Ifefb3b17193e16b0f592b854477374dbcb5ab1b4
Reviewed-by: Alessandro Portale <alessandro.portale@qt.io>
Reviewed-by: <github-actions-qt-creator@cristianadam.eu>
Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org>
2024-03-04 13:41:39 +00:00
Artem Sokolovskii
e1f7469afb ClangFormat: Replace checks widget with editor
The existing approach utilizing the widget poses maintenance
challenges, primarily due to the dynamic nature of clang-format
settings across versions. The widget necessitates regeneration
for each new version, and compatibility issues arise when users
have different clang-format versions on their devices.

The updated solution adopts an Editor integrated with a yaml
language server, offering the ability to highlight and provide
code completion for the .clang-format file. This resolves the
widget regeneration issue and ensures compatibility with various
clang-format versions.

- Replaced the checks widget with an editor
- Introduced a line for yaml language server schema
in .clang-format files to enable autocompletion.
ToDo: Enhance schema accessibility without relying on this line.
- Added Ctrl+Space shortcut for autocompletion
- Added Ctrl+S shortcut for saving
- Eliminated outdated logic related to the checks widget
- Fixed copying and removal of clang-format settings

Change-Id: I2e3fbf19abe2f4df031f6ba5faffd47e07274346
Reviewed-by: hjk <hjk@qt.io>
Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>
Reviewed-by: David Schulz <david.schulz@qt.io>
Reviewed-by: <github-actions-qt-creator@cristianadam.eu>
2024-01-26 09:19:25 +00:00
Friedemann Kleint
b9cce1a0ba Brush up task file conversion scripts
Modernize them by using f-strings and print out the issue count.
Make flake2tasks.py include the error number in the warning text.

Change-Id: I2d736c27dd3b2356e2b0d0d20f95112e7c37d3f9
Reviewed-by: <github-actions-qt-creator@cristianadam.eu>
Reviewed-by: David Schulz <david.schulz@qt.io>
Reviewed-by: Shyamnath Premnadh <Shyamnath.Premnadh@qt.io>
Reviewed-by: Friedemann Kleint <Friedemann.Kleint@qt.io>
Reviewed-by: Cristian Maureira-Fredes <cristian.maureira-fredes@qt.io>
2024-01-19 11:02:34 +00:00
Tim Jenssen
399f7a1968 Merge remote-tracking branch 'origin/qds/dev'
Change-Id: I5d593fc74785958886453dc0b452c25356a8c65f
2024-01-18 11:15:29 +00:00
Tim Jenssen
8763a92274 scripts: add zip_threads argument to every call
Change-Id: Ie3fabbea5e8082f73eac71d8c7650a82fa706b30
Reviewed-by: Tim Jenssen <tim.jenssen@qt.io>
2024-01-17 19:13:03 +00:00
Tim Jenßen
1a76f3f665 scripts: add build sdk_tool option
Change-Id: I1bfbcb1baead5fe351a785b126540c60bc5db3c3
Reviewed-by: Tim Jenssen <tim.jenssen@qt.io>
2024-01-17 19:12:44 +00:00
Tim Jenssen
06bfa66ed7 Merge remote-tracking branch 'origin/qds/dev'
Change-Id: I6c657f5b8c0602ca76e9b17b10f1ff7a38b1b8be
2023-12-14 19:50:03 +01:00
Tim Jenssen
0c3c17c53a Build/deploy: fix missing argument
Change-Id: Ia73cfac75d336d7e321aef4059bb0eb6e4e3ed31
Reviewed-by: Qt CI Patch Build Bot <ci_patchbuild_bot@qt.io>
Reviewed-by: Tim Jenssen <tim.jenssen@qt.io>
2023-11-27 13:46:31 +00:00
Cristian Adam
73ddecd723 Scripts: Update compression algorithm for makedmg
bzip2 has been marked as deprecated by hdutil.

Change-Id: I647f1895c6b0d6456806d2ce3768fabcfdcfabc3
Reviewed-by: Eike Ziller <eike.ziller@qt.io>
Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org>
Reviewed-by: <github-actions-qt-creator@cristianadam.eu>
2023-11-24 18:07:36 +00:00
Tim Jenssen
49d3e6fddc qds: add Qt Shade Baker binary
Task-number: QDS-11387
Change-Id: Ibea4c241fcaaecffc7f3a29b8fc68fda442c5104
Reviewed-by: Qt CI Patch Build Bot <ci_patchbuild_bot@qt.io>
Reviewed-by: Tim Jenssen <tim.jenssen@qt.io>
2023-11-24 16:16:57 +00:00
Cristian Adam
3939ba93af qtcreatorcdbext: Deploy lldb on Windows
Starting with LLVM 17.0.1 we include lldb in the list of packages
compiled on Windows.

This commit deploys lldb.exe and its Python required machinery.

Fixes: QTCREATORBUG-14539
Change-Id: I7f44c537cbaf31bf2f065762bdc9a48dd5efc64d
Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org>
Reviewed-by: David Schulz <david.schulz@qt.io>
Reviewed-by: Eike Ziller <eike.ziller@qt.io>
2023-11-15 13:47:46 +00:00
Eike Ziller
839f737946 build.py: Apply additional config to all builds
Not only Qt Creator but also cdbextension & wininterrupt.
Otherwise there is no way to pass additional configuration to these.

Change-Id: I2bd4894f212df9795e1d66577bb25a26b29224a4
Reviewed-by: <github-actions-qt-creator@cristianadam.eu>
Reviewed-by: Cristian Adam <cristian.adam@qt.io>
2023-10-10 14:38:07 +00:00
Eike Ziller
1766002a97 Build/deploy: Move call to macdeployqt to deploy.py
And get rid of deployqtHelper_mac.sh

Change-Id: Iab8ba3e36f43c94b21f86a842eb1781a5ca462f2
Reviewed-by: Tim Jenssen <tim.jenssen@qt.io>
Reviewed-by: <github-actions-qt-creator@cristianadam.eu>
Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org>
2023-08-28 10:13:50 +00:00
Eike Ziller
1db2fea90b Build/deploy: Move llvm deployment to deploy.py
Moving things away from deployqtHelper_mac.sh

Change-Id: Ifadbf763fdbf12b5e22fc037986eb1b018b96aef
Reviewed-by: <github-actions-qt-creator@cristianadam.eu>
Reviewed-by: Tim Jenssen <tim.jenssen@qt.io>
2023-08-28 10:13:43 +00:00
Eike Ziller
1555ab3094 Build/deploy: Move qt.conf creation to deploy.py
Moving things away from deployqtHelper_mac.sh

Change-Id: I41810ac060bde63f3b11af852bb2e2f37d822bf4
Reviewed-by: Tim Jenssen <tim.jenssen@qt.io>
2023-08-28 10:13:25 +00:00
Eike Ziller
db4d424b43 Build/deploy: Move copying translations to deploy.py
Moving things away from deployqtHelper_mac.sh

Change-Id: I0c37d111cdfb88c1ef2452d03ca2bcc542600521
Reviewed-by: Tim Jenssen <tim.jenssen@qt.io>
2023-08-28 10:13:19 +00:00
Eike Ziller
fbc95f77bd Build/deploy: Move copying imports to deploy.py
Moving things away from deployqtHelper_mac.sh

Change-Id: Ib12b3105cb632833b713b04596c8bffd80f15131
Reviewed-by: Tim Jenssen <tim.jenssen@qt.io>
2023-08-28 10:13:13 +00:00
Eike Ziller
fc29c72b65 Build/deploy: Move copying plugins to deploy.py
Moving things away from deployqtHelper_mac.sh

Change-Id: I0470432a0ffa33437e3249d3fb3766d511073caf
Reviewed-by: Tim Jenssen <tim.jenssen@qt.io>
Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org>
2023-08-28 10:13:06 +00:00
Eike Ziller
fe18525326 Build/deploy: Move copying qtdiag to deploy.py
Moving things away from deployqtHelper_mac.sh

Change-Id: Ic71ad9a8ed522dc8c4eaa745ec519d9d705d1073
Reviewed-by: <github-actions-qt-creator@cristianadam.eu>
Reviewed-by: Cristian Adam <cristian.adam@qt.io>
Reviewed-by: Tim Jenssen <tim.jenssen@qt.io>
Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org>
2023-08-28 10:12:59 +00:00
Alessandro Portale
1112705619 ClangFormat: Mention generator script in header warning
Change-Id: Iaaeb7b35088e0f9e3e724aaca161894b8fee6ffb
Reviewed-by: <github-actions-qt-creator@cristianadam.eu>
Reviewed-by: Artem Sokolovskii <artem.sokolovskii@qt.io>
Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>
2023-08-04 15:48:23 +00:00
Artem Sokolovskii
f63c4857b8 ClangFormat: Update script for generating clangformatchecks
Updated for clang-format-16

Task-number: QTCREATORBUG-29434
Change-Id: Ib7fe12c19a6e3616760c146b623b150fb1df2c22
Reviewed-by: <github-actions-qt-creator@cristianadam.eu>
Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>
2023-08-03 13:13:15 +00:00
Eike Ziller
e3567ddc71 Build: Remove outdated argument handling
No longer used

Change-Id: Ife7edad49c66ee2a59d67ea4eca72767f8d73a7a
Reviewed-by: Cristian Adam <cristian.adam@qt.io>
2023-07-26 09:16:19 +00:00
Eike Ziller
c7d0c73587 Build: Rename deployqt.py to deploy.py
It hasn't been about just deploying Qt for a very long time.

Change-Id: I72fb070db505909500d2e68f2bafb198c3342c2b
Reviewed-by: Cristian Adam <cristian.adam@qt.io>
2023-07-26 09:16:05 +00:00
Eike Ziller
f909a21af1 Scripts: Make codesigning available more directly
Codesigning is done implicitly when using e.g. build.py
but sometimes doing it explicitly is convenient.
Add a main() to common.py and add arguments for triggering
codesigning:

python3 common.py codesign -s identity app_bundle

Change-Id: I8b0f766cfae0ea9d8173f331792a14964993d705
Reviewed-by: <github-actions-qt-creator@cristianadam.eu>
Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org>
Reviewed-by: Christian Stenger <christian.stenger@qt.io>
2023-06-22 07:59:02 +00:00
Eike Ziller
c9696fbabb Merge remote-tracking branch 'origin/10.0'
Change-Id: I8b36c1812b61dbe08fe3e7930f950e6b8e8a7079
2023-04-24 08:52:35 +02:00
Eike Ziller
7879d84033 deployqt: Support elfutils from Linux distribution
Which can be in a more complicated directory than just /usr/lib, like
/usr/lib/aarch64-linux-gnu .
So, recursively look for the elf library to determine the right
directory.

Change-Id: I58ed8a045fbde50dea8851f63409a5a0863c3b16
Reviewed-by: David Schulz <david.schulz@qt.io>
Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org>
2023-04-20 09:55:23 +00:00
Eike Ziller
2bc37de42b 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
2023-04-13 15:59:08 +02:00
Eike Ziller
f1fde363a0 Build: Optionally sign on Windows
Add an argument to the build script that takes a signing command (path
to sign is added at the end, run in cwd)

Task-number: QTCREATORBUG-25740
Task-number: QTCREATORBUG-28909
Change-Id: I6d3bdf7bd9fab0ea1fc129da08cf77c9a5448b31
Reviewed-by: Cristian Adam <cristian.adam@qt.io>
Reviewed-by: <github-actions-qt-creator@cristianadam.eu>
2023-04-11 12:01:17 +00:00
Tim Jenßen
feabda3aa7 Merge remote-tracking branch 'origin/10.0' into qds/dev
bigger conflicts resolved at:
  src/plugins/qmldesigner/CMakeLists.txt
  src/plugins/qmlprojectmanager/qmlprojectrunconfiguration.cpp

Change-Id: I08e2a109d8e37cbd77225129854e9e633725bfc7
2023-03-26 16:26:18 +02:00
Tim Jenssen
f34bd3309d scripts: add --keep-signed-content-at to makedmg.py
Change-Id: I3fd76cced3233afca90158717fbff400126a09c6
Reviewed-by: Tim Jenssen <tim.jenssen@qt.io>
2023-03-13 16:31:49 +00:00
Tim Jenssen
e0059feef5 scripts: add license-replacement feature
We also have enterprise dmg for example at the QtDesignStudio
case so we need to replace the default LGPL with enterprise.

Change-Id: I059e056cd4fda02f8befa72a2b694ade471b7f47
Reviewed-by: Tim Jenssen <tim.jenssen@qt.io>
2023-03-09 16:54:44 +00:00
Tim Jenssen
6445db8ca2 Revert "scripts: add ignore-codesign-paths feature"
This reverts commit cc4914ff83.

Reason for revert: did not work

Change-Id: Ib6e860f93a23bb599a4c6da98e23117498ff294a
Reviewed-by: Tim Jenssen <tim.jenssen@qt.io>
2023-03-03 19:07:49 +00:00
Tim Jenssen
cc4914ff83 scripts: add ignore-codesign-paths feature
QtDesignStudio packages Qt into the dmg
which is already codesigned.

Change-Id: I8d0f0d6df1e8792e44ef93ab6f871e6eecad7183
Reviewed-by: Tim Jenssen <tim.jenssen@qt.io>
2023-03-03 18:21:54 +00:00