Merge remote-tracking branch 'origin/develop-7.0' into merge-7.1.1_231015

livecodesebastien · livecodesebastien · commit 55c48dd1cf76 · 2015-10-23T15:47:34.000+01:00
Clean merge: all the conflicts were caused by the fact iOS 5.1 items have been removed in `develop`

Conflicts:
	Makefile
	engine/kernel.gypi
	ide
	ide-support/revdeploylibraryios.livecodescript
	prebuilt/fetch-libraries.sh
diff --git a/Installer/package.txt b/Installer/package.txt
@@ -767,21 +767,21 @@ component Runtime.iOS
 		file ios:iphonesimulator8.4/mobile-splashscreen-template.plist as "SplashscreenSettings.plist"
 		file ios:iphonesimulator8.4/Default-568h@2x.png as "Default4InchSplash.png" base ios:Default-568h@2x.png
 		file ios:iphonesimulator8.4/fontmap as "fontmap"
-	into "[[ToolsFolder]]/Runtime/iOS/Simulator-9_0" place
-		executable ios:iphonesimulator9.0/standalone-mobile[[BaseEditionTagLower]].ios-engine as Standalone base ios:iphonesimulator8.2/standalone-mobile[[BaseEditionTagLower]].app/standalone-mobile[[BaseEditionTagLower]]
-		executable ios:iphonesimulator9.0/revsecurity.ios-extension as RevSecurity base ios:iphonesimulator8.2/revsecurity.dylib
-		executable ios:iphonesimulator9.0/revpdfprinter.ios-extension as RevPdfPrinter base ios:iphonesimulator8.2/revpdfprinter.dylib
-		executable ios:iphonesimulator9.0/revzip.ios-extension as RevZip base ios:iphonesimulator8.2/revzip.dylib
-		executable ios:iphonesimulator9.0/revxml.ios-extension as RevXml base ios:iphonesimulator8.2/revxml.dylib
-		executable ios:iphonesimulator9.0/revdb.ios-extension as RevDb base ios:iphonesimulator8.2/revdb.dylib
-		executable ios:iphonesimulator9.0/dbsqlite.ios-extension as DbSqlite base ios:iphonesimulator8.2/dbsqlite.dylib
-		executable ios:iphonesimulator9.0/dbmysql.ios-extension as DbMysql base ios:iphonesimulator8.2/dbmysql.dylib
-		file ios:iphonesimulator9.0/mobile-template.plist as "Settings.plist"
-		file ios:iphonesimulator9.0/mobile-remote-notification-template.plist as "RemoteNotificationSettings.plist"
-		file ios:iphonesimulator9.0/mobile-url-scheme-template.plist as "URLSchemeSettings.plist"
-		file ios:iphonesimulator9.0/mobile-splashscreen-template.plist as "SplashscreenSettings.plist"
-		file ios:iphonesimulator9.0/Default-568h@2x.png as "Default4InchSplash.png" base ios:Default-568h@2x.png
-		file ios:iphonesimulator9.0/fontmap as "fontmap"
+	into "[[ToolsFolder]]/Runtime/iOS/Simulator-9_1" place
+		executable ios:iphonesimulator9.1/standalone-mobile[[BaseEditionTagLower]].ios-engine as Standalone base ios:iphonesimulator8.2/standalone-mobile[[BaseEditionTagLower]].app/standalone-mobile[[BaseEditionTagLower]]
+		executable ios:iphonesimulator9.1/revsecurity.ios-extension as RevSecurity base ios:iphonesimulator8.2/revsecurity.dylib
+		executable ios:iphonesimulator9.1/revpdfprinter.ios-extension as RevPdfPrinter base ios:iphonesimulator8.2/revpdfprinter.dylib
+		executable ios:iphonesimulator9.1/revzip.ios-extension as RevZip base ios:iphonesimulator8.2/revzip.dylib
+		executable ios:iphonesimulator9.1/revxml.ios-extension as RevXml base ios:iphonesimulator8.2/revxml.dylib
+		executable ios:iphonesimulator9.1/revdb.ios-extension as RevDb base ios:iphonesimulator8.2/revdb.dylib
+		executable ios:iphonesimulator9.1/dbsqlite.ios-extension as DbSqlite base ios:iphonesimulator8.2/dbsqlite.dylib
+		executable ios:iphonesimulator9.1/dbmysql.ios-extension as DbMysql base ios:iphonesimulator8.2/dbmysql.dylib
+		file ios:iphonesimulator9.1/mobile-template.plist as "Settings.plist"
+		file ios:iphonesimulator9.1/mobile-remote-notification-template.plist as "RemoteNotificationSettings.plist"
+		file ios:iphonesimulator9.1/mobile-url-scheme-template.plist as "URLSchemeSettings.plist"
+		file ios:iphonesimulator9.1/mobile-splashscreen-template.plist as "SplashscreenSettings.plist"
+		file ios:iphonesimulator9.1/Default-568h@2x.png as "Default4InchSplash.png" base ios:Default-568h@2x.png
+		file ios:iphonesimulator9.1/fontmap as "fontmap"
 	into "[[ToolsFolder]]/Runtime/iOS/Device-8_2" place
 		executable ios:iphoneos8.2/standalone-mobile[[BaseEditionTagLower]].ios-engine as Standalone
 		executable ios:iphoneos8.2/revsecurity.ios-extension as RevSecurity
