Commit Graph

70 Commits

Author SHA1 Message Date
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
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
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
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
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
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
Cristian Adam
cdedc71182 scripts: Do not deploly clang and clang-cl executables
They were used in debugging of the libclang code model, and having
only the compiler is not very useful.

Users can install complete LLVM toolchains from llvm.org

Change-Id: If19a0b75c8505ba7589b377292bd96f855e91c00
Reviewed-by: <github-actions-qt-creator@cristianadam.eu>
Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org>
Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>
Reviewed-by: Eike Ziller <eike.ziller@qt.io>
2022-06-17 14:05:03 +00:00
Cristian Adam
28497d928b Scripts: Do not deploy libclang anymore
Since libclang is no longer needed, we don't need to deploy the
library anymore.

Change-Id: Ia7bdb7e089ec95b8252efbfa1c607d03082a99e6
Reviewed-by: Eike Ziller <eike.ziller@qt.io>
2022-05-25 09:45:10 +00:00
Eike Ziller
d2e1590aec macOS: Do not deploy some plugins and their dependencies
macdeployqt deploys all plugins of a kind, like all tls or sql backends.
We only want the securetransport and sqlite ones from these, and
since Qt 6.3 now also builds the openssl backend, and the postgres backend
has a dependency on openssl that gets shipped, we end up with issues
(openssl backend being loaded which finds and loads openssl from postgres).

So clean these things up after macdeployqt.

Change-Id: Iccbe4c422a4cce3fd4da0af5f6e2595f85848ece
Reviewed-by: <github-actions-qt-creator@cristianadam.eu>
Reviewed-by: Tim Jenssen <tim.jenssen@qt.io>
2022-04-08 14:18:17 +00:00
Eike Ziller
81c1c63c1d macOS: Remove workarounds for Qt 6.2 betas
QTBUG-94796 is fixed, and macdeployqt copies all the plugins again.

Change-Id: I1f8201483e9cf4986eea0732d75d545425d3b5d6
Reviewed-by: Tim Jenssen <tim.jenssen@qt.io>
Reviewed-by: <github-actions-qt-creator@cristianadam.eu>
2022-04-08 14:18:08 +00:00
Eike Ziller
998abe9b7a macOS/deployHelper: Accept if clazy-standalone already has right rpath
Adding an already existing rpath is an error for install_name_tool.
Not completely failing in that case makes local testing easier.

Change-Id: I22d94225af2375af4e397212b2a7500315f25882
Reviewed-by: Christian Stenger <christian.stenger@qt.io>
Reviewed-by: <github-actions-qt-creator@cristianadam.eu>
2022-01-10 10:57:54 +00:00
Eike Ziller
9121372f9c macOS: Remove absolute RPATH from clazy-standalone
Remove the absolute RPATH to somewhere on the build machine,
which creates issues when loading Qt Creator on macOS 10.14,
and of course is bogus in any case.

Fixes: QTCREATORBUG-26196
Change-Id: Ic92deb9b2c6fe32f377fc31004779a2a43794054
Reviewed-by: Christian Stenger <christian.stenger@qt.io>
2021-09-15 08:33:07 +00:00
Eike Ziller
1030715abc Do not try to deploy qbs-qmltypes, it's gone
Change-Id: I5cfe8c2e7e4e3aff6aad66d1979304522529cbf4
Reviewed-by: Christian Stenger <christian.stenger@qt.io>
2021-09-02 07:40:17 +00:00
Tim Jenssen
0588161edd macOS: workaround for missing libqsvg.dylib
Change-Id: Ibc0e758eab53f92978458f0c9a1be505c9421439
Reviewed-by: Tim Jenssen <tim.jenssen@qt.io>
2021-08-23 16:15:28 +00:00
Tim Jenssen
8d222e22d5 deploy tls plugins to fix ssl downloads
it fixes https example downloads in QtDesignStudio

