diff options
| author | Frederik Gladhorn <frederik.gladhorn@digia.com> | 2013-10-11 16:12:21 +0200 |
|---|---|---|
| committer | Frederik Gladhorn <frederik.gladhorn@digia.com> | 2013-10-11 16:12:35 +0200 |
| commit | d0eb444a49f6064ecb896f62276e060cd8a4b1e8 (patch) | |
| tree | 34d8dd637baf665225ada73e76604531cd2c75e5 /src/dbus/qdbusunixfiledescriptor.cpp | |
| parent | da0cb32b8ee7cc4a991a59420a411898e63a660e (diff) | |
| parent | 894f86709080fe8d20875b402adce679963c49c2 (diff) | |
Merge remote-tracking branch 'origin/stable' into dev
Change-Id: Ib8cfeee7d9ca15e8ad520e428b72c200827a8628
Diffstat (limited to 'src/dbus/qdbusunixfiledescriptor.cpp')
| -rw-r--r-- | src/dbus/qdbusunixfiledescriptor.cpp | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/src/dbus/qdbusunixfiledescriptor.cpp b/src/dbus/qdbusunixfiledescriptor.cpp index db893337ae6..63c5b40d068 100644 --- a/src/dbus/qdbusunixfiledescriptor.cpp +++ b/src/dbus/qdbusunixfiledescriptor.cpp @@ -197,7 +197,7 @@ QDBusUnixFileDescriptor::~QDBusUnixFileDescriptor() */ /*! - Returns true if this Unix file descriptor is valid. A valid Unix file + Returns \c true if this Unix file descriptor is valid. A valid Unix file descriptor is not -1. \sa fileDescriptor() @@ -231,11 +231,11 @@ int QDBusUnixFileDescriptor::fileDescriptor() const // qdoc documentation is generated on Unix /*! - Returns true if Unix file descriptors are supported on this platform. In - other words, this function returns true if this is a Unix platform. + Returns \c true if Unix file descriptors are supported on this platform. In + other words, this function returns \c true if this is a Unix platform. Note that QDBusUnixFileDescriptor continues to operate even if this - function returns false. The only difference is that the + function returns \c false. The only difference is that the QDBusUnixFileDescriptor objects will always be in the isValid() == false state and fileDescriptor() will always return -1. The class will not consume any operating system resources. |