@@ -822,26 +822,26 @@ component Runtime.iOS
 		file ios:iphoneos8.4/template-ResourceRules.plist as "ResourceRules.plist"
 		file ios:iphoneos8.4/Default-568h@2x.png as "Default4InchSplash.png" base ios:Default-568h@2x.png
 		file ios:iphoneos8.4/fontmap as "fontmap"
-	into "[[ToolsFolder]]/Runtime/iOS/Device-9_0" place
-		executable ios:iphoneos9.0/standalone-mobile[[BaseEditionTagLower]].ios-engine as Standalone base ios:iphoneos8.2/standalone-mobile[[BaseEditionTagLower]].lcext
-		executable ios:iphoneos9.0/revsecurity.ios-extension as RevSecurity base ios:iphoneos8.2/revsecurity.lcext
-		executable ios:iphoneos9.0/revpdfprinter.ios-extension as RevPdfPrinter base ios:iphoneos8.2/revpdfprinter.lcext
-		executable ios:iphoneos9.0/revzip.ios-extension as RevZip base ios:iphoneos8.2/revzip.lcext
-		executable ios:iphoneos9.0/revxml.ios-extension as RevXml base ios:iphoneos8.2/revxml.lcext
-		executable ios:iphoneos9.0/revdb.ios-extension as RevDb base ios:iphoneos8.2/revdb.lcext
-		executable ios:iphoneos9.0/dbsqlite.ios-extension as DbSqlite base ios:iphoneos8.2/dbsqlite.lcext
-		executable ios:iphoneos9.0/dbmysql.ios-extension as DbMysql base ios:iphoneos8.2/dbmysql.lcext
-		file ios:iphoneos9.0/mobile-device-template.plist as "Settings.plist"
-		file ios:iphoneos9.0/mobile-remote-notification-template.plist as "RemoteNotificationSettings.plist"
-		file ios:iphoneos9.0/mobile-url-scheme-template.plist as "URLSchemeSettings.plist"
-		file ios:iphoneos9.0/mobile-splashscreen-template.plist as "SplashscreenSettings.plist"
-		file ios:iphoneos9.0/template-entitlements.xcent as "Entitlements.xcent"
-		file ios:iphoneos9.0/template-store-entitlements.xcent as "StoreEntitlements.xcent"
-		file ios:iphoneos9.0/template-remote-notification-entitlements.xcent as "RemoteNotificationEntitlements.xcent"
-		file ios:iphoneos9.0/template-remote-notification-store-entitlements.xcent as "RemoteNotificationStoreEntitlements.xcent"
-		file ios:iphoneos9.0/template-ResourceRules.plist as "ResourceRules.plist"
-		file ios:iphoneos9.0/Default-568h@2x.png as "Default4InchSplash.png" base ios:Default-568h@2x.png
-		file ios:iphoneos9.0/fontmap as "fontmap"
+	into "[[ToolsFolder]]/Runtime/iOS/Device-9_1" place
+		executable ios:iphoneos9.1/standalone-mobile[[BaseEditionTagLower]].ios-engine as Standalone base ios:iphoneos8.2/standalone-mobile[[BaseEditionTagLower]].lcext
+		executable ios:iphoneos9.1/revsecurity.ios-extension as RevSecurity base ios:iphoneos8.2/revsecurity.lcext
+		executable ios:iphoneos9.1/revpdfprinter.ios-extension as RevPdfPrinter base ios:iphoneos8.2/revpdfprinter.lcext
+		executable ios:iphoneos9.1/revzip.ios-extension as RevZip base ios:iphoneos8.2/revzip.lcext
+		executable ios:iphoneos9.1/revxml.ios-extension as RevXml base ios:iphoneos8.2/revxml.lcext
+		executable ios:iphoneos9.1/revdb.ios-extension as RevDb base ios:iphoneos8.2/revdb.lcext
+		executable ios:iphoneos9.1/dbsqlite.ios-extension as DbSqlite base ios:iphoneos8.2/dbsqlite.lcext
+		executable ios:iphoneos9.1/dbmysql.ios-extension as DbMysql base ios:iphoneos8.2/dbmysql.lcext
+		file ios:iphoneos9.1/mobile-device-template.plist as "Settings.plist"
+		file ios:iphoneos9.1/mobile-remote-notification-template.plist as "RemoteNotificationSettings.plist"
+		file ios:iphoneos9.1/mobile-url-scheme-template.plist as "URLSchemeSettings.plist"
+		file ios:iphoneos9.1/mobile-splashscreen-template.plist as "SplashscreenSettings.plist"
+		file ios:iphoneos9.1/template-entitlements.xcent as "Entitlements.xcent"
+		file ios:iphoneos9.1/template-store-entitlements.xcent as "StoreEntitlements.xcent"
+		file ios:iphoneos9.1/template-remote-notification-entitlements.xcent as "RemoteNotificationEntitlements.xcent"
+		file ios:iphoneos9.1/template-remote-notification-store-entitlements.xcent as "RemoteNotificationStoreEntitlements.xcent"
+		file ios:iphoneos9.1/template-ResourceRules.plist as "ResourceRules.plist"
+		file ios:iphoneos9.1/Default-568h@2x.png as "Default4InchSplash.png" base ios:Default-568h@2x.png
+		file ios:iphoneos9.1/fontmap as "fontmap"
 
 ////////////////////////////////////////////////////////////////////////////////
 