Change-Id: Ib162e630ae3a66691bec6d8f32cee241614e01e6
Reviewed-by: Eike Ziller <eike.ziller@qt.io>
2021-08-09 14:56:30 +00:00
Tim Jenssen
9857985013 macOS: workaround for missing libqsqlite.dylib
Change-Id: I667d144035a36aed55f2bdc3e6e021832c058236
Reviewed-by: Tim Jenssen <tim.jenssen@qt.io>
2021-07-15 16:53:49 +00:00
Eike Ziller
9e8cfe1a41 macOS: Remove clangrefactoring/pchmanager from deployment
They are gone for real now

Change-Id: I653ed1ce1591d839a5ba01d00ef18c590d44100a
Reviewed-by: Marco Bubke <marco.bubke@qt.io>
2021-06-25 07:15:11 +00:00
Eike Ziller
8edae33b42 macOS: Fix deployment of QML2 imports
Amends e101e83f84

Change-Id: I43ee85d9e0c144ec9a25d811d17604c91e709cd8
Reviewed-by: Tim Jenssen <tim.jenssen@qt.io>
2020-11-10 12:08:06 +00:00
Eike Ziller
e101e83f84 Do not try to deploy QtQuick1 imports
We don't ship them with Qt Creator since a longer time now, and in Qt6
they are completely gone.

Change-Id: I7c6b1da1782cb641e17b2d1c7ff764dd81e15ee6
Reviewed-by: Thomas Hartmann <thomas.hartmann@qt.io>
Reviewed-by: Eike Ziller <eike.ziller@qt.io>
2020-11-06 06:57:10 +00:00
Christian Stenger
ed678000a1 Scripts: Fix deploying assetimporters on macOS
Change-Id: If990ab8f5dcf482c671d8f39655f5372f8896fd3
Reviewed-by: Eike Ziller <eike.ziller@qt.io>
2020-10-28 13:13:07 +00:00
Eike Ziller
ded5c64d53 Fix deployment of clazy-standalone
On Linux and macOS, clazy-standalone links against some dynamic
libraries which we need to ship.

Fixes: QTCREATORBUG-24344
Change-Id: I4946d2ae22fc9363445e6a3eecb8d9e40be5ef0e
Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>
Reviewed-by: Christian Stenger <christian.stenger@qt.io>
2020-07-17 06:23:03 +00:00
Eike Ziller
e41f71caac macOS deploy: Remove debug folders from deployed Qt and deploy qbs on demand
Change-Id: I2cd60da041c580e6599d867f1a95c2f868f4a800
Reviewed-by: Christian Stenger <christian.stenger@qt.io>
2019-11-05 12:34:35 +00:00
Eike Ziller
4843216192 macOS: Fix execution of helper executables with UI
The qt.conf that is written into the Resources/ folder
is used for the main Qt Creator executable, so that cannot
be used for the helper executables.

Move the executables one more level down and add a separate qt.conf
for them.

Fixes: QTCREATORBUG-23120
Change-Id: Icd8842d246a1bc0e8d44656e2bc580d6698afbda
Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>
Reviewed-by: Christian Stenger <christian.stenger@qt.io>
2019-11-05 12:31:40 +00:00
Christian Stenger
7cec3cfc94 Scripts: Fix helper script on macOS
Broke with ca15e1ed0c.

Change-Id: Ife884234ff8716b3019f2d302598c887d1498a92
Reviewed-by: David Schulz <david.schulz@qt.io>
2019-10-29 05:55:39 +00:00
Tim Jenssen
ca15e1ed0c QmlDesigner: add 3d assetimporter plugins
macdeployqt was not enough because this is a runtime dependency

Change-Id: Idde6db46a4761288aec364cc83969a533e69816b
Reviewed-by: Eike Ziller <eike.ziller@qt.io>
2019-10-28 12:48:56 +00:00
Nikolai Kosjar
2a8a39f12b Deploy clazy-standalone for the ClangTools plugin
Change-Id: If554d3ade48da8d3877770d7e42af7185b30ceb6
Reviewed-by: Eike Ziller <eike.ziller@qt.io>
2019-10-08 07:52:17 +00:00
Nikolai Kosjar
835477b52f Deploy clang-tidy binary for the ClangTools plugin
Change-Id: I4491c985cdcb93ca94be491d1acb9d960f96a190
Reviewed-by: Eike Ziller <eike.ziller@qt.io>
2019-08-27 06:42:38 +00:00
Nikolai Kosjar
6d7a626910 Deploy clangd binary also on macOS
Amends c1a0d89732.

