1berry/qtbase
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fix spelling: neccessary -> necessary

Browse Source 
Change-Id: I7c1b1d4ef12391e1caf00eae4b816cdc6d08ee04
Reviewed-by: Tor Arne Vestbø <tor.arne.vestbo@qt.io>
This commit is contained in:
Morten Johan Sørvig 2016-12-16 10:27:58 +01:00 committed by Timur Pocheptsov
parent 87e14eb7cb
commit 1b75a04336
3 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/plugins/platforms/cocoa/qcocoaapplicationdelegate.mm
View File

@ -286,7 +286,7 @@ QT_END_NAMESPACE
if (qEnvironmentVariableIsEmpty("QT_MAC_DISABLE_FOREGROUND_APPLICATION_TRANSFORM")) { if (qEnvironmentVariableIsEmpty("QT_MAC_DISABLE_FOREGROUND_APPLICATION_TRANSFORM")) {
if (QSysInfo::macVersion() >= QSysInfo::MV_10_12) { if (QSysInfo::macVersion() >= QSysInfo::MV_10_12) {
// Move the application window to front to avoid launching behind the terminal. // Move the application window to front to avoid launching behind the terminal.
// Ignoring other apps is neccessary (we must ignore the terminal), but makes // Ignoring other apps is necessary (we must ignore the terminal), but makes
// Qt apps play slightly less nice with other apps when lanching from Finder // Qt apps play slightly less nice with other apps when lanching from Finder
// (See the activateIgnoringOtherApps docs.) // (See the activateIgnoringOtherApps docs.)
[[NSApplication sharedApplication] activateIgnoringOtherApps:YES]; [[NSApplication sharedApplication] activateIgnoringOtherApps:YES];

2
src/plugins/platforms/cocoa/qcocoafiledialoghelper.mm
View File

@ -428,7 +428,7 @@ static QString strippedText(QString s)
{ {
// Call this functions if mFileMode, mFileOptions, // Call this functions if mFileMode, mFileOptions,
// mNameFilterDropDownList or mQDirFilter changes. // mNameFilterDropDownList or mQDirFilter changes.
// The savepanel does not contain the neccessary functions for this. // The savepanel does not contain the necessary functions for this.
const QFileDialogOptions::FileMode fileMode = mOptions->fileMode(); const QFileDialogOptions::FileMode fileMode = mOptions->fileMode();
bool chooseFilesOnly = fileMode == QFileDialogOptions::ExistingFile bool chooseFilesOnly = fileMode == QFileDialogOptions::ExistingFile
|| fileMode == QFileDialogOptions::ExistingFiles; || fileMode == QFileDialogOptions::ExistingFiles;

2
src/plugins/platforms/cocoa/qcocoaintegration.mm
View File

@ -316,7 +316,7 @@ QCocoaIntegration::QCocoaIntegration(const QStringList &paramList)
// from the terminal. On 10.12+ this call has been moved to applicationDidFinishLauching // from the terminal. On 10.12+ this call has been moved to applicationDidFinishLauching
// to work around issues with loss of focus at startup. // to work around issues with loss of focus at startup.
if (QSysInfo::macVersion() < QSysInfo::MV_10_12) { if (QSysInfo::macVersion() < QSysInfo::MV_10_12) {
// Ignoring other apps is neccessary (we must ignore the terminal), but makes // Ignoring other apps is necessary (we must ignore the terminal), but makes
// Qt apps play slightly less nice with other apps when lanching from Finder // Qt apps play slightly less nice with other apps when lanching from Finder
// (See the activateIgnoringOtherApps docs.) // (See the activateIgnoringOtherApps docs.)
[cocoaApplication activateIgnoringOtherApps : YES]; [cocoaApplication activateIgnoringOtherApps : YES];