diff --git a/Makefile b/Makefile
@@ -25,8 +25,8 @@ EMMAKE ?= emmake
 
 # Some magic to control which versions of iOS we try to build.  N.b. you may
 # also need to modify the buildbot configuration
-IPHONEOS_VERSIONS ?= 8.2 8.4 9.0
-IPHONESIMULATOR_VERSIONS ?= 6.1 7.1 8.2 8.4 9.0
+IPHONEOS_VERSIONS ?= 8.2 8.4 9.1
+IPHONESIMULATOR_VERSIONS ?= 6.1 7.1 8.2 8.4 9.1
 
 IOS_SDKS ?= \
 	$(addprefix iphoneos,$(IPHONEOS_VERSIONS)) \
diff --git a/docs/notes/bugfix-15208.md b/docs/notes/bugfix-15208.md
diff --git a/docs/notes/bugfix-16257.md b/docs/notes/bugfix-16257.md
@@ -0,0 +1 @@
+# When switching between windows on Mac, the unfocused window can still appear to be focused.
diff --git a/docs/notes/bugfix-16258.md b/docs/notes/bugfix-16258.md
@@ -0,0 +1 @@
+# Remove unneeded load-time dependence on QTKit.
diff --git a/engine/kernel.gyp b/engine/kernel.gyp
@@ -145,7 +145,6 @@
 								'$(SDKROOT)/System/Library/Frameworks/ApplicationServices.framework',
 								'$(SDKROOT)/System/Library/Frameworks/Carbon.framework',
 								'$(SDKROOT)/System/Library/Frameworks/Cocoa.framework',
-								'$(SDKROOT)/System/Library/Frameworks/QTKit.framework',
 								'$(SDKROOT)/System/Library/Frameworks/Quartz.framework',
 							],
 						},
diff --git a/engine/src/java/com/runrev/android/nativecontrol/ExtVideoView.java b/engine/src/java/com/runrev/android/nativecontrol/ExtVideoView.java
@@ -328,6 +328,10 @@ private void attachMediaController() {
                     (View)this.getParent() : this;
             mMediaController.setAnchorView(anchorView);
             mMediaController.setEnabled(isInPlaybackState());
+			
+			// PM-2015-10-19: [[ Bug 16027 ]] Make sure the controller shows/hides when changing its visibility on demand
+			if (isInPlaybackState())
+				mMediaController.show(0);
         }
     }
 
