rhodes 3.4.2 → 3.5.1.12

data/platform/wm/rhodes/bluetooth/Bluetooth.cpp

@@ -110,13 +110,13 @@ DWORD WINAPI RhoBluetoothManager::runThreadDiscovered(LPVOID data) {
 	int iNameLen=0;
 	RhoBluetoothManager* mManager = RhoBluetoothManager::getInstance();
 	if(mManager->m_socketServer!=INVALID_SOCKET) {
-		mManager->fireCreateSessionCallBack(RHO_BT_ERROR, "");
+		mManager->fireCreateSessionCallBack(RHO_BT_ERROR, "", true);
 		return 0;
 	}
 	mManager->m_socketServer = socket (AF_BT, SOCK_STREAM, BTHPROTO_RFCOMM);
 	if (mManager->m_socketServer  == INVALID_SOCKET) 
 	{
-		mManager->fireCreateSessionCallBack(RHO_BT_ERROR, "");
+		mManager->fireCreateSessionCallBack(RHO_BT_ERROR, "", true);
 		return WSAGetLastError ();
 	}
 
@@ -126,23 +126,23 @@ DWORD WINAPI RhoBluetoothManager::runThreadDiscovered(LPVOID data) {
 	sa.port = 0;
 	if (bind (mManager->m_socketServer, (SOCKADDR *)&sa, sizeof(sa))) 
 	{
-		mManager->fireCreateSessionCallBack(RHO_BT_ERROR, "");
+		mManager->fireCreateSessionCallBack(RHO_BT_ERROR, "", true);
 		return WSAGetLastError ();
 	}
 	iNameLen = sizeof(sa);
 	if (getsockname(mManager->m_socketServer, (SOCKADDR *)&sa, &iNameLen))	
 	{
-		mManager->fireCreateSessionCallBack(RHO_BT_ERROR, "");
+		mManager->fireCreateSessionCallBack(RHO_BT_ERROR, "", true);
 		return WSAGetLastError ();
 	}
 
 	if(mManager->RegisterService(rgbSdpRecord, SDP_RECORD_SIZE, SDP_CHANNEL_OFFSET, (UCHAR)sa.port)!=0)
-		mManager->fireCreateSessionCallBack(RHO_BT_ERROR, "");
+		mManager->fireCreateSessionCallBack(RHO_BT_ERROR, "", true);
 		return WSAGetLastError();
 
 	if (listen (mManager->m_socketServer, SOMAXCONN)) 
 	{
-		mManager->fireCreateSessionCallBack(RHO_BT_ERROR, "");
+		mManager->fireCreateSessionCallBack(RHO_BT_ERROR, "", true);
 		return WSAGetLastError ();
 	}
 	int iSize=0, cbBytesRecd=0 ;
@@ -160,7 +160,7 @@ DWORD WINAPI RhoBluetoothManager::runThreadDiscovered(LPVOID data) {
 	sockaddr peer;
 	int size = sizeof(peer);
 	if (getpeername( mManager->m_socketServer, &peer, &size)) {
-		mManager->fireCreateSessionCallBack(RHO_BT_ERROR, "");
+		mManager->fireCreateSessionCallBack(RHO_BT_ERROR, "", true);
 		return WSAGetLastError ();
 	}
 	memcpy(mManager->mConnectedDeviceName, peer.sa_data, size);
@@ -177,7 +177,7 @@ DWORD WINAPI RhoBluetoothManager::runThreadDiscovered(LPVOID data) {
 			//if error occured in receiving, return error code
 			if (cbBytesRecd == SOCKET_ERROR) 
 			{
-				mManager->fireSessionCallBack(mManager->mConnectedDeviceName, RHO_BT_ERROR);
+				mManager->fireSessionCallBack(mManager->mConnectedDeviceName, RHO_BT_ERROR, true);
 				return WSAGetLastError();
 			}
 			else
@@ -197,7 +197,7 @@ DWORD WINAPI RhoBluetoothManager::runThreadDiscovered(LPVOID data) {
 		}
 	}
 	else {
-		mManager->fireCreateSessionCallBack(RHO_BT_ERROR, "");
+		mManager->fireCreateSessionCallBack(RHO_BT_ERROR, "", true);
 		mManager->terminateDiscoveredThread();
 	}
 	return 0;
@@ -332,7 +332,7 @@ void RhoBluetoothManager::rho_bluetooth_session_disconnect(const char* connected
 	}
 	freeAll();
 	init();
-	fireSessionCallBack(connected_device_name, RHO_BT_SESSION_DISCONNECT);
+	fireSessionCallBack(connected_device_name, RHO_BT_SESSION_DISCONNECT, true);
 }
 
 int RhoBluetoothManager::rho_bluetooth_session_get_status(const char* connected_device_name) {
@@ -357,13 +357,13 @@ void RhoBluetoothManager::rho_bluetooth_session_write_data(const char* connected
 	int iBytesSent = send (m_socketClient, (char *)buf, datasize, 0);
 	if (iBytesSent != datasize)
 	{
-		fireSessionCallBack(mConnectedDeviceName, RHO_BT_ERROR);
+		fireSessionCallBack(mConnectedDeviceName, RHO_BT_ERROR, true);
 		return;
 		//return WSAGetLastError ();
 	}
 }
 
-void RhoBluetoothManager::fireCreateSessionCallBack(const char* status, const char* connected_device_name) {
+void RhoBluetoothManager::fireCreateSessionCallBack(const char* status, const char* connected_device_name, bool in_thread) {
 	if (strlen(mCreateSessionCallback) <= 0) {
 		return;
 	}
@@ -372,10 +372,10 @@ void RhoBluetoothManager::fireCreateSessionCallBack(const char* status, const ch
 	strcat(body, status);
 	strcat(body, "&connected_device_name=");
 	strcat(body, connected_device_name);
-	fireRhodeCallback(mCreateSessionCallback, body);
+	fireRhodeCallback(mCreateSessionCallback, body, in_thread);
 }
 
-void RhoBluetoothManager::fireSessionCallBack(const char* connected_device_name, const char* event_type) {
+void RhoBluetoothManager::fireSessionCallBack(const char* connected_device_name, const char* event_type, bool in_thread) {
 	if (strlen(mSessionCallback) <= 0) {
 		return;
 	}
@@ -384,13 +384,18 @@ void RhoBluetoothManager::fireSessionCallBack(const char* connected_device_name,
 	strcat(body, connected_device_name);
 	strcat(body, "&event_type=");
 	strcat(body, event_type);
-	fireRhodeCallback(mSessionCallback, body);
+	fireRhodeCallback(mSessionCallback, body, in_thread);
 }
 
-void RhoBluetoothManager::fireRhodeCallback(const char* callback_url, const char* body) {
+void RhoBluetoothManager::fireRhodeCallback(const char* callback_url, const char* body, bool in_thread) {
 	LOG(INFO)  + "RhoBluetoothManager::fireRhodeCallback( "+callback_url+", "+body+")";
 	char* norm_url = rho_http_normalizeurl(callback_url);
-	rho_net_request_with_data(norm_url, body);
+    if (in_thread) {
+        rho_net_request_with_data_in_separated_thread(norm_url, body);
+    }
+    else {
+        rho_net_request_with_data(norm_url, body);
+    }
 	rho_http_free(norm_url);
 	//rho_rhodesapp_callBluetoothCallback(callback_url, body);
 	/*

data/platform/wm/rhodes/bluetooth/Bluetooth.h

@@ -225,7 +225,7 @@ public:
 
 
 
-	void fireCreateSessionCallBack(const char* status, const char* connected_device_name);
+	void fireCreateSessionCallBack(const char* status, const char* connected_device_name, bool in_thread = false);
 
 	void onDiscoverDlgSelectDevice(int index);
 	void onDiscoverDlgCancel();
@@ -244,8 +244,8 @@ public:
 
 private:
 
-	void fireRhodeCallback(const char* callback_url, const char* body);
-	void fireSessionCallBack(const char* connected_device_name, const char* event_type);
+	void fireRhodeCallback(const char* callback_url, const char* body, bool in_thread = false);
+	void fireSessionCallBack(const char* connected_device_name, const char* event_type, bool in_thread = false);
 
 	void init();
 	void freeAll();

data/platform/wm/rhodes/camera/Camera.cpp

@@ -247,3 +247,7 @@ void take_picture(char* callback_url, rho_param * options_hash) {
 VALUE get_camera_info(const char* camera_type) {
      return rho_ruby_get_NIL();
 }
+
+void save_image_to_device_gallery(const char* image_path, rho_param* options_hash) {
+
+}

data/platform/wm/rhodes/camera/Camera.h

@@ -50,3 +50,4 @@ private:
 extern "C" void choose_picture(char* callback_url, rho_param *options_hash);
 extern "C" void take_picture(char* callback_url, rho_param * options_hash);
 extern "C" VALUE get_camera_info(const char* camera_type);
+extern "C" void save_image_to_device_gallery(const char* image_path, rho_param* options_hash);

data/platform/wm/rhodes/phonebook/phonebook.cpp

@@ -193,6 +193,15 @@ int deleteRecord(void* pb, void* record) {
 	return 1;
 }
 
+const char* phonebook_get_authorization_status() {
+#if defined (_WIN32_WCE)&& !defined( OS_PLATFORM_MOTCE )
+	return "Authorized";
+#else
+	return "Restricted";
+#endif
+}
+
+
 //==================================================================================
 
 

data/platform/wm/rhodes/phonebook/phonebook.h

@@ -52,6 +52,8 @@ int addRecord(void* pb, void* record);
 int saveRecord(void* pb, void* record);
 int deleteRecord(void* pb, void* record);
 
+const char* phonebook_get_authorization_status();
+
 #if defined(__cplusplus)
 }
 #endif

data/platform/wm/rhodes/rho/common/ExtManager.cpp

@@ -212,7 +212,11 @@ static void __minimize_restoreApp(int nParam)
 
 void CExtManager::minimizeApp()
 {
+#if defined(OS_WINDOWS_DESKTOP) || defined(RHODES_EMULATOR)
     rho_callInUIThread(__minimize_restoreApp, SW_MINIMIZE);
+#else
+    ::PostMessage( getMainWnd(), WM_WINDOW_MINIMIZE, 0, 0 );
+#endif
 }
 
 void CExtManager::restoreApp()
@@ -227,7 +231,7 @@ void CExtManager::resizeBrowserWindow(RECT rc)
 
 void CExtManager::zoomPage(float fZoom)
 {
-    ::PostMessage( getMainWnd(), WM_COMMAND, IDM_ZOOMPAGE, (LPARAM)fZoom );
+    ::PostMessage( getMainWnd(), WM_COMMAND, IDM_ZOOMPAGE, (LPARAM)new CRhoFloatData(fZoom) );
 }
 
 void CExtManager::zoomText(int nZoom)

data/platform/wm/rhodes/rho/common/RhoClassFactory.cpp

@@ -51,17 +51,7 @@ IRhoCrypt* CRhoClassFactory::createRhoCrypt()
 extern "C" {
 void rho_clientregister_create(const char* szDevicePin)
 {
-	rho::sync::CClientRegister::Create(szDevicePin, false);
-}
-
-void rho_clientansregister_create(const char* szDevicePin)
-{
-	rho::sync::CClientRegister::Create(szDevicePin, true);
-}
-
-void rho_clientregister_destroy()
-{
-    rho::sync::CClientRegister::Destroy();
+	rho::sync::CClientRegister::Create(szDevicePin);
 }
 
 };

data/platform/wm/rhodes/rho/rubyext/GeoLocationImpl.cpp

@@ -457,6 +457,11 @@ double rho_geo_longitude()
 #endif
 }
 
+double rho_geo_altitude() 
+{
+	return 0.0;
+}
+
 float rho_geo_accuracy() 
 {
 	return 0.0;

data/platform/wm/rhodes/rho/rubyext/SystemImpl.cpp

@@ -56,7 +56,6 @@ using namespace rho;
 using namespace rho::common;
 extern "C" HWND getMainWnd();
 extern "C" char* wce_wctomb(const wchar_t* w);
-extern "C" int rho_wm_impl_CheckSymbolDevice();
 
 #if defined(OS_WINDOWS_DESKTOP)
 
@@ -106,6 +105,12 @@ public:
 		CMainWindow& mainWin = getAppWindow();
 		mainWin.setSize(frame.getWidth(), frame.getHeight());
 	}
+	static void lockSize(CParams* params)
+	{
+	    CParams& p = *((CParams*)params);
+		CMainWindow& mainWin = getAppWindow();
+		mainWin.lockSize(p.getX());
+	}
 };
 
 }
@@ -651,7 +656,15 @@ int rho_sysimpl_get_property(char* szPropName, VALUE* resValue)
 	if (strcasecmp("is_motorola_device",szPropName) == 0)
     {
 #ifdef APP_BUILD_CAPABILITY_MOTOROLA
-        *resValue = rho_ruby_create_boolean( rho_wm_impl_CheckSymbolDevice() );
+   	    //get the system OEM string
+	    TCHAR szPlatform[MAX_PATH+1];
+	    memset(szPlatform, 0, MAX_PATH*sizeof(TCHAR));
+	    SystemParametersInfo(SPI_GETOEMINFO, MAX_PATH, szPlatform, 0);
+        _wcslwr(szPlatform);
+        if(wcsstr(szPlatform, L"symbol") || wcsstr(szPlatform, L"motorola"))
+            *resValue = rho_ruby_create_boolean( 1 );
+        else
+            *resValue = rho_ruby_create_boolean( 0 );
 #else
         *resValue = rho_ruby_create_boolean(0);
 #endif
@@ -814,6 +827,7 @@ void rho_sys_bring_to_front()
 void rho_sys_report_app_started()
 {
     LOG(INFO) + "rho_sys_report_app_started() has no implementation on Win Mobile.";
+	RHODESAPP().initPushClients();
 }
 
 int rho_sys_is_app_installed(const char *appname)
@@ -950,6 +964,11 @@ void rho_sys_set_window_size(int width, int height)
 {
 	rho_callInUIThread(CRhoWindow::setSize, new CRhoWindow::CParams(0, 0, width, height));
 }
+
+void rho_sys_lock_window_size(int locked)
+{
+	rho_callInUIThread(CRhoWindow::lockSize, new CRhoWindow::CParams(locked, 0, 0, 0));
+}
 #endif
 
 } //extern "C"

data/platform/wm/rhodes/rho/rubyext/WebView.cpp

@@ -135,4 +135,16 @@ void rho_webview_set_cookie(const char *url, const char *cookie)
     ::PostMessage( getMainWnd(), WM_COMMAND, ID_SETCOOKIE, (LPARAM)cd );
 }
 
+void rho_webview_save(const char* format, const char* path, int tab_index)
+{
+    RAWLOG_ERROR("rho_webview_save is not implemented");
+}
+
+VALUE rho_webview_get_current_url(int tab_index)
+{
+    RAWLOG_ERROR("rho_webview_get_current_url is not implemented");
+    return rho_ruby_get_NIL();
+}
+
+
 }

data/platform/wm/rhodes/rho/rubyext/calendar.cpp

@@ -510,6 +510,11 @@ extern "C" void event_delete(const char *eid)
     END_CHECK
 
 }
+
+extern "C" const char* calendar_get_authorization_status(void) {
+	return "Restricted";
+}
+
 #else //!OS_WINCE
 
 extern "C" VALUE event_fetch(VALUE start_date, VALUE end_date)
@@ -531,4 +536,8 @@ extern "C" void event_delete(const char *eid)
 {
 }
 
+extern "C" const char* calendar_get_authorization_status(void) {
+	return "Restricted";
+}
+
 #endif

data/platform/wm/rhodes/rhodes.vcproj

@@ -76,7 +76,7 @@
 				Name="VCCLCompilerTool"
 				Optimization="0"
 				AdditionalIncludeDirectories="../../shared;./rho;../../shared/ruby;../../shared/wtl80/include;.;"..\..\shared\qt\rhodes\GeneratedFiles";"$(QTDIR)\include";"..\..\shared\qt\rhodes\GeneratedFiles\$(ConfigurationName)";"$(QTDIR)\include\qtmain";"$(QTDIR)\include\QtCore";"$(QTDIR)\include\QtGui";"$(QTDIR)\include\QtWebKit""
-				PreprocessorDefinitions="_DEBUG;DEBUG;WIN32;_WINDOWS;ENABLE_DYNAMIC_RHOBUNDLE;UNICODE;QT_LARGEFILE_SUPPORT;QT_CORE_LIB;QT_GUI_LIB;QT_NETWORK_LIB;QT_WEBKIT_LIB"
+				PreprocessorDefinitions="_DEBUG;DEBUG;WIN32;_WINDOWS;UNICODE;QT_LARGEFILE_SUPPORT;QT_CORE_LIB;QT_GUI_LIB;QT_NETWORK_LIB;QT_WEBKIT_LIB"
 				MinimalRebuild="true"
 				RuntimeLibrary="1"
 				TreatWChar_tAsBuiltInType="false"
@@ -799,7 +799,7 @@
 				Name="VCCLCompilerTool"
 				Optimization="2"
 				AdditionalIncludeDirectories="../../shared;./rho;../../shared/ruby;../../shared/wtl80/include;.;"..\..\shared\qt\rhodes\GeneratedFiles";"$(QTDIR)\include";"..\..\shared\qt\rhodes\GeneratedFiles\$(ConfigurationName)";"$(QTDIR)\include\qtmain";"$(QTDIR)\include\QtCore";"$(QTDIR)\include\QtGui";"$(QTDIR)\include\QtWebKit""
-				PreprocessorDefinitions="_NDEBUG;NDEBUG;WIN32;_WINDOWS;ENABLE_DYNAMIC_RHOBUNDLE;UNICODE;QT_LARGEFILE_SUPPORT;QT_NO_DEBUG;QT_CORE_LIB;QT_GUI_LIB;QT_NETWORK_LIB;QT_WEBKIT_LIB"
+				PreprocessorDefinitions="_NDEBUG;NDEBUG;WIN32;_WINDOWS;UNICODE;QT_LARGEFILE_SUPPORT;QT_NO_DEBUG;QT_CORE_LIB;QT_GUI_LIB;QT_NETWORK_LIB;QT_WEBKIT_LIB"
 				RuntimeLibrary="0"
 				TreatWChar_tAsBuiltInType="false"
 				UsePrecompiledHeader="2"
@@ -4171,15 +4171,17 @@
 				RelativePath="..\..\shared\qt\rhodes\resources\simulator.qrc"
 				>
 				<FileConfiguration
-					Name="Debug|Pocket PC 2003 (ARMV4)"
-					ExcludedFromBuild="true"
+					Name="Debug|Win32"
 					>
 					<Tool
 						Name="VCCustomBuildTool"
+						Description="Rcc&apos;ing $(InputFileName)..."
+						CommandLine="&quot;$(QTDIR)\bin\rcc.exe&quot; -name $(InputName) ..\..\shared\qt\rhodes\resources\simulator.qrc -o &quot;..\..\shared\qt\rhodes\GeneratedFiles\$(ConfigurationName)\qrc_$(InputName).cpp&quot;&#x0D;&#x0A;"
+						Outputs="&quot;..\..\shared\qt\rhodes\GeneratedFiles\$(ConfigurationName)\qrc_$(InputName).cpp&quot;"
 					/>
 				</FileConfiguration>
 				<FileConfiguration
-					Name="Debug|Smartphone 2003 (ARMV4)"
+					Name="Debug|Pocket PC 2003 (ARMV4)"
 					ExcludedFromBuild="true"
 					>
 					<Tool
@@ -4187,7 +4189,7 @@
 					/>
 				</FileConfiguration>
 				<FileConfiguration
-					Name="Debug|MC3000c50b (ARMV4I)"
+					Name="Debug|Smartphone 2003 (ARMV4)"
 					ExcludedFromBuild="true"
 					>
 					<Tool
@@ -4195,7 +4197,7 @@
 					/>
 				</FileConfiguration>
 				<FileConfiguration
-					Name="Debug|Windows Mobile 6 Professional SDK (ARMV4I)"
+					Name="Debug|MC3000c50b (ARMV4I)"
 					ExcludedFromBuild="true"
 					>
 					<Tool
@@ -4203,7 +4205,7 @@
 					/>
 				</FileConfiguration>
 				<FileConfiguration
-					Name="Release|Pocket PC 2003 (ARMV4)"
+					Name="Debug|Windows Mobile 6 Professional SDK (ARMV4I)"
 					ExcludedFromBuild="true"
 					>
 					<Tool
@@ -4211,15 +4213,17 @@
 					/>
 				</FileConfiguration>
 				<FileConfiguration
-					Name="Release|Smartphone 2003 (ARMV4)"
-					ExcludedFromBuild="true"
+					Name="Release|Win32"
 					>
 					<Tool
 						Name="VCCustomBuildTool"
+						Description="Rcc&apos;ing $(InputFileName)..."
+						CommandLine="&quot;$(QTDIR)\bin\rcc.exe&quot; -name $(InputName) ..\..\shared\qt\rhodes\resources\simulator.qrc -o &quot;..\..\shared\qt\rhodes\GeneratedFiles\$(ConfigurationName)\qrc_$(InputName).cpp&quot;&#x0D;&#x0A;"
+						Outputs="&quot;..\..\shared\qt\rhodes\GeneratedFiles\$(ConfigurationName)\qrc_$(InputName).cpp&quot;"
 					/>
 				</FileConfiguration>
 				<FileConfiguration
-					Name="Release|MC3000c50b (ARMV4I)"
+					Name="Release|Pocket PC 2003 (ARMV4)"
 					ExcludedFromBuild="true"
 					>
 					<Tool
@@ -4227,7 +4231,7 @@
 					/>
 				</FileConfiguration>
 				<FileConfiguration
-					Name="Release|Windows Mobile 6 Professional SDK (ARMV4I)"
+					Name="Release|Smartphone 2003 (ARMV4)"
 					ExcludedFromBuild="true"
 					>
 					<Tool
@@ -4235,23 +4239,19 @@
 					/>
 				</FileConfiguration>
 				<FileConfiguration
-					Name="Debug|Win32"
+					Name="Release|MC3000c50b (ARMV4I)"
+					ExcludedFromBuild="true"
 					>
 					<Tool
 						Name="VCCustomBuildTool"
-						Description="Rcc&apos;ing $(InputFileName)..."
-						CommandLine="&quot;$(QTDIR)\bin\rcc.exe&quot; -name $(InputName) ..\..\shared\qt\rhodes\resources\simulator.qrc -o &quot;..\..\shared\qt\rhodes\GeneratedFiles\$(ConfigurationName)\qrc_$(InputName).cpp&quot;&#x0D;&#x0A;"
-						Outputs="&quot;..\..\shared\qt\rhodes\GeneratedFiles\$(ConfigurationName)\qrc_$(InputName).cpp&quot;"
 					/>
 				</FileConfiguration>
 				<FileConfiguration
-					Name="Release|Win32"
+					Name="Release|Windows Mobile 6 Professional SDK (ARMV4I)"
+					ExcludedFromBuild="true"
 					>
 					<Tool
 						Name="VCCustomBuildTool"
-						Description="Rcc&apos;ing $(InputFileName)..."
-						CommandLine="&quot;$(QTDIR)\bin\rcc.exe&quot; -name $(InputName) ..\..\shared\qt\rhodes\resources\simulator.qrc -o &quot;..\..\shared\qt\rhodes\GeneratedFiles\$(ConfigurationName)\qrc_$(InputName).cpp&quot;&#x0D;&#x0A;"
-						Outputs="&quot;..\..\shared\qt\rhodes\GeneratedFiles\$(ConfigurationName)\qrc_$(InputName).cpp&quot;"
 					/>
 				</FileConfiguration>
 				<FileConfiguration
@@ -9492,13 +9492,11 @@
 						RelativePath="..\..\shared\qt\rhodes\GeneratedFiles\Debug\moc_DateTimeDialog.cpp"
 						>
 						<FileConfiguration
-							Name="SimulatorDebug|Win32"
-							ExcludedFromBuild="true"
+							Name="Debug|Win32"
 							>
 							<Tool
 								Name="VCCLCompilerTool"
-								ObjectFile="$(IntDir)\$(InputName)1.obj"
-								XMLDocumentationFileName="$(IntDir)\$(InputName)1.xdc"
+								UsePrecompiledHeader="0"
 							/>
 						</FileConfiguration>
 						<FileConfiguration
@@ -9584,11 +9582,13 @@
 							/>
 						</FileConfiguration>
 						<FileConfiguration
-							Name="Debug|Win32"
+							Name="SimulatorDebug|Win32"
+							ExcludedFromBuild="true"
 							>
 							<Tool
 								Name="VCCLCompilerTool"
-								UsePrecompiledHeader="0"
+								ObjectFile="$(IntDir)\$(InputName)1.obj"
+								XMLDocumentationFileName="$(IntDir)\$(InputName)1.xdc"
 							/>
 						</FileConfiguration>
 						<FileConfiguration
@@ -9714,13 +9714,11 @@
 						RelativePath="..\..\shared\qt\rhodes\GeneratedFiles\Debug\moc_ExternalWebView.cpp"
 						>
 						<FileConfiguration
-							Name="SimulatorDebug|Win32"
-							ExcludedFromBuild="true"
+							Name="Debug|Win32"
 							>
 							<Tool
 								Name="VCCLCompilerTool"
-								ObjectFile="$(IntDir)\$(InputName)1.obj"
-								XMLDocumentationFileName="$(IntDir)\$(InputName)1.xdc"
+								UsePrecompiledHeader="0"
 							/>
 						</FileConfiguration>
 						<FileConfiguration
@@ -9806,11 +9804,13 @@
 							/>
 						</FileConfiguration>
 						<FileConfiguration
-							Name="Debug|Win32"
+							Name="SimulatorDebug|Win32"
+							ExcludedFromBuild="true"
 							>
 							<Tool
 								Name="VCCLCompilerTool"
-								UsePrecompiledHeader="0"
+								ObjectFile="$(IntDir)\$(InputName)1.obj"
+								XMLDocumentationFileName="$(IntDir)\$(InputName)1.xdc"
 							/>
 						</FileConfiguration>
 						<FileConfiguration
@@ -9936,13 +9936,11 @@
 						RelativePath="..\..\shared\qt\rhodes\GeneratedFiles\Debug\moc_QtMainWindow.cpp"
 						>
 						<FileConfiguration
-							Name="SimulatorDebug|Win32"
-							ExcludedFromBuild="true"
+							Name="Debug|Win32"
 							>
 							<Tool
 								Name="VCCLCompilerTool"
-								ObjectFile="$(IntDir)\$(InputName)1.obj"
-								XMLDocumentationFileName="$(IntDir)\$(InputName)1.xdc"
+								UsePrecompiledHeader="0"
 							/>
 						</FileConfiguration>
 						<FileConfiguration
@@ -10028,11 +10026,13 @@
 							/>
 						</FileConfiguration>
 						<FileConfiguration
-							Name="Debug|Win32"
+							Name="SimulatorDebug|Win32"
+							ExcludedFromBuild="true"
 							>
 							<Tool
 								Name="VCCLCompilerTool"
-								UsePrecompiledHeader="0"
+								ObjectFile="$(IntDir)\$(InputName)1.obj"
+								XMLDocumentationFileName="$(IntDir)\$(InputName)1.xdc"
 							/>
 						</FileConfiguration>
 						<FileConfiguration
@@ -10158,13 +10158,11 @@
 						RelativePath="..\..\shared\qt\rhodes\GeneratedFiles\Debug\moc_QtWebInspector.cpp"
 						>
 						<FileConfiguration
-							Name="SimulatorDebug|Win32"
-							ExcludedFromBuild="true"
+							Name="Debug|Win32"
 							>
 							<Tool
 								Name="VCCLCompilerTool"
-								ObjectFile="$(IntDir)\$(InputName)1.obj"
-								XMLDocumentationFileName="$(IntDir)\$(InputName)1.xdc"
+								UsePrecompiledHeader="0"
 							/>
 						</FileConfiguration>
 						<FileConfiguration
@@ -10250,11 +10248,13 @@
 							/>
 						</FileConfiguration>
 						<FileConfiguration
-							Name="Debug|Win32"
+							Name="SimulatorDebug|Win32"
+							ExcludedFromBuild="true"
 							>
 							<Tool
 								Name="VCCLCompilerTool"
-								UsePrecompiledHeader="0"
+								ObjectFile="$(IntDir)\$(InputName)1.obj"
+								XMLDocumentationFileName="$(IntDir)\$(InputName)1.xdc"
 							/>
 						</FileConfiguration>
 						<FileConfiguration
@@ -10646,11 +10646,11 @@
 							/>
 						</FileConfiguration>
 						<FileConfiguration
-							Name="SimulatorRelease|Win32"
-							ExcludedFromBuild="true"
+							Name="Release|Win32"
 							>
 							<Tool
 								Name="VCCLCompilerTool"
+								UsePrecompiledHeader="0"
 							/>
 						</FileConfiguration>
 						<FileConfiguration
@@ -10726,11 +10726,11 @@
 							/>
 						</FileConfiguration>
 						<FileConfiguration
-							Name="Release|Win32"
+							Name="SimulatorRelease|Win32"
+							ExcludedFromBuild="true"
 							>
 							<Tool
 								Name="VCCLCompilerTool"
-								UsePrecompiledHeader="0"
 							/>
 						</FileConfiguration>
 						<FileConfiguration
@@ -10842,11 +10842,11 @@
 							/>
 						</FileConfiguration>
 						<FileConfiguration
-							Name="SimulatorRelease|Win32"
-							ExcludedFromBuild="true"
+							Name="Release|Win32"
 							>
 							<Tool
 								Name="VCCLCompilerTool"
+								UsePrecompiledHeader="0"
 							/>
 						</FileConfiguration>
 						<FileConfiguration
@@ -10922,11 +10922,11 @@
 							/>
 						</FileConfiguration>
 						<FileConfiguration
-							Name="Release|Win32"
+							Name="SimulatorRelease|Win32"
+							ExcludedFromBuild="true"
 							>
 							<Tool
 								Name="VCCLCompilerTool"
-								UsePrecompiledHeader="0"
 							/>
 						</FileConfiguration>
 						<FileConfiguration
@@ -11038,11 +11038,11 @@
 							/>
 						</FileConfiguration>
 						<FileConfiguration
-							Name="SimulatorRelease|Win32"
-							ExcludedFromBuild="true"
+							Name="Release|Win32"
 							>
 							<Tool
 								Name="VCCLCompilerTool"
+								UsePrecompiledHeader="0"
 							/>
 						</FileConfiguration>
 						<FileConfiguration
@@ -11118,11 +11118,11 @@
 							/>
 						</FileConfiguration>
 						<FileConfiguration
-							Name="Release|Win32"
+							Name="SimulatorRelease|Win32"
+							ExcludedFromBuild="true"
 							>
 							<Tool
 								Name="VCCLCompilerTool"
-								UsePrecompiledHeader="0"
 							/>
 						</FileConfiguration>
 						<FileConfiguration
@@ -11234,11 +11234,11 @@
 							/>
 						</FileConfiguration>
 						<FileConfiguration
-							Name="SimulatorRelease|Win32"
-							ExcludedFromBuild="true"
+							Name="Release|Win32"
 							>
 							<Tool
 								Name="VCCLCompilerTool"
+								UsePrecompiledHeader="0"
 							/>
 						</FileConfiguration>
 						<FileConfiguration
@@ -11314,11 +11314,11 @@
 							/>
 						</FileConfiguration>
 						<FileConfiguration
-							Name="Release|Win32"
+							Name="SimulatorRelease|Win32"
+							ExcludedFromBuild="true"
 							>
 							<Tool
 								Name="VCCLCompilerTool"
-								UsePrecompiledHeader="0"
 							/>
 						</FileConfiguration>
 						<FileConfiguration