Commit Graph

34 Commits

Author SHA1 Message Date
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
Eike Ziller
3c2ec64dae OS X: deployqtHelper: never deploy anyting twice
There are targets that have a "depends" on "deployqt",
and since the Makefile doesn't know any specifics, the deployqtHelper
script is run twice when calling e.g.
make deployqt
make codesign
make dmg

That results in the "make dmg" calling the helper script again, which
overwrites for example the previously signed designer plugins with
the unsigned original again, leading to code signature verification
failure. This became only apparent since OS X 10.9 changed to always
do deep verification of signatures.

Change-Id: I36ec6de1a7d184800c59a3db47e01afedc0e6879
Reviewed-by: Eike Ziller <eike.ziller@theqtcompany.com>
2014-10-27 10:59:19 +01:00
Christian Stenger
602746950b Scripts: Fix deployment of qmlpuppets on OSX
Change-Id: Ic312423ff7d79b652379d7512a75be043a33740b
Reviewed-by: Eike Ziller <eike.ziller@digia.com>
2014-09-12 14:16:03 +02:00
Eike Ziller
3237a5166b Fix the clang deployment fix
it needs a / at the end ...

Change-Id: I546d70bf8e1d70ca3e08e3d563e427a96ad73209
Reviewed-by: Eike Ziller <eike.ziller@digia.com>
2014-08-28 09:38:10 +02:00
Eike Ziller
7d23c50502 Fix deployment of clang library
Since the plugins moved in 6aad96d89b,
the rpath of the clang code model plugin was broken for deployed clang library.

Change-Id: I5d59390540918c73a2cd217bb5ebf8f947122f01
Reviewed-by: Erik Verbruggen <erik.verbruggen@digia.com>
2014-08-27 13:21:57 +02: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
efbdd5297a ios: fix deploy script for iossim_1_8_2
iossim_1_8_2 (the tool used to deploy to the simulator with Xcode
<=5.0.x) wasen't being "qtdeployed", and had incorrect library paths.
This made deploy to simulator fail on older Xcode installations.

Task-number: QTCREATORBUG-12753
Change-Id: Iecae2938daa0f7180c1fa576c62dd519ac7846d5
Reviewed-by: Kai Koehne <kai.koehne@digia.com>
2014-07-29 17:24:07 +02:00
Eike Ziller
2e88a7f6c9 Fix deployment of clang code model plugin.
Broke with the removal of the QtProject subdir for plugins

Change-Id: Ic42d3e9b902f7ac228e62923093dfe6af01b2d19
Reviewed-by: Nikolai Kosjar <nikolai.kosjar@digia.com>
2014-07-15 08:21:55 +02:00
Eike Ziller
9793ae8236 Clang/Mac: also deploy the header resources.
Change-Id: I0c7abe70dd45216d15a9a62d87c0fda8105cf9a8
Reviewed-by: Eike Ziller <eike.ziller@digia.com>
2014-02-12 08:25:28 +01:00
Eike Ziller
0eae696743 Mac: Don't fail with error if deployqt is called multiple times
Change-Id: I19753fab58dae1e430adc76b96af4ef7ea690995
Reviewed-by: Eike Ziller <eike.ziller@digia.com>
2014-02-04 16:38:23 +01:00
Eike Ziller
5081d032cb Mac: Deploy libclang if needed
Change-Id: Ia60d4bc3fd8899da51e3c71ef6a514fb3f52f1e2
Reviewed-by: Eike Ziller <eike.ziller@digia.com>
2014-02-04 10:56:25 +01: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
3b112a0fa7 Mac: deploy all Qt translation files.
We cannot know which module translation files might be needed, so simply
copy all .qm files in Qt's translation directory.

Task-number: QTCREATORBUG-8448
Change-Id: If359f1af67d093c3eeb42855877622b3416a3f41
Reviewed-by: Tim Jenssen <tim.jenssen@digia.com>
2012-12-17 17:18:37 +01:00
Eike Ziller
89dc3eebd0 Fix deployment of designer plugins.
Task-number: QTCREATORBUG-8256

Change-Id: I9b03debf9c4c918968fcdfd49078218b54a3b09f
Reviewed-by: Michael Bruning <michael.bruning@digia.com>
Reviewed-by: Friedemann Kleint <Friedemann.Kleint@digia.com>
Reviewed-by: Tim Jenssen <tim.jenssen@digia.com>
2012-12-10 13:53:02 +01:00
Eike Ziller
8665421a3b Deploy Qt translations on Mac.
Task-number: QTCREATORBUG-8244

Change-Id: I39bd64bb7a3e75b54f3f0b9297a27b460b603cc9
Reviewed-by: Kai Koehne <kai.koehne@digia.com>
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@digia.com>
2012-11-28 09:47:03 +01:00
Eike Ziller
144fef6b69 Mac: use the deployed Qt for sdktool
Task-number: QTCREATORBUG-7926

Change-Id: I546dc1e899b6efbce3742046f1b5cc83a9c69612
Reviewed-by: Tim Jenssen <tim.jenssen@digia.com>
2012-10-19 11:16:09 +02:00
Eike Ziller
fd5b22062c no qmlprofiler tool anymore, don't try to deploy Qt for it
Change-Id: I2e8711cba614fd64d4af0dced0b844cfda6b55c4
Reviewed-by: Kai Koehne <kai.koehne@nokia.com>
2012-05-22 10:11:19 +02:00
Eike Ziller
2f021edfdd Avoid deployqtHelper_mac message when directory already exists.
Change-Id: Iff13147fd6541741b94f4bd2f611e05bd87a7885
Reviewed-by: Daniel Molkentin <daniel.molkentin@nokia.com>
2012-01-30 10:29:04 +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