@@ -369,7 +373,13 @@ public void onPrepared(MediaPlayer mp) {
             }
             if (mMediaController != null) {
                 mMediaController.setEnabled(true);
+
+				// PM-2015-10-19: [[ Bug 16027 ]] Show the controller once the player is prepared (as on iOS)
+				if (isInPlaybackState()){
+					mMediaController.show(0);
+				}
             }
+
             mVideoWidth = mp.getVideoWidth();
             mVideoHeight = mp.getVideoHeight();
 
@@ -390,10 +400,6 @@ public void onPrepared(MediaPlayer mp) {
                     // start the video here instead of in the callback.
                     if (mTargetState == STATE_PLAYING) {
                         start();
-                        if (mMediaController != null) {
-							// PM-2015-10-08: [[ Bug 16027 ]] Make sure the controller does not disappear after some ms of inactivity
-                            mMediaController.show(0);
-                        }
                     } else if (!isPlaying() &&
                                (seekToPosition != 0 || getCurrentPosition() > 0)) {
                        if (mMediaController != null) {
@@ -407,10 +413,6 @@ public void onPrepared(MediaPlayer mp) {
                 // The video size might be reported to us later.
                 if (mTargetState == STATE_PLAYING) {
                     start();
-					// show the controller when starting playing a remote video
-					if (mMediaController != null) {
-						mMediaController.show(0);
-					}
                 }
             }
         }
@@ -542,10 +544,7 @@ public void surfaceChanged(SurfaceHolder holder, int format,
                     seekTo(mSeekWhenPrepared);
                 }
                 start();
-                if (mMediaController != null) {
-                    mMediaController.show(0);
-                }
-            }
+			}
         }
 
         public void surfaceCreated(SurfaceHolder holder)
