Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 4 additions & 4 deletions ios/Info.plist
Original file line number Diff line number Diff line change
Expand Up @@ -2,8 +2,6 @@
<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
<plist version="1.0">
<dict>
<key>NSMicrophoneUsageDescription</key>
<string>We need access to your microphone to let others hear you.</string>
<key>CFBundleDevelopmentRegion</key>
<string>$(DEVELOPMENT_LANGUAGE)</string>
<key>CFBundleExecutable</key>
Expand All @@ -22,16 +20,18 @@
<string>1</string>
<key>LSRequiresIPhoneOS</key>
<true/>
<key>NSMicrophoneUsageDescription</key>
<string>We need access to your microphone to let others hear you.</string>
<key>UIApplicationSceneManifest</key>
<dict>
<key>UIApplicationSupportsMultipleScenes</key>
<true/>
<false/>
</dict>
<key>UIApplicationSupportsIndirectInputEvents</key>
<true/>
<key>UILaunchScreen</key>
<dict/>
<key>UIMainStoryboardFile</key>
<key>UILaunchStoryboardName</key>
Comment thread
ann0see marked this conversation as resolved.
<string>LaunchScreen</string>
<key>UIRequiredDeviceCapabilities</key>
<array>
Expand Down
4 changes: 4 additions & 0 deletions src/chatdlg.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -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 );
Expand Down
10 changes: 10 additions & 0 deletions src/clientsettingsdlg.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
1 change: 0 additions & 1 deletion src/main.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Is this needed?

Copy link
Copy Markdown
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

no, and in the last version of the PR, this line has been removed.

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I can still see bUseGui = true in the diff?

Copy link
Copy Markdown
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I can image bUseGui is forced to true, independent of command line settings. Apps on IOS must have a GUI.


// bUseMultithreading = true;
Expand Down