Merge remote-tracking branch 'origin/3.0' into 3.1

Conflicts:
	src/tools/3rdparty/iossim/iphonesimulator.mm
	src/tools/3rdparty/iossim/main.mm

Change-Id: I574d49a7af24fe3f861a5ab182e2b5999f8f2908

3 files changed, 18 insertions, 3 deletions

diff --git a/src/tools/3rdparty/iossim/iossim.pro b/src/tools/3rdparty/iossim/iossim.pro
index 557362e4c3..25f185cb0f 100644
--- a/src/tools/3rdparty/iossim/iossim.pro
+++ b/src/tools/3rdparty/iossim/iossim.pro
@@ -1,7 +1,8 @@
 CONFIG   += console
 
-QT       += core
-QT       += gui
+QT       -= core
+QT       -= gui
+QT       -= test
 
 CONFIG -= app_bundle
 
diff --git a/src/tools/3rdparty/iossim/iphonesimulator.mm b/src/tools/3rdparty/iossim/iphonesimulator.mm
index 5ecbdc4e0c..d4ba36224d 100644
--- a/src/tools/3rdparty/iossim/iphonesimulator.mm
+++ b/src/tools/3rdparty/iossim/iphonesimulator.mm
@@ -11,6 +11,7 @@
 #import <sys/types.h>
 #import <sys/stat.h>
 #import <Foundation/NSTask.h>
+#import <Foundation/NSFileManager.h>
 @class DTiPhoneSimulatorSystemRoot;
 
 NSString *simulatorPrefrencesName = @"com.apple.iphonesimulator";
@@ -477,7 +478,19 @@ NSString* FindDeveloperDir() {
     nsprintf(@"Unable to find developer directory.");
     exit(EXIT_FAILURE);
   }
-
+  NSString* dvtFoundationPath = [developerDir stringByAppendingPathComponent:kDVTFoundationRelativePath];
+  if (![[NSFileManager defaultManager] fileExistsAtPath:dvtFoundationPath]) {
+      // execute old version
+      char *argNew = new char[strlen(argv[0] + 7)];
+      strcpy(argNew, argv[0]);
+      strcat(argNew, "_1_8_2");
+      char **argvNew = new char *[argc + 1];
+      argvNew[0] = argNew;
+      for (int iarg = 1; iarg < argc; ++iarg)
+          argvNew[iarg] = argv[iarg];
+      argvNew[argc] = 0;
+      execv(argNew, argvNew);
+  }
   if (strcmp(argv[1], "showsdks") == 0) {
 	[self LoadSimulatorFramework:developerDir];
     exit([self showSDKs]);
diff --git a/src/tools/3rdparty/iossim/main.mm b/src/tools/3rdparty/iossim/main.mm
index b8f778be27..7e88c5e485 100644
--- a/src/tools/3rdparty/iossim/main.mm
+++ b/src/tools/3rdparty/iossim/main.mm
@@ -7,6 +7,7 @@
 /* derived from https://github.com/phonegap/ios-sim */
 
 #import <AppKit/AppKit.h>
+#import <Foundation/NSFileManager.h>
 
 #import "iphonesimulator.h"