Commit Graph

411 Commits

Author SHA1 Message Date
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
Tim Jenssen
e549ad4d01 makedmg: add dmg-size option
The dmg size for QtDesignStudio can be much bigger
then the default size which is enough for QtCreator.

Change-Id: I2a7cbe01ca05fc32bb3b6b5a82c1670f9703ae50
Reviewed-by: Eike Ziller <eike.ziller@qt.io>
2023-02-20 14:21:41 +00:00
Eike Ziller
364013b9ac Merge remote-tracking branch 'origin/9.0' into 10.0
Change-Id: Ib01e191652168b2c38e80678f2f804bb95143cc5
2023-02-14 16:05:31 +01:00
Eike Ziller
a069ed838e Let Debian packages install to /opt/qt-creator
instead of /opt directly. Seems to be more conventional

Change-Id: I6d3b0b973684b6f72c096eeb4f2b572012f30351
Reviewed-by: <github-actions-qt-creator@cristianadam.eu>
Reviewed-by: Cristian Adam <cristian.adam@qt.io>
Reviewed-by: hjk <hjk@qt.io>
2023-02-14 10:22:02 +00:00
Tim Jenssen
9eb2a7bc5b Merge remote-tracking branch 'origin/9.0' into qds/dev
Change-Id: Ic60cb293d07e7e25716adfbaa2f35e9d25ca148b
2023-01-10 17:48:42 +00:00
Kai Köhne
4e9c1d126c Replace GPL-3.0 with GPL-3.0-only
GPL-3.0 is deprecated by SPDX.

Change done by

 find . -type f -exec perl -pi -e 's/LicenseRef-Qt-Commercial OR GPL-3.0(?!-)/LicenseRef-Qt-Commercial OR GPL-3.0-only/g' {} \;

Change-Id: If316a498e3f27d2030b86d4e7743b3237ce09939
Reviewed-by: Lucie Gerard <lucie.gerard@qt.io>
Reviewed-by: <github-actions-qt-creator@cristianadam.eu>
Reviewed-by: Eike Ziller <eike.ziller@qt.io>
2023-01-10 08:05:04 +00:00
Kai Köhne
56baf8c058 Remove GPL-3.0+ from license identifiers
Since we also license under GPL-3.0 WITH Qt-GPL-exception-1.0,
this applies only to a hypothetical newer version of GPL, that doesn't
exist yet. If such a version emerges, we can still decide to relicense...

While at it, replace (deprecated) GPL-3.0 with more explicit GPL-3.0-only

Change was done by running

  find . -type f -exec perl -pi -e "s/LicenseRef-Qt-Commercial OR GPL-3.0\+ OR GPL-3.0 WITH Qt-GPL-exception-1.0/LicenseRef-Qt-Commercial OR GPL-3.0-only WITH Qt-GPL-exception-1.0/g" {} \;

Change-Id: I5097e6ce8d10233993ee30d7e25120e2659eb10b
Reviewed-by: Eike Ziller <eike.ziller@qt.io>
2023-01-06 11:15:13 +00:00
Eike Ziller
3f4c3a3db4 Merge remote-tracking branch 'origin/9.0'
Conflicts:
	cmake/QtCreatorIDEBranding.cmake
	qbs/modules/qtc/qtc.qbs
	qtcreator_ide_branding.pri
	src/plugins/texteditor/texteditor.cpp

Change-Id: I9c8f1331be3f5442f1fd28aeb0a9bc07128629d1
2022-12-20 11:05:01 +01:00
Eike Ziller
77dfa71f06 Deploying Qt: Clean up .cpp.o(bj) files when deploying Qt
These files are required when building against some static libraries
that Qt ships. Since we don't link against these libraries, we used to
remove them when we install Qt, but starting with Qt 6.5 some of these
files are required by the Qt CMake files, and configuration would fail.

So, we now have to remove them when deploying Qt, instead of already
when installing Qt.

Change-Id: Ie38ab3735b86df0372b946d6a808007b5ec84b88
Reviewed-by: <github-actions-qt-creator@cristianadam.eu>
Reviewed-by: Tim Jenssen <tim.jenssen@qt.io>
2022-12-20 09:58:28 +00:00
Eike Ziller
456b8b69f9 build_plugins.py: Create signed package for plugins
On macOS if SIGNING_IDENTITY is given.
Creates an extra <plugin>-signed.7z, to not interfere with existing
build setups.

Change-Id: I8ec7f5cbeb14fb749d5d62398916629b83bdb833
Reviewed-by: <github-actions-qt-creator@cristianadam.eu>
Reviewed-by: Christian Stenger <christian.stenger@qt.io>
2022-12-16 14:59:06 +00:00
Artem Sokolovskii
2ffa843d40 ClangFormat: Make clang format checks widget resizable
- Change Form to Grid that looks consistent for
different OS

Change-Id: Ibb5fc3564d8c25457c4bf520acf78b25c542b5ae
Reviewed-by: Marcus Tillmanns <marcus.tillmanns@qt.io>
Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>
2022-12-16 12:15:32 +00:00
Tim Jenssen
7f234ed768 Merge remote-tracking branch 'origin/qds/dev'
Conflicts:
  src/plugins/qmldesigner/components/assetslibrary/assetslibrarymodel.cpp
  src/plugins/qmldesigner/components/contentlibrary/contentlibrarytexturesmodel.cpp

Change-Id: Ieda6242b845387100022b08251283891fb0fbda7
2022-12-14 14:30:09 +00:00
Artem Sokolovskii
e58c60ec9d ClangFormat: Remove without margins layouting from script
Change-Id: Iddf69e73ca5df48541e83030b2a09e7833f9fa64
Reviewed-by: Jarek Kobus <jaroslaw.kobus@qt.io>
2022-12-07 09:25:56 +00:00
Artem Sokolovskii
76568d8232 ClangFormat: Create new generateclangformatchecks file
- new generateclangformatcheckslayout file generates two
clangformatchecks files .cpp and .h, which contain UI Layout
based on utils/layoutbuilder

Change-Id: I4a83e542f089618d0cbd552dc99485b9428b4106
Reviewed-by: <github-actions-qt-creator@cristianadam.eu>
Reviewed-by: Jarek Kobus <jaroslaw.kobus@qt.io>
2022-12-07 08:39:48 +00:00
Tim Jenssen
409f7f226f deployqtHelper_mac.sh: make sdktool optional
Silents the warning about not existing sdktool
in QtDesignStudio build.

Change-Id: Ia8e3f341936f4b20d340f9c66a5da3d01f14bccf
Reviewed-by: <github-actions-qt-creator@cristianadam.eu>
Reviewed-by: Burak Hancerli <burak.hancerli@qt.io>
Reviewed-by: Eike Ziller <eike.ziller@qt.io>
2022-11-17 14:21:53 +00:00
Tim Jenssen
0d2cb70fd6 qml2puppet: fix broken deployqtHelper_mac.sh
The extra subdirectory "qmldesigner" was removed
in cmake build scripts by last refactoring.

For other ui helper tools in libexec is already a
working qt.conf which can be reused.

Task-number: QDS-8308
Change-Id: I7e98d0187cf2748298da263e55a64918cbb6b2c0
Reviewed-by: Eike Ziller <eike.ziller@qt.io>
2022-11-16 15:35:01 +00:00