diff options
| author | Liang Qi <liang.qi@qt.io> | 2016-08-25 16:12:11 +0200 |
|---|---|---|
| committer | Liang Qi <liang.qi@qt.io> | 2016-08-25 16:12:11 +0200 |
| commit | c7cdf3aac7ef9571ce0c0cf25a2c8455c7604451 (patch) | |
| tree | ff17379a7643d47224a500714d825d561172a282 /mkspecs/macx-xcode | |
| parent | 3f64156e918a8cf5da1b68191a280f0daf3d954b (diff) | |
| parent | 1e6630b54ce9a005c2cffac4dac95641838e8231 (diff) | |
Merge remote-tracking branch 'origin/5.6' into 5.7
Conflicts:
src/corelib/mimetypes/qmimeprovider.cpp
src/corelib/mimetypes/qmimetype.cpp
Change-Id: Ib483ddb6bfc380e7c8f195feca535703814c3872
Diffstat (limited to 'mkspecs/macx-xcode')
| -rw-r--r-- | mkspecs/macx-xcode/default.xcscheme | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/mkspecs/macx-xcode/default.xcscheme b/mkspecs/macx-xcode/default.xcscheme index ab2f6a8ab7..6beb0d8280 100644 --- a/mkspecs/macx-xcode/default.xcscheme +++ b/mkspecs/macx-xcode/default.xcscheme @@ -62,7 +62,7 @@ useCustomWorkingDirectory = "NO" buildConfiguration = "Debug" ignoresPersistentStateOnLaunch = "NO" - debugDocumentVersioning = "YES" + debugDocumentVersioning = "NO" allowLocationSimulation = "YES"> <BuildableProductRunnable> <BuildableReference @@ -88,7 +88,7 @@ savedToolIdentifier = "" useCustomWorkingDirectory = "NO" buildConfiguration = "Release" - debugDocumentVersioning = "YES"> + debugDocumentVersioning = "NO"> <BuildableProductRunnable> <BuildableReference BuildableIdentifier = "primary" |