Change-Id: I81c23522d2332c9db442ceadf94559407fd3594f
Reviewed-by: Eike Ziller <eike.ziller@qt.io>
2019-08-02 07:29:50 +00:00
Jake Petroules
b377130509 Specify absolute path to macdeployqt
This script receives the QT_INSTALL_BINS directory as an input argument,
so make use of it so that the caller does not need to have that path in
the PATH in order to find macdeployqt.

Change-Id: I5e5197104119a19ecda83c3bbc256f3fe492c0a6
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@qt.io>
Reviewed-by: Gabriel de Dietrich <gabriel.dedietrich@qt.io>
Reviewed-by: Eike Ziller <eike.ziller@qt.io>
2017-04-19 01:44:38 +00:00
Eike Ziller
77135a342f macOS: Fix deployment of clang helpers
They worked but still had wrong, additional rpaths
to the Qt they were built with.
Remove handling of ClangCodeModel which doesn't link to clang
anymore.

Change-Id: I5c1fa59b3659dc8205b782fa8aac8b700b17a98a
Reviewed-by: Christian Stenger <christian.stenger@qt.io>
2017-03-30 10:48:05 +00:00
Eike Ziller
3af815089c deployqtHelper_mac: Add helper variable for resource path
Shortens strings

Change-Id: Idba3130e07ec99ecd370a75a2bd257223ce1f966
Reviewed-by: Christian Stenger <christian.stenger@qt.io>
2017-03-30 10:48:00 +00:00
Eike Ziller
efe2bf73af macOS: Fix deployment of qbs_processlauncher and qbs-create-project
Change-Id: If38d11b452dc37dc3a5694c57d43a7a4e1635904
Reviewed-by: Christian Stenger <christian.stenger@qt.io>
2017-03-30 10:47:54 +00:00
Eike Ziller
504a525b35 Merge remote-tracking branch 'origin/4.1' into 4.2
Conflicts:
	scripts/deployqtHelper_mac.sh
	src/plugins/ios/iostoolhandler.cpp

Change-Id: I06219e1c137e8f58f295da423363360457fa0b11
2016-10-24 08:31:00 +02:00
Vikas Pachdha
c1a46127cf Remove deployment of iossim tool
iossim tool no longer exists and it is replaced by Xcode's simctl tool

Change-Id: I4f4dbdc8b8e91663109c289b75a21dd92d966018
Reviewed-by: Christian Stenger <christian.stenger@qt.io>
2016-10-20 09:03:07 +00:00
Eike Ziller
f4f447c078 Ship qtdiag in binary packages
Task-number: QTCREATORBUG-16135
Change-Id: I29aabb697feaf6546c807263b037d70abc0cc5eb
Reviewed-by: Eike Ziller <eike.ziller@qt.io>
2016-09-15 09:24:36 +00:00
Eike Ziller
967b51d416 deployqtHelper: Assign names to command line arguments
Change-Id: I3870ce09c399743f30fa81ae3df51f65d47697b4
Reviewed-by: Eike Ziller <eike.ziller@qt.io>
2016-09-08 08:51:24 +00:00
Eike Ziller
c412e0bb2a Fix that clang static analyzer did not find built-in headers
Clang expects these to lie in "../lib/clang" relative to the clang
executable.

Change-Id: I216860876591dca1fd728e4b1e79b4b07c965620
Reviewed-by: Eike Ziller <eike.ziller@qt.io>
Reviewed-by: Nikolai Kosjar <nikolai.kosjar@qt.io>
2016-08-18 10:20:59 +00:00
Tobias Hunger
b1f757af23 Update License according to aggrement with Free Qt Foundation
* Make sure all scripts come with a license
* Update the license in the scripts
* Add scripts to help with license changes

