diff options
| author | André Hartmann <aha_1980@gmx.de> | 2017-03-27 11:43:07 +0000 |
|---|---|---|
| committer | André Hartmann <aha_1980@gmx.de> | 2017-03-27 12:27:25 +0000 |
| commit | daa73821d36591df8e975777f3f35d00395fcc94 (patch) | |
| tree | df1e265253ebae12d5c5d1f6e5c90c59c1875b64 /src | |
| parent | 287c43c9c35e900dbf8e820c60d0b71cbe9099ef (diff) | |
Revert "QCanBusFactory: de-inline virtual destructor"
It turned out, that this change is not binary compatible
as it was meant to be. Loading the plugins with
QPluginLoader failed, so this patch needs to be reverted.
This reverts commit b63a833346ed14baddbf598d48e005090b8bcb56.
Change-Id: I32c7e3a46bdd5e2ea6217e6d2050a3878f53f1ff
Reviewed-by: Alex Blasche <alexander.blasche@qt.io>
Diffstat (limited to 'src')
| -rw-r--r-- | src/serialbus/qcanbusfactory.cpp | 6 | ||||
| -rw-r--r-- | src/serialbus/qcanbusfactory.h | 2 |
2 files changed, 4 insertions, 4 deletions
diff --git a/src/serialbus/qcanbusfactory.cpp b/src/serialbus/qcanbusfactory.cpp index a8fc539..632d3c4 100644 --- a/src/serialbus/qcanbusfactory.cpp +++ b/src/serialbus/qcanbusfactory.cpp @@ -63,9 +63,9 @@ QT_BEGIN_NAMESPACE /*! \internal + + \fn QCanBusFactory::~QCanBusFactory() */ -QCanBusFactory::~QCanBusFactory() -{ -} + QT_END_NAMESPACE diff --git a/src/serialbus/qcanbusfactory.h b/src/serialbus/qcanbusfactory.h index 14f381e..1d23168 100644 --- a/src/serialbus/qcanbusfactory.h +++ b/src/serialbus/qcanbusfactory.h @@ -49,7 +49,7 @@ public: virtual QCanBusDevice *createDevice(const QString &interfaceName, QString *errorMessage) const = 0; protected: - virtual ~QCanBusFactory(); + virtual ~QCanBusFactory() {} }; Q_DECLARE_INTERFACE(QCanBusFactory, "org.qt-project.Qt.QCanBusFactory") |