diff options
| author | Lars Knoll <lars.knoll@qt.io> | 2017-05-17 13:07:14 +0200 |
|---|---|---|
| committer | Lars Knoll <lars.knoll@qt.io> | 2017-05-17 13:42:47 +0000 |
| commit | 51f095e655ce8b4b1d73d0d11817bb839a91c1df (patch) | |
| tree | 51748dc09aceacedee36b166562c133a27e93abd /src/dbus/qdbusmetatype_p.h | |
| parent | 3f1548ae82d4321b6fdbbf127dafbdf385374be0 (diff) | |
Revert "Merge the QDBusMetaType's custom information to QDBusConnectionManager"
This reverts commit daeb334039e9dcc01485995f53552749131a06b7.
The commit was causing race conditions, and random failures in CI.
Task-number: QTBUG-60792
Change-Id: I6e49b733965632a1a268f0e88809794098465ec0
Reviewed-by: Simon Hausmann <simon.hausmann@qt.io>
Reviewed-by: Lars Knoll <lars.knoll@qt.io>
Diffstat (limited to 'src/dbus/qdbusmetatype_p.h')
| -rw-r--r-- | src/dbus/qdbusmetatype_p.h | 27 |
1 files changed, 1 insertions, 26 deletions
diff --git a/src/dbus/qdbusmetatype_p.h b/src/dbus/qdbusmetatype_p.h index 1f7e61318a..1aa11552df 100644 --- a/src/dbus/qdbusmetatype_p.h +++ b/src/dbus/qdbusmetatype_p.h @@ -1,7 +1,6 @@ /**************************************************************************** ** ** Copyright (C) 2016 The Qt Company Ltd. -** Copyright (C) 2016 Intel Corporation. ** Contact: https://www.qt.io/licensing/ ** ** This file is part of the QtDBus module of the Qt Toolkit. @@ -61,27 +60,10 @@ #include <qdbuserror.h> #include <qdbusunixfiledescriptor.h> -#include <qbytearray.h> -#include <qreadwritelock.h> -#include <qvector.h> - #ifndef QT_NO_DBUS QT_BEGIN_NAMESPACE -class QDBusCustomTypeInfo -{ -public: - QDBusCustomTypeInfo() : signature(), marshall(0), demarshall(0) - { } - - // Suggestion: - // change 'signature' to char* and make QDBusCustomTypeInfo a Movable type - QByteArray signature; - QDBusMetaType::MarshallFunction marshall; - QDBusMetaType::DemarshallFunction demarshall; -}; - struct QDBusMetaTypeId { static int message(); // QDBusMessage @@ -92,14 +74,7 @@ struct QDBusMetaTypeId static int error(); // QDBusError static int unixfd(); // QDBusUnixFileDescriptor - static void init() { instance(); } - static QDBusMetaTypeId *instance(); - - mutable QReadWriteLock customTypesLock; - QVector<QDBusCustomTypeInfo> customTypes; - -protected: - QDBusMetaTypeId(); + static void init(); }; inline int QDBusMetaTypeId::message() |