diff options
author | Simon Hausmann <simon.hausmann@theqtcompany.com> | 2015-06-03 10:23:56 +0200 |
---|---|---|
committer | Simon Hausmann <simon.hausmann@theqtcompany.com> | 2015-06-03 10:23:56 +0200 |
commit | e2f66f921594b7be4af4a058c959557489e86879 (patch) | |
tree | cc44931708b57bd5a761906797c7dee0360d1d6b /src/corelib/io/qstandardpaths.cpp | |
parent | 933bf178aab88ab5df8a68cbf02611d6d8744b1b (diff) | |
parent | 754efa57d89c62d1796e01b407e9222e67450f52 (diff) | |
download | qtbase-e2f66f921594b7be4af4a058c959557489e86879.tar.gz |
Merge remote-tracking branch 'origin/5.5' into dev
Conflicts:
src/corelib/global/qnamespace.qdoc
src/corelib/io/qwindowspipereader.cpp
src/corelib/io/qwindowspipereader_p.h
src/corelib/statemachine/qstatemachine.cpp
src/corelib/statemachine/qstatemachine_p.h
src/plugins/platforms/xcb/qxcbconnection.h
tests/auto/network/access/qnetworkreply/tst_qnetworkreply.cpp
tests/auto/tools/qmake/tst_qmake.cpp
tests/manual/touch/main.cpp
Change-Id: I917d694890e79ee3da7d65134b5b085e23e0dd62
Diffstat (limited to 'src/corelib/io/qstandardpaths.cpp')
-rw-r--r-- | src/corelib/io/qstandardpaths.cpp | 30 |
1 files changed, 29 insertions, 1 deletions
diff --git a/src/corelib/io/qstandardpaths.cpp b/src/corelib/io/qstandardpaths.cpp index beb5d29d54..04848a38e5 100644 --- a/src/corelib/io/qstandardpaths.cpp +++ b/src/corelib/io/qstandardpaths.cpp @@ -274,45 +274,67 @@ QT_BEGIN_NAMESPACE \endtable \table - \header \li Path type \li Android + \header \li Path type \li Android \li iOS \row \li DesktopLocation \li "<APPROOT>/files" + \li "<APPROOT>/<APPDIR>" (not writable) \row \li DocumentsLocation \li "<USER>/Documents", "<USER>/<APPNAME>/Documents" + \li "<APPROOT>/Documents" \row \li FontsLocation \li "/system/fonts" (not writable) + \li "<APPROOT>/Documents/.fonts" \row \li ApplicationsLocation \li not supported (directory not readable) + \li not supported \row \li MusicLocation \li "<USER>/Music", "<USER>/<APPNAME>/Music" + \li "<APPROOT>/Documents/Music" \row \li MoviesLocation \li "<USER>/Movies", "<USER>/<APPNAME>/Movies" + \li "<APPROOT>/Documents/Movies" \row \li PicturesLocation \li "<USER>/Pictures", "<USER>/<APPNAME>/Pictures" + \li "<APPROOT>/Documents/Pictures", "assets-library://" \row \li TempLocation \li "<APPROOT>/cache" + \li "<APPROOT>/tmp" \row \li HomeLocation \li "<APPROOT>/files" + \li "<APPROOT>/<APPDIR>" (not writable) \row \li DataLocation \li "<APPROOT>/files", "<USER>/<APPNAME>/files" + \li "<APPROOT>/Library/Application Support" \row \li CacheLocation \li "<APPROOT>/cache", "<USER>/<APPNAME>/cache" + \li "<APPROOT>/Library/Caches" \row \li GenericDataLocation \li "<USER>" + \li "<APPROOT>/Documents" \row \li RuntimeLocation \li "<APPROOT>/cache" + \li not supported \row \li ConfigLocation \li "<APPROOT>/files/settings" + \li "<APPROOT>/Documents" \row \li GenericConfigLocation \li "<APPROOT>/files/settings" (there is no shared settings) + \li "<APPROOT>/Documents" \row \li DownloadLocation \li "<USER>/Downloads", "<USER>/<APPNAME>/Downloads" + \li "<APPROOT>/Documents/Download" \row \li GenericCacheLocation \li "<APPROOT>/cache" (there is no shared cache) + \li "<APPROOT>/Library/Caches" \row \li AppDataLocation \li "<APPROOT>/files", "<USER>/<APPNAME>/files" + \li "<APPROOT>/Library/Application Support" \row \li AppConfigLocation \li "<APPROOT>/files/settings" + \li "<APPROOT>/Documents" + \row \li AppLocalDataLocation + \li "<APPROOT>/files", "<USER>/<APPNAME>/files" + \li "<APPROOT>/Library/Application Support" \endtable In the table above, \c <APPNAME> is usually the organization name, the @@ -327,6 +349,12 @@ QT_BEGIN_NAMESPACE \note On Android, applications with open files on the external storage (<USER> locations), will be killed if the external storage is unmounted. + \note On iOS, if you do pass \c {QStandardPaths::standardLocations(QStandardPaths::PicturesLocation).last()} + as argument to \l{QFileDialog::setDirectory()}, + a native image picker dialog will be used for accessing the user's photo album. + The filename returned can be loaded using QFile and related APIs. + This feature was added in Qt 5.5. + \sa writableLocation(), standardLocations(), displayName(), locate(), locateAll() */ |