Commit Graph

22 Commits

Author SHA1 Message Date
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
c9fd5465eb Merge remote-tracking branch 'origin/11.0'
Conflicts:
	cmake/QtCreatorIDEBranding.cmake
	qbs/modules/qtc/qtc.qbs

Change-Id: I0b0394dd68cf89b2579d623af897f55dc01aeea5
2023-08-25 11:50:14 +02:00
Eike Ziller
549e17ee84 macOS: Allow apps be debugged via process stub
This fixes debugging with "Run in Terminal".
We usually do not use the disclaim tool when debugging,
because LLDB does that itself, but it looks like not having
get-task-allow prevents that in the first place.

Add that and disable-library-validation (which is needed for
get-task-allow when notarizing) to our process stub.

Fixes: QTCREATORBUG-29497
Change-Id: I86c184b2b108b62822bf89d80ea2b4ca9190f5b8
Reviewed-by: <github-actions-qt-creator@cristianadam.eu>
Reviewed-by: Marcus Tillmanns <marcus.tillmanns@qt.io>
2023-08-25 09:45:10 +00:00
Marcus Tillmanns
a280abe0c1 Installer: Add README.md for mac specifics
Change-Id: Ifd207bd7b1ec79f53060691dcc2bbfd6ebe6cd01
Reviewed-by: Eike Ziller <eike.ziller@qt.io>
2023-08-25 08:46:05 +00:00
Marcus Tillmanns
ee4fc5b801 macOS: Allow debugging Qt Creator
Fixes: QTCREATORBUG-29010
Change-Id: I349d2dcd383613661c1faad3104f211d6c6ce028
Reviewed-by: <github-actions-qt-creator@cristianadam.eu>
Reviewed-by: Eike Ziller <eike.ziller@qt.io>
2023-04-13 10:57:54 +00:00
Eike Ziller
53ca84e286 Merge remote-tracking branch 'origin/9.0' into 10.0
Change-Id: Ib55043ed36efe6654930e620967438fd353ed5e0
2023-02-28 10:24:45 +01:00
Eike Ziller
78d17390b8 macOS: Allow Squish to attach itself for RTA
https://kb.froglogic.com/squish/mac/troubleshoot/hardened-runtime/#which-entitlements-squish-needs

Fixes: SQUISH-15904
Change-Id: Ib3a07ce2cb33d8fef63b21b19af3b7aabbab88ea
Reviewed-by: Christian Stenger <christian.stenger@qt.io>
2023-02-27 13:30:28 +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
Eike Ziller
2829412e15 macOS: Fix 'disclaim' in packages not passing on DYLD_... variables
Signed executables with hardened runtime need the entitlement
com.apple.security.cs.allow-dyld-environment-variables
to be able to pass on the DYLD_... variables to subprocesses.

Fixes: QTCREATORBUG-27175
Change-Id: Ibc203487be4d7111fc60b05749cae4e3ad750b3d
Reviewed-by: Tor Arne Vestbø <tor.arne.vestbo@qt.io>
2022-03-11 08:43:59 +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
Eike Ziller
c1c2af670c Fix signing/notarization for QtScript, QML, and opening Terminals
The former two require privileges for executable memory/jit, the latter
uses AppleScript.

Fixes: QTCREATORBUG-23746
Change-Id: I551af0893dc7724d8f7dc3c97fc856eda504d45b
Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>
2020-04-09 10:17:34 +00:00
Eike Ziller
c34864ccab macOS: Disable library validation when signing
So we can load 3rdparty plugins even when the app is signed and notarized.
Also give Qt Creator "debugging" capabilities, allowing it to attach
to processes.

Change-Id: Ia6bb8ab279920b75a96777eafebbb4e7454fda46
Reviewed-by: Eike Ziller <eike.ziller@qt.io>
2020-02-19 12:53:02 +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
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
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
e0b518b832 OSX: Fix deployment of qml puppets
They are no longer app bundles

Change-Id: Ia2b9c62d478ae4ccacb20dc20eda44695d0fe960
Reviewed-by: Tim Jenssen <tim.jenssen@digia.com>
2014-08-22 12:44:47 +02:00
Fawzi Mohamed
ca3e082b35 packaging: fix qt.conf for ios tools
Qt 5.3.1 does not set the profix only based on the use of QGuiApplication
but actually checks if the app is a bundle, so the Prefix hack in the
qt.conf for the ios tools is not needed anymore.

Task-number: QTCREATORBUG-12393
Change-Id: I6a228d83370bc62929ffd056b9b3051e4562485e
Reviewed-by: Jani Heikkinen <jani.heikkinen@digia.com>
Reviewed-by: Kai Koehne <kai.koehne@digia.com>
Reviewed-by: Eike Ziller <eike.ziller@digia.com>
2014-06-12 10:25:37 +02:00
Eike Ziller
c05e9d52b2 Ios: Move tools to <libexec>/ios, make them lowercase, fix deployment
They can't be directly in libexec path, because then they couldn't have
their own qt.conf for resolving the Cocoa platform plugin.

Change-Id: I8f3fae85c548747a7d826c078c7ac1fb0a836b43
Reviewed-by: Fawzi Mohamed <fawzi.mohamed@digia.com>
2013-10-07 15:32:10 +02:00
Eike Ziller
455d597ac3 Fix deploying Qt on Mac (qt quick imports)
Since we are using Qt Quick 2 now, Qt Creator also needs to find the Qt
Quick 2 imports.
Also make qmlpuppet (Qt Quick 1) optional for deploying Qt.

Task-number: QTBUG-33545

Change-Id: I296e4b3a1827f7b26841e94e15eda718afef81d0
Reviewed-by: Tim Jenssen <tim.jenssen@digia.com>
2013-09-26 15:43:37 +02:00
Eike Ziller
71f1919de9 Mac: Deploy and patch qml imports and qml2puppet
The patching of imports and plugins is done automatically by macdeployqt,
we need to pass it the qml2puppet executable though.
Also add Qml2Imports to the qml(2)puppet's qt.conf.

Task-number: QTCREATORBUG-9136
Change-Id: I9cb21d104f4c0c42531facfc6bc92fa9663e95a9
Reviewed-by: Thomas Hartmann <Thomas.Hartmann@digia.com>
2013-04-30 09:18:43 +02:00
Eike Ziller
175fbece76 qmlpuppet: Point it to deployed Qt plugins as well.
With Qt5 qmlpuppet needs to find a platform plugin.

Task-number: QTCREATORBUG-8447
Change-Id: I701d17da7f68dfcdfaeda171e2421488462692eb
Reviewed-by: Thomas Hartmann <Thomas.Hartmann@digia.com>
Reviewed-by: Fawzi Mohamed <fawzi.mohamed@digia.com>
2012-12-17 12:44:08 +01:00
Eike Ziller
d8a3b3a1e9 Mac/deployqt: Give qmlpuppet the correct qt.conf
Change-Id: I73162205f8ed9978eeaca2a91e331d2e323b15ef
Reviewed-by: Daniel Molkentin <daniel.molkentin@nokia.com>
2012-01-24 17:21:13 +01:00