@@ -626,7 +625,7 @@ public boolean onKeyDown(int keyCode, KeyEvent event)
                     keyCode == KeyEvent.KEYCODE_MEDIA_PLAY_PAUSE) {
                 if (mMediaPlayer.isPlaying()) {
                     pause();
-                    mMediaController.show(0);
+					mMediaController.show(0);
                 } else {
                     start();
                     mMediaController.hide();
@@ -635,7 +634,7 @@ public boolean onKeyDown(int keyCode, KeyEvent event)
             } else if (keyCode == KeyEvent.KEYCODE_MEDIA_STOP
                     && mMediaPlayer.isPlaying()) {
                 pause();
-                mMediaController.show(0);
+				mMediaController.show(0);
             } else {
                 toggleMediaControlsVisiblity();
             }
@@ -659,6 +658,12 @@ public void start() {
             mCurrentState = STATE_PLAYING;
         }
         mTargetState = STATE_PLAYING;
+
+		// PM-2015-10-19: [[ Bug 16027 ]] Show the controller here, to make sure it is enabled even if
+		// mobileControlDo sPlayerId, "play" is called from a callback message
+		if (mMediaController != null) {
+			mMediaController.show(0);
+		}
     }
 
     public void stop() {
diff --git a/engine/src/java/com/runrev/android/nativecontrol/VideoControl.java b/engine/src/java/com/runrev/android/nativecontrol/VideoControl.java
@@ -23,6 +23,7 @@
 import android.view.*;
 import android.widget.*;
 
+
 import java.io.*;
 
 public class VideoControl extends NativeControl
@@ -43,7 +44,15 @@ public View createView(Context context)
     {
         m_video_view = new ExtVideoView(context);
         
-        m_video_controller = new MediaController(context);
+        m_video_controller = new MediaController(context){
+		// PM-2015-10-19: [[ Bug 16027 ]] Make sure the controller does not disappear every
+		// time a control (i.e. Pause button) is clicked. This happened because when touching
+		// the controls, MediaController called show(sDefaultTimeout);
+			@Override
+			public void show(int timeout) {
+				super.show(0);
+			}
+		};
         m_video_view.setMediaController(m_video_controller);
         
         setOnCompletionListener(new MediaPlayer.OnCompletionListener() {
diff --git a/engine/src/mac-internal.h b/engine/src/mac-internal.h
@@ -473,9 +473,8 @@ class MCMacPlatformWindow: public MCPlatformWindow
 	void ProcessWillMiniaturize(void);
 	void ProcessDidMiniaturize(void);
 	void ProcessDidDeminiaturize(void);
-    // SN-2015-05-20: [[ Bug 15208 ]] Renamed to better reflect the functions action
-	void ProcessGainedMainFocus(void);
-	void ProcessLostMainFocus(void);
+	void ProcessDidBecomeKey(void);
+	void ProcessDidResignKey(void);
 	
 	void ProcessMouseMove(NSPoint location);
 	void ProcessMousePress(NSInteger button, bool is_down);
@@ -548,7 +547,7 @@ class MCMacPlatformWindow: public MCPlatformWindow
 		bool m_has_sheet : 1;
 		
 		// When the frame is locked, any changes to the window rect will be prevented.
-        bool m_frame_locked : 1;
+		bool m_frame_locked : 1;
 	};
 	
 	// A window might map to one of several different classes, so we use a
diff --git a/engine/src/mac-window.mm b/engine/src/mac-window.mm
@@ -459,42 +459,29 @@ - (void)windowDidDeminiaturize:(NSNotification *)notification
 }
 
 // MW-2014-07-22: [[ Bug 12720 ]] Mark the period we are inside a focus event handler.
-// SN-2015-05-20: [[ Bug 15208 ]] Renamed to better reflect the functions action
 - (void)windowDidBecomeKey:(NSNotification *)notification
 {
     if (s_inside_focus_event)
-        m_window -> ProcessGainedMainFocus();
+        m_window -> ProcessDidBecomeKey();
     else
     {
         s_inside_focus_event = true;
-        m_window -> ProcessGainedMainFocus();
+        m_window -> ProcessDidBecomeKey();
         s_inside_focus_event = false;
     }
 }
 
 // MW-2014-07-22: [[ Bug 12720 ]] Mark the period we are inside a focus event handler.
-// SN-2015-05-20: [[ Bug 15208 ]] If we are not the KeyWindow, we can still be
-//  the MainWindow, and in that case we keep the focus.
 - (void)windowDidResignKey:(NSNotification *)notification
 {
-}
-
-// SN-2015-05-20: [[ Bug 15208 ]] A main window is not necessarily the key window
-// (see https://developer.apple.com/library/mac/documentation/Cocoa/Conceptual/WinPanel/Concepts/ChangingMainKeyWindow.html)
-//  We do no want to unfocus the active field if a utility window (such as Color
-//  Picker or Character Viewer) is opened, or that can lead to a crash since we
-//  might want to insert text in this field (it is not properly speaking unfocusing).
-//  That leads to a not-so-nice blinking cursor on the message box when using
-//     answer color
-//  but there might not be any other option to avoid the Character Viewer crash.
-- (void)windowDidBecomeMain:(NSNotification *)notification
-{
-    m_window -> ProcessGainedMainFocus();
-}
-
-- (void)windowDidResignMain:(NSNotification *)notification
-{
-    m_window -> ProcessLostMainFocus();
+    if (s_inside_focus_event)
+        m_window -> ProcessDidResignKey();
+    else
+    {
+        s_inside_focus_event = true;
+        m_window -> ProcessDidResignKey();
+        s_inside_focus_event = false;
+    }
 }
 
 - (void)windowDidChangeBackingProperties:(NSNotification *)notification
@@ -1775,13 +1762,12 @@ - (void)setFrameSize: (NSSize)size
 	HandleUniconify();
 }
 
-// SN-2015-05-20: [[ Bug 15208 ]] Renamed to better reflect the functions action
-void MCMacPlatformWindow::ProcessGainedMainFocus(void)
+void MCMacPlatformWindow::ProcessDidBecomeKey(void)
 {
-    HandleFocus();
+	HandleFocus();
 }
 
-void MCMacPlatformWindow::ProcessLostMainFocus(void)
+void MCMacPlatformWindow::ProcessDidResignKey(void)
 {
     HandleUnfocus();
 }
diff --git a/ide-support/revdeploylibraryios.livecodescript b/ide-support/revdeploylibraryios.livecodescript
@@ -19,7 +19,7 @@ local sDeviceSDKs
 --  SDKs and device relying on the engines we provide in the shipped version
 -- SN-2015-05-01: [[ Xcode 6.4 ]] Add iOS 8.4 amongst the uable iOS SDK
 function deployUsableIosSdk
-   return "6.1,7.1,8.2,8.4,9.0"
+   return "6.1,7.1,8.2,8.4,9.1"
 end deployUsableIosSdk
 
 // SN-2015-05-01: [[ Xcode 6.4 ]] Return the pair iOS SDK / Xcode for the current MacOS version
@@ -37,17 +37,17 @@ function deployGetIphoneOSes
       put "8.2,6.2" into tList[2]
       // Xcode 7.0 can be installed from Mac OSX 10.10.4 onwards
       if tMacVersion >= 101004 then
-         put "9.0,7.0" into tList[3]
+         put "9.1,7.1" into tList[3]
       end if
    else
-      put "9.0,7.0" into tList[1]
+      put "9.1,7.1" into tList[1]
    end if
    
    return tList
 end deployGetIphoneOSes
 
 function deployGetIosMinimumVersions
-   return "5.1.1,6.0,6.1,7.0,7.1,8.0,8.1,8.2,8.3,8.4,9.0"
+   return "5.1.1,6.0,6.1,7.0,7.1,8.0,8.1,8.2,8.3,8.4,9.0,9.1"
 end deployGetIosMinimumVersions
 
 ////////////////////////////////////////////////////////////////////////////////
diff --git a/prebuilt/fetch-libraries.sh b/prebuilt/fetch-libraries.sh
@@ -14,7 +14,7 @@ LIBS_ios=( OpenSSL ICU )
 LIBS_win32=( OpenSSL Curl ICU CEF )
 LIBS_linux=( OpenSSL Curl ICU CEF )
 LIBS_emscripten=( ICU )
-SUBPLATFORMS_ios=( iPhoneSimulator5.1 iPhoneSimulator6.1 iPhoneSimulator7.1 iPhoneSimulator8.2 iPhoneSimulator8.3 iPhoneSimulator8.4 iPhoneSimulator9.0 iPhoneOS8.2 iPhoneOS8.3 iPhoneOS8.4 iPhoneOS9.0)
+SUBPLATFORMS_ios=( iPhoneSimulator5.1 iPhoneSimulator6.1 iPhoneSimulator7.1 iPhoneSimulator8.2 iPhoneSimulator8.3 iPhoneSimulator8.4 iPhoneSimulator9.1 iPhoneOS8.2 iPhoneOS8.3 iPhoneOS8.4 iPhoneOS9.1)
 
 # Fetch settings
 SCRIPT_DIR=$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)
