path: root/src/corelib/io
diff options
authorFrederik Gladhorn <>2015-02-24 17:19:40 +0100
committerFrederik Gladhorn <>2015-02-24 21:02:08 +0100
commit34b14a8472f44f8517577756e033b92ebd4c5912 (patch)
tree66a0575156d0a17a835430137e218e2b3f04cc65 /src/corelib/io
parentd34353a065c443aac20376cbd88323480d769183 (diff)
parentedd555425a08f9e074f0a4d9333862636ccaae8d (diff)
Merge remote-tracking branch 'origin/5.4' into 5.5
Conflicts: examples/xml/htmlinfo/simpleexample.html examples/xml/rsslisting/rsslisting.cpp qmake/generators/win32/msbuild_objectmodel.cpp src/3rdparty/harfbuzz-ng/src/hb-private.hh src/corelib/global/qlogging.cpp src/corelib/io/qstorageinfo_unix.cpp src/corelib/thread/qwaitcondition_unix.cpp src/gui/kernel/qguiapplication.cpp src/plugins/platforms/linuxfb/qlinuxfbintegration.cpp src/testlib/doc/src/qt-webpages.qdoc tests/auto/other/qaccessibility/tst_qaccessibility.cpp Change-Id: Ib272ff0bc30a1a5d51275eb3cd2f201dc82c11ff
Diffstat (limited to 'src/corelib/io')
9 files changed, 30 insertions, 22 deletions
diff --git a/src/corelib/io/qfileselector.cpp b/src/corelib/io/qfileselector.cpp
index 32f55f3e2c..4ca07ba41d 100644
--- a/src/corelib/io/qfileselector.cpp
+++ b/src/corelib/io/qfileselector.cpp
@@ -231,7 +231,7 @@ static QString qrcScheme()
- This is a convenience version of select operating on QUrls. If the scheme is not file or qrc,
+ This is a convenience version of select operating on QUrl objects. If the scheme is not file or qrc,
\a filePath is returned immediately. Otherwise selection is applied to the path of \a filePath
and a QUrl is returned with the selected path and other QUrl parts the same as \a filePath.
diff --git a/src/corelib/io/qiodevice.cpp b/src/corelib/io/qiodevice.cpp
index 0aa4db34e5..ea7e7b2731 100644
--- a/src/corelib/io/qiodevice.cpp
+++ b/src/corelib/io/qiodevice.cpp
@@ -706,7 +706,7 @@ bool QIODevice::reset()
number of bytes to allocate in a buffer before reading.
Subclasses that reimplement this function must call the base
- implementation in order to include the size of QIODevices' buffer. Example:
+ implementation in order to include the size of the buffer of QIODevice. Example:
\snippet code/src_corelib_io_qiodevice.cpp 1
diff --git a/src/corelib/io/qprocess.cpp b/src/corelib/io/qprocess.cpp
index e7439e6f25..6451bae0ba 100644
--- a/src/corelib/io/qprocess.cpp
+++ b/src/corelib/io/qprocess.cpp
@@ -1456,7 +1456,7 @@ void QProcess::setStandardErrorFile(const QString &fileName, OpenMode mode)
The following shell command:
\snippet code/src_corelib_io_qprocess.cpp 2
- Can be accomplished with QProcesses with the following code:
+ Can be accomplished with QProcess with the following code:
\snippet code/src_corelib_io_qprocess.cpp 3
void QProcess::setStandardOutputProcess(QProcess *destination)
diff --git a/src/corelib/io/qresource.cpp b/src/corelib/io/qresource.cpp
index 606859032e..4b85645a90 100644
--- a/src/corelib/io/qresource.cpp
+++ b/src/corelib/io/qresource.cpp
@@ -197,7 +197,7 @@ Q_GLOBAL_STATIC(QStringList, resourceSearchPaths)
path requested in setFileName().
The unregisterResource() function removes a reference to a particular
- file. If there are QResources that currently reference resources related
+ file. If there are QResource objects that currently reference resources related
to the unregistered file, they will continue to be valid but the resource
file itself will be removed from the resource roots, and thus no further
QResource can be created pointing into this resource data. The resource
diff --git a/src/corelib/io/qstandardpaths.cpp b/src/corelib/io/qstandardpaths.cpp
index 31939830e0..4fd429cad4 100644
--- a/src/corelib/io/qstandardpaths.cpp
+++ b/src/corelib/io/qstandardpaths.cpp
@@ -77,15 +77,10 @@ QT_BEGIN_NAMESPACE
this user, but should still be assumed to be unreachable by applications by
other users.
- The only exception is QStandardPaths::TempLocation (which is the same as
- QDir::tempPath()): the path returned may be application-specific, but files
- stored there may be accessed by other applications run by the same user.
Data interchange with other users is out of the scope of QStandardPaths.
\value DesktopLocation Returns the user's desktop directory. This is a generic value.
- On systems with no concept of a desktop, this is the same as
- QStandardPaths::HomeLocation.
+ On systems with no concept of a desktop.
\value DocumentsLocation Returns the directory containing user document files.
This is a generic value. The returned path is never empty.
\value FontsLocation Returns the directory containing user's fonts. This is a generic value.
@@ -118,9 +113,6 @@ QT_BEGIN_NAMESPACE
\value GenericCacheLocation Returns a directory location where user-specific non-essential
(cached) data, shared across applications, should be written. This is a generic value.
Note that the returned path may be empty if the system has no concept of shared cache.
- \value GenericDataLocation Returns a directory location where persistent
- data shared across applications can be stored. This is a generic value. The returned
- path is never empty.
\value RuntimeLocation Returns a directory location where runtime communication
files should be written, like Unix local sockets. This is a generic value.
The returned path may be empty on some systems.
diff --git a/src/corelib/io/qstandardpaths_android.cpp b/src/corelib/io/qstandardpaths_android.cpp
index 8c8e871a4b..350e5cdbea 100644
--- a/src/corelib/io/qstandardpaths_android.cpp
+++ b/src/corelib/io/qstandardpaths_android.cpp
@@ -57,7 +57,7 @@ static QJNIObjectPrivate applicationContext()
if (appCtx.isValid())
return appCtx;
- QJNIObjectPrivate activity = QtAndroidPrivate::activity();
+ QJNIObjectPrivate activity(QtAndroidPrivate::activity());
if (!activity.isValid())
return appCtx;
@@ -131,7 +131,7 @@ static QString getExternalFilesDir(const char *directoryField = 0)
if (!path.isEmpty())
return path;
- QJNIObjectPrivate activity = QtAndroidPrivate::activity();
+ QJNIObjectPrivate activity(QtAndroidPrivate::activity());
if (!activity.isValid())
return QString();
diff --git a/src/corelib/io/qstorageinfo_unix.cpp b/src/corelib/io/qstorageinfo_unix.cpp
index 7e23ac897d..45b32830cd 100644
--- a/src/corelib/io/qstorageinfo_unix.cpp
+++ b/src/corelib/io/qstorageinfo_unix.cpp
@@ -54,6 +54,7 @@
# include <sys/statvfs.h>
#elif defined(Q_OS_SOLARIS)
# include <sys/mnttab.h>
+# include <sys/statvfs.h>
#elif defined(Q_OS_HAIKU)
# include <Directory.h>
# include <Path.h>
@@ -210,17 +211,17 @@ inline bool QStorageIterator::next()
inline QString QStorageIterator::rootPath() const
- return QFile::decodeName(mnt->mnt_mountp);
+ return QFile::decodeName(mnt.mnt_mountp);
inline QByteArray QStorageIterator::fileSystemType() const
- return QByteArray(mnt->mnt_fstype);
+ return QByteArray(mnt.mnt_fstype);
inline QByteArray QStorageIterator::device() const
- return QByteArray(mnt->mnt_mntopts);
+ return QByteArray(mnt.mnt_mntopts);
#elif defined(Q_OS_ANDROID)
diff --git a/src/corelib/io/qurl.cpp b/src/corelib/io/qurl.cpp
index ad0a6b8d53..89f5aad97f 100644
--- a/src/corelib/io/qurl.cpp
+++ b/src/corelib/io/qurl.cpp
@@ -82,7 +82,7 @@
For the convenience of generating encoded URL strings or query
strings, there are two static functions called
fromPercentEncoding() and toPercentEncoding() which deal with
- percent encoding and decoding of QStrings.
+ percent encoding and decoding of QString objects.
Calling isRelative() will tell whether or not the URL is
relative. A relative URL can be resolved by passing it as argument
@@ -172,7 +172,7 @@
setters setting components of a URL; it is not permitted in
the QUrl constructor, in fromEncoded() or in setUrl().
For more information on this mode, see the documentation for
- QUrl::FullyDecoded.
+ \l {QUrl::ComponentFormattingOption}{QUrl::FullyDecoded}.
In TolerantMode, the parser has the following behaviour:
@@ -3083,6 +3083,21 @@ bool QUrl::hasFragment() const
URL does not contain a valid TLD, in which case the function returns
an empty string.
+ Note that this function considers a TLD to be any domain that allows users
+ to register subdomains under, including many home, dynamic DNS websites and
+ blogging providers. This is useful for determining whether two websites
+ belong to the same infrastructure and communication should be allowed, such
+ as browser cookies: two domains should be considered part of the same
+ website if they share at least one label in addition to the value
+ returned by this function.
+ \list
+ \li \c{} and \c{} do not share a top-level domain
+ \li \c{} and \c{} share the \c{} domain, but the next label is different
+ \li \c{} and \c{} share the same top-level domain and one more label,
+ so they are considered part of the same site
+ \endlist
If \a options includes EncodeUnicode, the returned string will be in
ASCII Compatible Encoding.
@@ -4041,7 +4056,7 @@ QString QUrl::errorString() const
\since 5.1
- Converts a list of \a urls into a list of QStrings, using toString(\a options).
+ Converts a list of \a urls into a list of QString objects, using toString(\a options).
QStringList QUrl::toStringList(const QList<QUrl> &urls, FormattingOptions options)
diff --git a/src/corelib/io/qurlquery.cpp b/src/corelib/io/qurlquery.cpp
index 6be7d3531f..77d1ab3e24 100644
--- a/src/corelib/io/qurlquery.cpp
+++ b/src/corelib/io/qurlquery.cpp
@@ -414,7 +414,7 @@ bool QUrlQuery::operator ==(const QUrlQuery &other) const
- Returns \c true if this QUrlQUery object contains no key-value pairs, such as
+ Returns \c true if this QUrlQuery object contains no key-value pairs, such as
after being default-constructed or after parsing an empty query string.
\sa setQuery(), clear()