diff options
| author | Kent Hansen <kent.hansen@nokia.com> | 2012-03-19 10:03:48 +0100 |
|---|---|---|
| committer | Kent Hansen <kent.hansen@nokia.com> | 2012-03-19 10:03:48 +0100 |
| commit | 95d6f8a4cf3fba2fd675f0e6b5de0ce1d702da26 (patch) | |
| tree | a0bb36e478c97761afa36baf8026726b3d2fdbc8 /src/dbus | |
| parent | 3f64a7b67bfbcaab65ebb03f84962cce5834790b (diff) | |
| parent | 25e004bfe493e18be255b057ae5c132a5ec5458b (diff) | |
Merge master into api_changes
Conflicts:
src/corelib/tools/qvector.h
tests/auto/corelib/kernel/qmetatype/tst_qmetatype.cpp
Change-Id: I877256e95f3788e617437f4e9661a88047f38cd6
Diffstat (limited to 'src/dbus')
| -rw-r--r-- | src/dbus/qdbusunixfiledescriptor.h | 3 |
1 files changed, 0 insertions, 3 deletions
diff --git a/src/dbus/qdbusunixfiledescriptor.h b/src/dbus/qdbusunixfiledescriptor.h index ad5d00ba0b..bfb2262a31 100644 --- a/src/dbus/qdbusunixfiledescriptor.h +++ b/src/dbus/qdbusunixfiledescriptor.h @@ -58,7 +58,6 @@ QT_BEGIN_NAMESPACE class QDBusUnixFileDescriptorPrivate; -template<> QExplicitlySharedDataPointer<QDBusUnixFileDescriptorPrivate>::~QExplicitlySharedDataPointer(); class Q_DBUS_EXPORT QDBusUnixFileDescriptor { @@ -80,8 +79,6 @@ public: static bool isSupported(); #if defined(Q_COMPILER_RVALUE_REFS) - QDBusUnixFileDescriptor(QDBusUnixFileDescriptor &&other) : d(static_cast<Data &&>(other.d)) - { } inline QDBusUnixFileDescriptor &operator=(QDBusUnixFileDescriptor &&other) { d.swap(other.d); return *this; } #endif |