diff --git a/prebuilt/scripts/ios.inc b/prebuilt/scripts/ios.inc
@@ -44,7 +44,7 @@ if [ -e "${XCODES_DIR}/Xcode_6_4_0" ] ; then
 	addiOS "${XCODES_DIR}/Xcode_6_4_0/Xcode.app/Contents/Developer" iPhoneSimulator 8.4 "i386 x86_64"
 	addiOS "${XCODES_DIR}/Xcode_6_4_0/Xcode.app/Contents/Developer" iPhoneOS 8.4 "armv7 arm64"
 fi
-if [ -e "${XCODES_DIR}/Xcode_7_0_0" ] ; then
-	addiOS "${XCODES_DIR}/Xcode_7_0_0/Xcode.app/Contents/Developer" iPhoneSimulator 9.0 "i386 x86_64"
-	addiOS "${XCODES_DIR}/Xcode_7_0_0/Xcode.app/Contents/Developer" iPhoneOS 9.0 "armv7 arm64"
+if [ -e "${XCODES_DIR}/Xcode_7_1_0" ] ; then
+	addiOS "${XCODES_DIR}/Xcode_7_1_0/Xcode.app/Contents/Developer" iPhoneSimulator 9.1 "i386 x86_64"
+	addiOS "${XCODES_DIR}/Xcode_7_1_0/Xcode.app/Contents/Developer" iPhoneOS 9.1 "armv7 arm64"
 fi
diff --git a/tools/setup_xcode_sdks.sh b/tools/setup_xcode_sdks.sh
@@ -2,8 +2,8 @@
 
 # Update these lists if you need different SDK versions!
 
-iphoneos_versions="9.0 8.4 8.2"
-iphonesimulator_versions="9.0 8.4 8.2 7.1 6.1 5.1"
+iphoneos_versions="9.1 8.4 8.2"
+iphonesimulator_versions="9.1 8.4 8.2 7.1 6.1 5.1"
 macosx_versions="10.8 10.6"
 
 # This tool creates the symlinks required for Xcode builds of LiveCode.

Original file line number	Diff line number	Diff line change
`@@ -0,0 +1 @@`
	`1`	`+# When switching between windows on Mac, the unfocused window can still appear to be focused.`
