Commit Graph

398 Commits

Author SHA1 Message Date
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
Artem Sokolovskii
60cd36ed31 ClangFormat: Remove deprecated entries in clangformatconfigwidget
Task-number: QTCREATORBUG-28263
Change-Id: I48b0456f3c7bea88905cea40d1e447655da64676
Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>
2022-10-19 12:39:31 +00:00
Eike Ziller
c319163e66 build.py/CPack: Install to /opt from .deb packages
Default is /usr/local, and that is also the default when
installing self-built versions, so avoid a conflict.

Change-Id: I92879baa4afd1b90b7de6addfbcd7ec361b396cc
Reviewed-by: Cristian Adam <cristian.adam@qt.io>
Reviewed-by: <github-actions-qt-creator@cristianadam.eu>
2022-10-13 06:17:15 +00:00
Eike Ziller
c72a9197a4 build.py: Add option to call cpack
Adds --with-cpack option.

- macOS: does nothing (we already create a better, signed disk image)
- Linux: creates qtcreator.deb in build directory
- Windows: Checks for NSIS and WIX installation,
  creates qtcreator.exe and qtcreator.msi as appropriate

Change-Id: Ie7816d04cb2e01e90795481e1519b0a6645f5cd3
Reviewed-by: Cristian Adam <cristian.adam@qt.io>
2022-10-07 09:15:33 +00:00
Alessandro Portale
bbd64a2c94 Improve scripts/scrubts.py
List the same duplicates that lrelease shows. But better: all
occurrences with full filename:linenumber.

Change-Id: If0cf38183dbdb4118f2152e1ae86ec92bf0ae1cc
Reviewed-by: Alessandro Portale <alessandro.portale@qt.io>
2022-09-27 06:55:06 +00:00
Cristian Adam
5bcb2e4c58 scripts: Remove clangbackend from deployqtHelper_mac.sh
Since we moved to clangd the file doesn't exist anymore.

When creating the dmg packaging the process would print
multiple errors pointing to the fact that the clangbackend
file doesn't exist.

Change-Id: I172cfa43e67ec4aa9e5e2f8b703e024b803c78a1
Reviewed-by: <github-actions-qt-creator@cristianadam.eu>
Reviewed-by: Eike Ziller <eike.ziller@qt.io>
2022-09-26 13:25:50 +00:00
Alessandro Portale
f2e51011d4 scripts: Fix line number output in scrubts.py
Change-Id: I9e67ba1fe81264d6f0fde42021489c696574065f
Reviewed-by: Alessandro Portale <alessandro.portale@qt.io>
2022-09-09 21:54:47 +00:00
Alessandro Portale
c21b150aa8 scripts: Improve scrubts.py
Output statistics on removed duplicate messages and merged contexts.
List remaining duplicate messages with identical source but different
translation.

Change-Id: If06f5cfc898c6261863cc53a3c464efead1d9890
Reviewed-by: Alessandro Portale <alessandro.portale@qt.io>
2022-09-09 21:44:26 +00:00
Alessandro Portale
024c327993 scripts: Add scrubts.py for .ts file cleanup
Rewrites a .ts file, removing duplicate messages of a specified
translation context and joining adjacent occurrences of that context.
Unlike lrelease and lconvert, this script does an exact comparison of
the whole <message/> xml tag.

Use on all .ts files:
 for tsfile in share/qtcreator/translations/qtcreator_*.ts; do python
scripts/scrubts.py $tsfile -context FooBar; done

Change-Id: I2dea5a0b00e35031718e654b289d6ad39dbaac2a
Reviewed-by: <github-actions-qt-creator@cristianadam.eu>
Reviewed-by: hjk <hjk@qt.io>
2022-09-02 07:23:46 +00:00
Christian Stenger
dd2d05a772 Scripts: Fix permissions
Broke with a7956df3ca.

Change-Id: I072ea34183aedf2fd693af1bb589660aa06b9e1c
Reviewed-by: Eike Ziller <eike.ziller@qt.io>
2022-08-29 09:32:13 +00:00
Lucie Gérard
a7956df3ca Use SPDX license identifiers
Replace the current license disclaimer in files by
a SPDX-License-Identifier.

Task-number: QTBUG-67283
Change-Id: I708fd1f9f2b73d60f57cc3568646929117825813
Reviewed-by: Eike Ziller <eike.ziller@qt.io>
2022-08-26 12:27:18 +00:00
Artem Sokolovskii
79aaf155b7 ClangFormat: Update generateClangFormatChecksUI script
Now relay on clang/Format.h file not on ClangFormatStyleOptions.rst.
The information from Format.h is more complete, reliable and easy
parsable.

Change-Id: I96899257f5fd075bfd6e51c5a4fa70a614c32398
Reviewed-by: <github-actions-qt-creator@cristianadam.eu>
Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>
2022-07-29 11:14:22 +00:00
Cristian Adam
22b8f3bdcd scripts: Deploy clang-format tool
The beautifier plugin can use the clang-format tool, which is statically
build, and it's around 2-6 MB in size.

Fixes: QTCREATORBUG-25600
Change-Id: I900f0dbfc2ba2773d3ad986c149adb41a4103e94
Reviewed-by: Alessandro Portale <alessandro.portale@qt.io>
Reviewed-by: <github-actions-qt-creator@cristianadam.eu>
2022-06-27 15:40:18 +00:00
Cristian Adam
61f04d260c scripts: remove deployment of libclang-cpp
All the clang binaries that we ship (clangd, clang-tidy,
clazy-standalone) are compiled statically and libclang-cpp
is not needed anymore.

Change-Id: I486fc0d1a55a18916c0abf56ec6a966321ef2b46
Reviewed-by: Eike Ziller <eike.ziller@qt.io>
Reviewed-by: <github-actions-qt-creator@cristianadam.eu>
2022-06-22 08:29:14 +00:00