diff options
| author | Frederik Gladhorn <frederik.gladhorn@digia.com> | 2014-01-10 18:27:48 +0100 |
|---|---|---|
| committer | Frederik Gladhorn <frederik.gladhorn@digia.com> | 2014-01-10 18:27:49 +0100 |
| commit | 7917dfbf1c54150d0ca3a79285767c22e6f9d770 (patch) | |
| tree | a05973334097df480afe32d07db42f381b460e74 /mkspecs/macx-ios-clang/features/qt.prf | |
| parent | b9362903b339e57362a7a3296904504521d0e26f (diff) | |
| parent | b088e4827f427189334e8a1c5b4f2b8b0b713fc2 (diff) | |
Merge remote-tracking branch 'origin/stable' into dev
Change-Id: I99af0bef7f1c931533a324ebcfb27c40ee871a5e
Diffstat (limited to 'mkspecs/macx-ios-clang/features/qt.prf')
| -rw-r--r-- | mkspecs/macx-ios-clang/features/qt.prf | 7 |
1 files changed, 1 insertions, 6 deletions
diff --git a/mkspecs/macx-ios-clang/features/qt.prf b/mkspecs/macx-ios-clang/features/qt.prf index 9202a70a5a..04ebb1208a 100644 --- a/mkspecs/macx-ios-clang/features/qt.prf +++ b/mkspecs/macx-ios-clang/features/qt.prf @@ -42,12 +42,7 @@ equals(TEMPLATE, app):contains(QT, gui(-private)?) { !isEmpty(QMAKE_PRE_LINK): \ QMAKE_PRE_LINK += ";" - QMAKE_PRE_LINK += \ - "for f in $(find $${objects_dir} -name '*.o'); do" \ - "(nm $f | grep -q 'T _main' && cp $f $f.original" \ - "&& ld -r -alias _main _qt_main -unexported_symbol _main $f.original -o $f)" \ - "|| true" \ - "; done" + QMAKE_PRE_LINK += $$QMAKESPEC/rename_main.sh $${objects_dir} } } |