diff options
| author | Liang Qi <liang.qi@qt.io> | 2017-03-28 09:23:03 +0200 |
|---|---|---|
| committer | Liang Qi <liang.qi@qt.io> | 2017-03-28 09:28:31 +0200 |
| commit | b48a13fd6843e12b5725aa3ff0d010007e7c43b4 (patch) | |
| tree | 316cfe36fc67906efcd92ff806c7c0da56ed4f8e /src/plugins/platforms/cocoa/qcocoafiledialoghelper.mm | |
| parent | 3398d9d40cb0dae2dc2a1a4f7dc3b4b9cceae903 (diff) | |
| parent | 15fe60cfdada84ea519f08e905d59cc3fb6d20cd (diff) | |
Merge remote-tracking branch 'origin/5.9' into dev
Conflicts:
examples/examples.pro
tests/auto/corelib/tools/qchar/tst_qchar.cpp
tests/auto/other/qaccessibility/accessiblewidgets.h
Change-Id: I426696c40ab57d14dc295b8103152cede79f244c
Diffstat (limited to 'src/plugins/platforms/cocoa/qcocoafiledialoghelper.mm')
| -rw-r--r-- | src/plugins/platforms/cocoa/qcocoafiledialoghelper.mm | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/plugins/platforms/cocoa/qcocoafiledialoghelper.mm b/src/plugins/platforms/cocoa/qcocoafiledialoghelper.mm index 41a809cdd2..e39d5e4546 100644 --- a/src/plugins/platforms/cocoa/qcocoafiledialoghelper.mm +++ b/src/plugins/platforms/cocoa/qcocoafiledialoghelper.mm @@ -429,7 +429,7 @@ static QString strippedText(QString s) { // Call this functions if mFileMode, mFileOptions, // 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(); bool chooseFilesOnly = fileMode == QFileDialogOptions::ExistingFile || fileMode == QFileDialogOptions::ExistingFiles; |