diff --git a/ios/Info.plist b/ios/Info.plist index 728733ef44..dfc2d2937c 100644 --- a/ios/Info.plist +++ b/ios/Info.plist @@ -2,8 +2,6 @@ - NSMicrophoneUsageDescription - We need access to your microphone to let others hear you. CFBundleDevelopmentRegion $(DEVELOPMENT_LANGUAGE) CFBundleExecutable @@ -22,16 +20,18 @@ 1 LSRequiresIPhoneOS + NSMicrophoneUsageDescription + We need access to your microphone to let others hear you. UIApplicationSceneManifest UIApplicationSupportsMultipleScenes - + UIApplicationSupportsIndirectInputEvents UILaunchScreen - UIMainStoryboardFile + UILaunchStoryboardName LaunchScreen UIRequiredDeviceCapabilities diff --git a/src/chatdlg.cpp b/src/chatdlg.cpp index da8516779f..62dcfa74f2 100755 --- a/src/chatdlg.cpp +++ b/src/chatdlg.cpp @@ -67,6 +67,10 @@ CChatDlg::CChatDlg ( QWidget* parent ) : SLOT ( OnClearChatHistory() ), QKeySequence ( Qt::CTRL + Qt::Key_E ) ); pMenu->addMenu ( pEditMenu ); +#if defined ( Q_OS_IOS ) + QAction *action = pMenu->addAction ( tr ( "&Close" ) ); + connect ( action, SIGNAL( triggered() ), this, SLOT ( close() ) ); +#endif // Now tell the layout about the menu layout()->setMenuBar ( pMenu ); diff --git a/src/clientsettingsdlg.cpp b/src/clientsettingsdlg.cpp index 87638faa0e..94ce45be9e 100755 --- a/src/clientsettingsdlg.cpp +++ b/src/clientsettingsdlg.cpp @@ -35,6 +35,16 @@ CClientSettingsDlg::CClientSettingsDlg ( CClient* pNCliP, { setupUi ( this ); +#if defined ( Q_OS_IOS ) + // IOS needs menu to close + QMenuBar* pMenu = new QMenuBar ( this ); + QAction *action = pMenu->addAction ( tr ( "&Close" ) ); + connect ( action, SIGNAL ( triggered() ), this, SLOT ( close() ) ); + + // Now tell the layout about the menu + layout()->setMenuBar ( pMenu ); +#endif + // Add help text to controls ----------------------------------------------- // jitter buffer diff --git a/src/main.cpp b/src/main.cpp index 5484a63b85..07463ee1a4 100755 --- a/src/main.cpp +++ b/src/main.cpp @@ -632,7 +632,6 @@ int main ( int argc, char** argv ) QCoreApplication* pApp = new QCoreApplication ( argc, argv ); #else # if defined ( Q_OS_IOS ) - bIsClient = false; bUseGUI = true; // bUseMultithreading = true;