diff options
| author | Simon Hausmann <simon.hausmann@theqtcompany.com> | 2015-06-04 05:56:06 +0000 |
|---|---|---|
| committer | The Qt Project <gerrit-noreply@qt-project.org> | 2015-06-04 05:56:06 +0000 |
| commit | ccad00121d0a9d703cf715c54347b32bfc33bbfc (patch) | |
| tree | 8e492f00f9ea81d87ae9126ad06c3dbc21fee3a3 /src/dbus/qdbusunixfiledescriptor.cpp | |
| parent | dc2617f35be61b4827b8e3d192c85e2feacf7f6a (diff) | |
| parent | e2f66f921594b7be4af4a058c959557489e86879 (diff) | |
Merge "Merge remote-tracking branch 'origin/5.5' into dev" into refs/staging/dev
Diffstat (limited to 'src/dbus/qdbusunixfiledescriptor.cpp')
| -rw-r--r-- | src/dbus/qdbusunixfiledescriptor.cpp | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/src/dbus/qdbusunixfiledescriptor.cpp b/src/dbus/qdbusunixfiledescriptor.cpp index 96caa805498..77f48c03a49 100644 --- a/src/dbus/qdbusunixfiledescriptor.cpp +++ b/src/dbus/qdbusunixfiledescriptor.cpp @@ -174,6 +174,12 @@ QDBusUnixFileDescriptor &QDBusUnixFileDescriptor::operator=(const QDBusUnixFileD } /*! + \fn QDBusUnixFileDescriptor &operator=(QDBusUnixFileDescriptor &&other) + + Move-assigns \a other to this QDBusUnixFileDescriptor. +*/ + +/*! Destroys this QDBusUnixFileDescriptor object and disposes of the Unix file descriptor that it contained. */ QDBusUnixFileDescriptor::~QDBusUnixFileDescriptor() |