Original file line number	Diff line number	Diff line change
`@@ -0,0 +1 @@`
	`1`	`+# Remove unneeded load-time dependence on QTKit.`
Original file line number	Diff line number	Diff line change
`@@ -459,42 +459,29 @@ - (void)windowDidDeminiaturize:(NSNotification *)notification`
`459`	`459`	`}`
`460`	`460`
`461`	`461`	`// MW-2014-07-22: [[ Bug 12720 ]] Mark the period we are inside a focus event handler.`
`462`		`-// SN-2015-05-20: [[ Bug 15208 ]] Renamed to better reflect the functions action`
`463`	`462`	`- (void)windowDidBecomeKey:(NSNotification *)notification`
`464`	`463`	`{`
`465`	`464`	`if (s_inside_focus_event)`
`466`		`- m_window -> ProcessGainedMainFocus();`
	`465`	`+ m_window -> ProcessDidBecomeKey();`
`467`	`466`	`else`
`468`	`467`	`{`
`469`	`468`	`s_inside_focus_event = true;`
`470`		`- m_window -> ProcessGainedMainFocus();`
	`469`	`+ m_window -> ProcessDidBecomeKey();`
`471`	`470`	`s_inside_focus_event = false;`
`472`	`471`	`}`
`473`	`472`	`}`
`474`	`473`
`475`	`474`	`// MW-2014-07-22: [[ Bug 12720 ]] Mark the period we are inside a focus event handler.`
`476`		`-// SN-2015-05-20: [[ Bug 15208 ]] If we are not the KeyWindow, we can still be`
`477`		`-// the MainWindow, and in that case we keep the focus.`
`478`	`475`	`- (void)windowDidResignKey:(NSNotification *)notification`
`479`	`476`	`{`
`480`		`-}`
`481`		`-`
`482`		`-// SN-2015-05-20: [[ Bug 15208 ]] A main window is not necessarily the key window`
`483`		`-// (see https://developer.apple.com/library/mac/documentation/Cocoa/Conceptual/WinPanel/Concepts/ChangingMainKeyWindow.html)`
`484`		`-// We do no want to unfocus the active field if a utility window (such as Color`
`485`		`-// Picker or Character Viewer) is opened, or that can lead to a crash since we`
`486`		`-// might want to insert text in this field (it is not properly speaking unfocusing).`
`487`		`-// That leads to a not-so-nice blinking cursor on the message box when using`
`488`		`-// answer color`
`489`		`-// but there might not be any other option to avoid the Character Viewer crash.`
`490`		`-- (void)windowDidBecomeMain:(NSNotification *)notification`
`491`		`-{`
`492`		`- m_window -> ProcessGainedMainFocus();`
`493`		`-}`
`494`		`-`
`495`		`-- (void)windowDidResignMain:(NSNotification *)notification`
`496`		`-{`
`497`		`- m_window -> ProcessLostMainFocus();`
	`477`	`+ if (s_inside_focus_event)`
	`478`	`+ m_window -> ProcessDidResignKey();`
	`479`	`+ else`
	`480`	`+ {`
	`481`	`+ s_inside_focus_event = true;`
	`482`	`+ m_window -> ProcessDidResignKey();`
	`483`	`+ s_inside_focus_event = false;`
	`484`	`+ }`
`498`	`485`	`}`
`499`	`486`
`500`	`487`	`- (void)windowDidChangeBackingProperties:(NSNotification *)notification`
`@@ -1775,13 +1762,12 @@ - (void)setFrameSize: (NSSize)size`
`1775`	`1762`	`HandleUniconify();`
`1776`	`1763`	`}`
`1777`	`1764`
`1778`		`-// SN-2015-05-20: [[ Bug 15208 ]] Renamed to better reflect the functions action`
`1779`		`-void MCMacPlatformWindow::ProcessGainedMainFocus(void)`
	`1765`	`+void MCMacPlatformWindow::ProcessDidBecomeKey(void)`
`1780`	`1766`	`{`
`1781`		`- HandleFocus();`
	`1767`	`+ HandleFocus();`
`1782`	`1768`	`}`
`1783`	`1769`
`1784`		`-void MCMacPlatformWindow::ProcessLostMainFocus(void)`
	`1770`	`+void MCMacPlatformWindow::ProcessDidResignKey(void)`
`1785`	`1771`	`{`
`1786`	`1772`	`HandleUnfocus();`
`1787`	`1773`	`}`