diff options
| -rw-r--r-- | src/dbus/qdbusextratypes.h | 2 | ||||
| -rw-r--r-- | src/dbus/qdbusmetatype.cpp | 9 | ||||
| -rw-r--r-- | src/dbus/qdbusunixfiledescriptor.h | 1 | ||||
| -rw-r--r-- | src/network/access/qhttpnetworkreply_p.h | 2 | ||||
| -rw-r--r-- | src/network/access/qhttpnetworkrequest_p.h | 2 | ||||
| -rw-r--r-- | src/network/access/qnetworkcookie.h | 1 | ||||
| -rw-r--r-- | src/network/bearer/qnetworksession_p.h | 2 | ||||
| -rw-r--r-- | src/widgets/graphicsview/qgraphicsscene.h | 2 | ||||
| -rw-r--r-- | tests/auto/corelib/kernel/qvariant/tst_qvariant.cpp | 5 |
9 files changed, 0 insertions, 26 deletions
diff --git a/src/dbus/qdbusextratypes.h b/src/dbus/qdbusextratypes.h index 07b07fe3bc..5e8b6c31b2 100644 --- a/src/dbus/qdbusextratypes.h +++ b/src/dbus/qdbusextratypes.h @@ -175,9 +175,7 @@ QT_END_NAMESPACE Q_DECLARE_METATYPE(QDBusVariant) Q_DECLARE_METATYPE(QDBusObjectPath) -Q_DECLARE_METATYPE(QList<QDBusObjectPath>) Q_DECLARE_METATYPE(QDBusSignature) -Q_DECLARE_METATYPE(QList<QDBusSignature>) QT_END_HEADER diff --git a/src/dbus/qdbusmetatype.cpp b/src/dbus/qdbusmetatype.cpp index 03cad1ee63..5c8a7bc08f 100644 --- a/src/dbus/qdbusmetatype.cpp +++ b/src/dbus/qdbusmetatype.cpp @@ -64,15 +64,6 @@ # define DBUS_TYPE_UNIX_FD_AS_STRING "h" #endif -Q_DECLARE_METATYPE(QList<bool>) -Q_DECLARE_METATYPE(QList<short>) -Q_DECLARE_METATYPE(QList<ushort>) -Q_DECLARE_METATYPE(QList<int>) -Q_DECLARE_METATYPE(QList<uint>) -Q_DECLARE_METATYPE(QList<qlonglong>) -Q_DECLARE_METATYPE(QList<qulonglong>) -Q_DECLARE_METATYPE(QList<double>) - QT_BEGIN_NAMESPACE class QDBusCustomTypeInfo diff --git a/src/dbus/qdbusunixfiledescriptor.h b/src/dbus/qdbusunixfiledescriptor.h index 2f80772e6f..ce0a5a0986 100644 --- a/src/dbus/qdbusunixfiledescriptor.h +++ b/src/dbus/qdbusunixfiledescriptor.h @@ -96,7 +96,6 @@ Q_DECLARE_SHARED(QDBusUnixFileDescriptor) QT_END_NAMESPACE Q_DECLARE_METATYPE(QDBusUnixFileDescriptor) -Q_DECLARE_METATYPE(QList<QDBusUnixFileDescriptor>) QT_END_HEADER diff --git a/src/network/access/qhttpnetworkreply_p.h b/src/network/access/qhttpnetworkreply_p.h index 75139f474b..e077c07fd5 100644 --- a/src/network/access/qhttpnetworkreply_p.h +++ b/src/network/access/qhttpnetworkreply_p.h @@ -249,8 +249,6 @@ public: QT_END_NAMESPACE -//Q_DECLARE_METATYPE(QHttpNetworkReply) - #endif // QT_NO_HTTP diff --git a/src/network/access/qhttpnetworkrequest_p.h b/src/network/access/qhttpnetworkrequest_p.h index 949d98484f..d6d9c69bea 100644 --- a/src/network/access/qhttpnetworkrequest_p.h +++ b/src/network/access/qhttpnetworkrequest_p.h @@ -155,8 +155,6 @@ public: QT_END_NAMESPACE -//Q_DECLARE_METATYPE(QHttpNetworkRequest) - #endif // QT_NO_HTTP diff --git a/src/network/access/qnetworkcookie.h b/src/network/access/qnetworkcookie.h index 8925791710..6be6ca6262 100644 --- a/src/network/access/qnetworkcookie.h +++ b/src/network/access/qnetworkcookie.h @@ -119,7 +119,6 @@ Q_NETWORK_EXPORT QDebug operator<<(QDebug, const QNetworkCookie &); QT_END_NAMESPACE Q_DECLARE_METATYPE(QNetworkCookie) -Q_DECLARE_METATYPE(QList<QNetworkCookie>) QT_END_HEADER diff --git a/src/network/bearer/qnetworksession_p.h b/src/network/bearer/qnetworksession_p.h index 4d036d601d..9c0b695422 100644 --- a/src/network/bearer/qnetworksession_p.h +++ b/src/network/bearer/qnetworksession_p.h @@ -153,8 +153,6 @@ protected: QT_END_NAMESPACE -Q_DECLARE_METATYPE(QSharedPointer<QNetworkSession>) - #endif // QT_NO_BEARERMANAGEMENT #endif // QNETWORKSESSIONPRIVATE_H diff --git a/src/widgets/graphicsview/qgraphicsscene.h b/src/widgets/graphicsview/qgraphicsscene.h index 3c9b6e2fb0..62a0020946 100644 --- a/src/widgets/graphicsview/qgraphicsscene.h +++ b/src/widgets/graphicsview/qgraphicsscene.h @@ -324,8 +324,6 @@ Q_DECLARE_OPERATORS_FOR_FLAGS(QGraphicsScene::SceneLayers) QT_END_NAMESPACE -Q_DECLARE_METATYPE(QGraphicsScene *) - QT_END_HEADER #endif diff --git a/tests/auto/corelib/kernel/qvariant/tst_qvariant.cpp b/tests/auto/corelib/kernel/qvariant/tst_qvariant.cpp index ae4d155804..3a0b93640f 100644 --- a/tests/auto/corelib/kernel/qvariant/tst_qvariant.cpp +++ b/tests/auto/corelib/kernel/qvariant/tst_qvariant.cpp @@ -3192,15 +3192,10 @@ QT_BEGIN_NAMESPACE Q_DECLARE_TYPEINFO(MyMovable, Q_MOVABLE_TYPE); QT_END_NAMESPACE -Q_DECLARE_METATYPE(QList<QSize>) Q_DECLARE_METATYPE(MyPrimitive) Q_DECLARE_METATYPE(MyData) Q_DECLARE_METATYPE(MyMovable) Q_DECLARE_METATYPE(MyNotMovable) -Q_DECLARE_METATYPE(QList<MyPrimitive>) -Q_DECLARE_METATYPE(QList<MyData>) -Q_DECLARE_METATYPE(QList<MyMovable>) -Q_DECLARE_METATYPE(QList<MyNotMovable>) Q_DECLARE_METATYPE(MyPrimitive *) Q_DECLARE_METATYPE(MyData *) Q_DECLARE_METATYPE(MyMovable *) |