diff options
| author | Liang Qi <liang.qi@qt.io> | 2016-08-13 01:05:02 +0200 |
|---|---|---|
| committer | Liang Qi <liang.qi@qt.io> | 2016-08-13 01:05:02 +0200 |
| commit | 6b8f422c5e56b95aad298e1b984fb60fba1da282 (patch) | |
| tree | 545dac994ef985cc91d92fa77da21581b6762c86 /src/corelib/kernel/qcoreapplication.cpp | |
| parent | d04982dc84d66bec92b4b3767538676cf925ef17 (diff) | |
| parent | d9e66f63a95b24ce3a7d2a30ccaf4dcab85d55a0 (diff) | |
Merge remote-tracking branch 'origin/5.6' into 5.7
Conflicts:
src/corelib/global/qglobal.cpp
src/corelib/io/qsettings.cpp
src/corelib/itemmodels/qstringlistmodel.cpp
tests/auto/gui/image/qimagewriter/tst_qimagewriter.cpp
Change-Id: I1c6c306ef42c3c0234b19907914b19da706b4a03
Diffstat (limited to 'src/corelib/kernel/qcoreapplication.cpp')
| -rw-r--r-- | src/corelib/kernel/qcoreapplication.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/corelib/kernel/qcoreapplication.cpp b/src/corelib/kernel/qcoreapplication.cpp index 78ec004fc9..2179a0d323 100644 --- a/src/corelib/kernel/qcoreapplication.cpp +++ b/src/corelib/kernel/qcoreapplication.cpp @@ -687,7 +687,7 @@ QCoreApplication::QCoreApplication(QCoreApplicationPrivate &p) If you are doing graphical changes inside a loop that does not return to the event loop on asynchronous window systems like X11 - or double buffered window systems like Quartz (OS X and iOS), and you want to + or double buffered window systems like Quartz (\macos and iOS), and you want to visualize these changes immediately (e.g. Splash Screens), call this function. @@ -2072,7 +2072,7 @@ void QCoreApplicationPrivate::setApplicationFilePath(const QString &path) directory, and you run the \c{regexp} example, this function will return "C:/Qt/examples/tools/regexp". - On OS X and iOS this will point to the directory actually containing + On \macos and iOS this will point to the directory actually containing the executable, which may be inside an application bundle (if the application is bundled). |