diff options
| author | Eike Ziller <eike.ziller@qt.io> | 2022-12-20 11:05:01 +0100 |
|---|---|---|
| committer | Eike Ziller <eike.ziller@qt.io> | 2022-12-20 11:05:01 +0100 |
| commit | 3f4c3a3db448a5ddc23a317c95478b108ccebd0b (patch) | |
| tree | ee902de2bd973fdd03820f5c11e991e88f47dda3 /scripts/deployqtHelper_mac.sh | |
| parent | 68e15e613f4e3a20a055ad8a1ad0806c742d0770 (diff) | |
| parent | 77dfa71f0618278ff974d0f274bb87fc36c91077 (diff) | |
| download | qt-creator-3f4c3a3db448a5ddc23a317c95478b108ccebd0b.tar.gz | |
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
Diffstat (limited to 'scripts/deployqtHelper_mac.sh')
| -rwxr-xr-x | scripts/deployqtHelper_mac.sh | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/scripts/deployqtHelper_mac.sh b/scripts/deployqtHelper_mac.sh index 4109e6f31d..efcde54bdf 100755 --- a/scripts/deployqtHelper_mac.sh +++ b/scripts/deployqtHelper_mac.sh @@ -143,6 +143,9 @@ if [ ! -d "$app_path/Contents/Frameworks/QtCore.framework" ]; then fi +# clean up unneeded object files that are part of Qt for some static libraries +find "$app_path" -ipath "*/objects-*" -delete + # clean up after macdeployqt # it deploys some plugins (and libs for these) that interfere with what we want echo "Cleaning up after macdeployqt..." |