From 85557694df4246f8a8a9d5d3351dd6716af31d96 Mon Sep 17 00:00:00 2001 From: Friedemann Kleint Date: Mon, 17 Dec 2012 12:03:53 +0100 Subject: [PATCH] DBUS: Fix linker errors on Windows. QDBusMarshaller symbols were duplicated. Initial-patch-by: vonreth@kde.org Change-Id: Ic66681696aaf2a440119c06fce8d1dbd99c8396a Reviewed-by: Patrick von Reth Reviewed-by: Andreas Holzammer Reviewed-by: Thiago Macieira --- src/tools/qdbuscpp2xml/qdbuscpp2xml.pro | 1 - src/tools/qdbusxml2cpp/qdbusxml2cpp.pro | 1 - 2 files changed, 2 deletions(-) diff --git a/src/tools/qdbuscpp2xml/qdbuscpp2xml.pro b/src/tools/qdbuscpp2xml/qdbuscpp2xml.pro index a17b91dd79..02c3655f33 100644 --- a/src/tools/qdbuscpp2xml/qdbuscpp2xml.pro +++ b/src/tools/qdbuscpp2xml/qdbuscpp2xml.pro @@ -19,7 +19,6 @@ SOURCES += qdbuscpp2xml.cpp \ $$QT_SOURCE_TREE/src/dbus/qdbusutil.cpp \ $$QT_SOURCE_TREE/src/dbus/qdbusmisc.cpp \ $$QT_SOURCE_TREE/src/dbus/qdbusargument.cpp \ - $$QT_SOURCE_TREE/src/dbus/qdbusmarshaller.cpp \ $$QT_SOURCE_TREE/src/dbus/qdbusextratypes.cpp \ $$QT_SOURCE_TREE/src/dbus/qdbus_symbols.cpp \ $$QT_SOURCE_TREE/src/dbus/qdbusunixfiledescriptor.cpp diff --git a/src/tools/qdbusxml2cpp/qdbusxml2cpp.pro b/src/tools/qdbusxml2cpp/qdbusxml2cpp.pro index 7c2bb2e22f..b473014938 100644 --- a/src/tools/qdbusxml2cpp/qdbusxml2cpp.pro +++ b/src/tools/qdbusxml2cpp/qdbusxml2cpp.pro @@ -19,7 +19,6 @@ SOURCES = qdbusxml2cpp.cpp \ $$QT_SOURCE_TREE/src/dbus/qdbusutil.cpp \ $$QT_SOURCE_TREE/src/dbus/qdbusmetatype.cpp \ $$QT_SOURCE_TREE/src/dbus/qdbusargument.cpp \ - $$QT_SOURCE_TREE/src/dbus/qdbusmarshaller.cpp \ $$QT_SOURCE_TREE/src/dbus/qdbusextratypes.cpp \ $$QT_SOURCE_TREE/src/dbus/qdbus_symbols.cpp \ $$QT_SOURCE_TREE/src/dbus/qdbusunixfiledescriptor.cpp