aboutsummaryrefslogtreecommitdiffstats
path: root/scripts/deployqtHelper_mac.sh
Commit message (Collapse)AuthorAgeFilesLines
* Specify absolute path to macdeployqtJake Petroules2017-04-191-2/+2
| | | | | | | | | | | 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>
* macOS: Fix deployment of clang helpersEike Ziller2017-03-301-8/+4
| | | | | | | | | | 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>
* deployqtHelper_mac: Add helper variable for resource pathEike Ziller2017-03-301-21/+22
| | | | | | | Shortens strings Change-Id: Idba3130e07ec99ecd370a75a2bd257223ce1f966 Reviewed-by: Christian Stenger <christian.stenger@qt.io>
* macOS: Fix deployment of qbs_processlauncher and qbs-create-projectEike Ziller2017-03-301-1/+3
| | | | | Change-Id: If38d11b452dc37dc3a5694c57d43a7a4e1635904 Reviewed-by: Christian Stenger <christian.stenger@qt.io>
* Merge remote-tracking branch 'origin/4.1' into 4.2Eike Ziller2016-10-241-2/+0
|\ | | | | | | | | | | | | | | Conflicts: scripts/deployqtHelper_mac.sh src/plugins/ios/iostoolhandler.cpp Change-Id: I06219e1c137e8f58f295da423363360457fa0b11
| * Remove deployment of iossim toolVikas Pachdha2016-10-201-2/+0
| | | | | | | | | | | | | | 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>
* | Ship qtdiag in binary packagesEike Ziller2016-09-151-5/+15
| | | | | | | | | | | | Task-number: QTCREATORBUG-16135 Change-Id: I29aabb697feaf6546c807263b037d70abc0cc5eb Reviewed-by: Eike Ziller <eike.ziller@qt.io>
* | deployqtHelper: Assign names to command line argumentsEike Ziller2016-09-081-38/+44
|/ | | | | Change-Id: I3870ce09c399743f30fa81ae3df51f65d47697b4 Reviewed-by: Eike Ziller <eike.ziller@qt.io>
* Fix that clang static analyzer did not find built-in headersEike Ziller2016-08-181-3/+5
| | | | | | | | | 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>
* Update License according to aggrement with Free Qt FoundationTobias Hunger2016-01-191-0/+26
| | | | | | | | | * 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>
* Fix deployment of qml2puppetEike Ziller2015-10-191-1/+7
| | | | | | | | | | | | 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>
* Follow-up fixes for the libexec path changeEike Ziller2015-07-151-7/+2
| | | | | | | | | | The fallback puppet must be found in libexecPath now. Deployment on OS X must also be adapted to the new location. Broke with 6d5a5aff9462b4253047f0ed2707ffa2e3497a19 Change-Id: I8dc3d62188a2f19a7e203f939bd88065fb0504f8 Reviewed-by: Christian Kandeler <christian.kandeler@theqtcompany.com> Reviewed-by: Thomas Hartmann <Thomas.Hartmann@digia.com>
* Deploy only the clang binary and its link targetEike Ziller2015-07-101-2/+6
| | | | | | | | | 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>
* OS X: Deploy clang binary for use by static analyzerEike Ziller2015-07-091-0/+2
| | | | | Change-Id: I0047cb33e7267b84310307eb3bb0f6c0d6b31bc5 Reviewed-by: Eike Ziller <eike.ziller@theqtcompany.com>
* OS X: Fix deployment of toolsEike Ziller2015-06-231-4/+8
| | | | | | | | | - 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>
* Run macdeployqt for the remaining auxiliary executables.Jake Petroules2015-05-181-0/+10
| | | | | | | | | 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>
* OS X: Make deployment of clang lib less fragile.Eike Ziller2015-02-271-1/+2
| | | | | | | | | 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>
* OS X: Avoid running macdeployqt twice and add more deploy debug outputEike Ziller2014-10-281-10/+15
| | | | | Change-Id: I0d1c46fcf7b05fc6673f0eddbfcc95490a46c4cd Reviewed-by: Eike Ziller <eike.ziller@theqtcompany.com>
* OS X: deployqtHelper: never deploy anyting twiceEike Ziller2014-10-271-29/+54
| | | | | | | | | | | | | | | | | | 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>
* Scripts: Fix deployment of qmlpuppets on OSXv3.2.1Christian Stenger2014-09-121-2/+2
| | | | | Change-Id: Ic312423ff7d79b652379d7512a75be043a33740b Reviewed-by: Eike Ziller <eike.ziller@digia.com>
* Fix the clang deployment fixEike Ziller2014-08-281-1/+1
| | | | | | | it needs a / at the end ... Change-Id: I546d70bf8e1d70ca3e08e3d563e427a96ad73209 Reviewed-by: Eike Ziller <eike.ziller@digia.com>
* Fix deployment of clang libraryEike Ziller2014-08-271-1/+1
| | | | | | | | Since the plugins moved in 6aad96d89b5cd4f8b7e06b72cf911054c5d89037, 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>
* OSX: Fix deployment of qml puppetsEike Ziller2014-08-221-10/+4
| | | | | | | They are no longer app bundles Change-Id: Ia2b9c62d478ae4ccacb20dc20eda44695d0fe960 Reviewed-by: Tim Jenssen <tim.jenssen@digia.com>
* ios: fix deploy script for iossim_1_8_2Fawzi Mohamed2014-07-291-0/+1
| | | | | | | | | | 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>
* Fix deployment of clang code model plugin.Eike Ziller2014-07-151-2/+2
| | | | | | | Broke with the removal of the QtProject subdir for plugins Change-Id: Ic42d3e9b902f7ac228e62923093dfe6af01b2d19 Reviewed-by: Nikolai Kosjar <nikolai.kosjar@digia.com>
* Clang/Mac: also deploy the header resources.Eike Ziller2014-02-121-0/+1
| | | | | Change-Id: I0c7abe70dd45216d15a9a62d87c0fda8105cf9a8 Reviewed-by: Eike Ziller <eike.ziller@digia.com>
* Mac: Don't fail with error if deployqt is called multiple timesEike Ziller2014-02-041-2/+4
| | | | | Change-Id: I19753fab58dae1e430adc76b96af4ef7ea690995 Reviewed-by: Eike Ziller <eike.ziller@digia.com>
* Mac: Deploy libclang if neededEike Ziller2014-02-041-0/+11
| | | | | Change-Id: Ia60d4bc3fd8899da51e3c71ef6a514fb3f52f1e2 Reviewed-by: Eike Ziller <eike.ziller@digia.com>
* Ios: Move tools to <libexec>/ios, make them lowercase, fix deploymentEike Ziller2013-10-071-1/+7
| | | | | | | | 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>
* Fix deploying Qt on Mac (qt quick imports)Eike Ziller2013-09-261-5/+11
| | | | | | | | | | | 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>
* Mac: Deploy and patch qml imports and qml2puppetEike Ziller2013-04-301-4/+24
| | | | | | | | | | 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>
* Mac: deploy all Qt translation files.v2.6.1tqtc/v2.6.1Eike Ziller2012-12-171-1/+1
| | | | | | | | | 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>
* Fix deployment of designer plugins.Eike Ziller2012-12-101-4/+13
| | | | | | | | | 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>
* Deploy Qt translations on Mac.Eike Ziller2012-11-281-0/+7
| | | | | | | | Task-number: QTCREATORBUG-8244 Change-Id: I39bd64bb7a3e75b54f3f0b9297a27b460b603cc9 Reviewed-by: Kai Koehne <kai.koehne@digia.com> Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@digia.com>
* Mac: use the deployed Qt for sdktoolEike Ziller2012-10-191-1/+2
| | | | | | | Task-number: QTCREATORBUG-7926 Change-Id: I546dc1e899b6efbce3742046f1b5cc83a9c69612 Reviewed-by: Tim Jenssen <tim.jenssen@digia.com>
* no qmlprofiler tool anymore, don't try to deploy Qt for itEike Ziller2012-05-221-2/+1
| | | | | Change-Id: I2e8711cba614fd64d4af0dced0b844cfda6b55c4 Reviewed-by: Kai Koehne <kai.koehne@nokia.com>
* Avoid deployqtHelper_mac message when directory already exists.Eike Ziller2012-01-301-1/+1
| | | | | Change-Id: Iff13147fd6541741b94f4bd2f611e05bd87a7885 Reviewed-by: Daniel Molkentin <daniel.molkentin@nokia.com>
* Mac/deployqt: Give qmlpuppet the correct qt.confEike Ziller2012-01-241-0/+8
Change-Id: I73162205f8ed9978eeaca2a91e331d2e323b15ef Reviewed-by: Daniel Molkentin <daniel.molkentin@nokia.com>
generated by cgit v1.2.3 (git 2.25.1) at 2024-05-03 03:42:38 +0000