Change-Id: I38a25aa1287ee8a75e0f0307d1b30320d781ad1f
Reviewed-by: Tobias Hunger <tobias.hunger@theqtcompany.com>
2016-01-19 15:44:55 +00:00
Eike Ziller
7fa6d51942 Fix deployment of qml2puppet
The move to LIBEXEC_PATH broke running the puppet from the packages on
Linux and OS X, because there it cannot find the platform plugin
anymore.
We need to add a qt.conf for it, and because Qt Creator.app/Contents/
Resources already contains the qt.conf for Qt Creator itself, the puppet
must also move to its own subdirectory on OS X.

Change-Id: I8e8cc48c49a01e10c7d7d3cc4c73020195cd5ca9
Reviewed-by: Thomas Hartmann <Thomas.Hartmann@digia.com>
2015-10-19 15:07:36 +00:00
Eike Ziller
68acdd7d0d Follow-up fixes for the libexec path change
The fallback puppet must be found in libexecPath now.
Deployment on OS X must also be adapted to the new location.
Broke with 6d5a5aff94

Change-Id: I8dc3d62188a2f19a7e203f939bd88065fb0504f8
Reviewed-by: Christian Kandeler <christian.kandeler@theqtcompany.com>
Reviewed-by: Thomas Hartmann <Thomas.Hartmann@digia.com>
2015-07-15 09:49:15 +00:00
Eike Ziller
366f0dacdc Deploy only the clang binary and its link target
Instead of all clang* which is too much on Windows (because they are
copies instead of links), and we don't want clang-check on Linux and OS X
either anyhow

Change-Id: Ia08cf09efa5a23ec6b83bc5df18d09558810f72d
Reviewed-by: Eike Ziller <eike.ziller@theqtcompany.com>
2015-07-10 09:03:10 +00:00
Eike Ziller
0f5775ef5d OS X: Deploy clang binary for use by static analyzer
Change-Id: I0047cb33e7267b84310307eb3bb0f6c0d6b31bc5
Reviewed-by: Eike Ziller <eike.ziller@theqtcompany.com>
2015-07-09 16:57:19 +00:00
Eike Ziller
e232648d79 OS X: Fix deployment of tools
- clangbackend missed deployment
- Fixed libclang location to be in Frameworks, and deploy missing dylib link
- Fixed deployment of buildoutputparser

Change-Id: I2b1fbd552bd0da6fef154fe1b6dac0a53b320483
Reviewed-by: Christian Stenger <christian.stenger@theqtcompany.com>
2015-06-23 07:36:31 +00:00
Jake Petroules
69d5fc1257 Run macdeployqt for the remaining auxiliary executables.
This fixes broken library paths for buildoutputparser and qbs
executables on OS X, making them unusable out of the box.

Task-number: QTCREATORBUG-14432
Change-Id: I81c64f962b0a1eee2800da04b5202f5fd9efb706
Reviewed-by: Eike Ziller <eike.ziller@theqtcompany.com>
2015-05-18 12:40:37 +00:00
Eike Ziller
b8db05c3ff OS X: Make deployment of clang lib less fragile.
Ensure that the correct rpath is added, even if we fail to remove
the old one.

Change-Id: I96e37d0e26b04f240300244aa93f434a60013410
Reviewed-by: Nikolai Kosjar <nikolai.kosjar@theqtcompany.com>
Reviewed-by: Eike Ziller <eike.ziller@theqtcompany.com>
2015-02-27 10:48:51 +00:00
Eike Ziller
acda46616b OS X: Avoid running macdeployqt twice and add more deploy debug output
Change-Id: I0d1c46fcf7b05fc6673f0eddbfcc95490a46c4cd
Reviewed-by: Eike Ziller <eike.ziller@theqtcompany.com>
2014-10-28 17:36:09 +01:00