diff options
author | Liang Qi <liang.qi@theqtcompany.com> | 2015-10-14 15:45:35 +0200 |
---|---|---|
committer | Liang Qi <liang.qi@theqtcompany.com> | 2015-10-14 15:45:35 +0200 |
commit | 4456984da780b14572e1ec0f079a4d349ab299bd (patch) | |
tree | f586a281a81c57c91c49e83a5d3ec6c7eece0578 /mkspecs/macx-xcode/default.xcscheme | |
parent | e824abd987d77efaa085fe1f9fb514d270798d55 (diff) | |
parent | 281121697340084f7d385eab530f41916789b94d (diff) |
Merge remote-tracking branch 'origin/5.6' into dev
Conflicts:
tests/auto/corelib/io/qfile/tst_qfile.cpp
tests/auto/corelib/io/qprocess/tst_qprocess.cpp
tests/auto/corelib/tools/qversionnumber/qversionnumber.pro
Change-Id: Ia93ce500349d96a2fbf0b4a37b73f088cc505c6e
Diffstat (limited to 'mkspecs/macx-xcode/default.xcscheme')
-rw-r--r-- | mkspecs/macx-xcode/default.xcscheme | 7 |
1 files changed, 7 insertions, 0 deletions
diff --git a/mkspecs/macx-xcode/default.xcscheme b/mkspecs/macx-xcode/default.xcscheme index 4a16fefca0..ab2f6a8ab7 100644 --- a/mkspecs/macx-xcode/default.xcscheme +++ b/mkspecs/macx-xcode/default.xcscheme @@ -73,6 +73,13 @@ ReferencedContainer = "container:@QMAKE_ORIG_TARGET@.xcodeproj"> </BuildableReference> </BuildableProductRunnable> + <EnvironmentVariables> + <EnvironmentVariable + key = "DYLD_IMAGE_SUFFIX" + value = "$(QT_LIBRARY_SUFFIX)" + isEnabled = "YES"> + </EnvironmentVariable> + </EnvironmentVariables> <AdditionalOptions> </AdditionalOptions> </LaunchAction> |