diff options
| author | Alex Blasche <alexander.blasche@theqtcompany.com> | 2016-02-17 09:31:48 +0100 |
|---|---|---|
| committer | Jani Heikkinen <jani.heikkinen@theqtcompany.com> | 2016-02-18 10:32:29 +0000 |
| commit | eded6c6c20075628d526541dae94356d3d51965d (patch) | |
| tree | 7d2c6cb0e9c5ddbe3308daa8b8bb4fa1a87dd21d | |
| parent | c3f263509b64814ba12dbb627897de00b05230bc (diff) | |
Fix static builds of CAN bus pluginsv5.6.0-rc1
Task-number: QTBUG-51201
Change-Id: Ibb8aa4e95d642429aef702f62b96e54bd4ace2e1
Reviewed-by: Friedemann Kleint <Friedemann.Kleint@theqtcompany.com>
Reviewed-by: Karsten Heimrich <karsten.heimrich@theqtcompany.com>
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@theqtcompany.com>
| -rw-r--r-- | src/plugins/canbus/peakcan/main.cpp | 2 | ||||
| -rw-r--r-- | src/plugins/canbus/socketcan/main.cpp | 2 | ||||
| -rw-r--r-- | src/plugins/canbus/tinycan/main.cpp | 2 | ||||
| -rw-r--r-- | src/src.pro | 2 |
4 files changed, 4 insertions, 4 deletions
diff --git a/src/plugins/canbus/peakcan/main.cpp b/src/plugins/canbus/peakcan/main.cpp index 5805c11..4544690 100644 --- a/src/plugins/canbus/peakcan/main.cpp +++ b/src/plugins/canbus/peakcan/main.cpp @@ -43,7 +43,7 @@ QT_BEGIN_NAMESPACE -class CanBusPlugin : public QObject, public QCanBusFactory +class PeakCanBusPlugin : public QObject, public QCanBusFactory { Q_OBJECT Q_PLUGIN_METADATA(IID "org.qt-project.Qt.QCanBusFactory" FILE "plugin.json") diff --git a/src/plugins/canbus/socketcan/main.cpp b/src/plugins/canbus/socketcan/main.cpp index f1c34f5..214be7e 100644 --- a/src/plugins/canbus/socketcan/main.cpp +++ b/src/plugins/canbus/socketcan/main.cpp @@ -44,7 +44,7 @@ QT_BEGIN_NAMESPACE -class CanBusPlugin : public QObject, public QCanBusFactory +class SocketCanBusPlugin : public QObject, public QCanBusFactory { Q_OBJECT Q_PLUGIN_METADATA(IID "org.qt-project.Qt.QCanBusFactory" FILE "plugin.json") diff --git a/src/plugins/canbus/tinycan/main.cpp b/src/plugins/canbus/tinycan/main.cpp index 485f73f..6e1f959 100644 --- a/src/plugins/canbus/tinycan/main.cpp +++ b/src/plugins/canbus/tinycan/main.cpp @@ -43,7 +43,7 @@ QT_BEGIN_NAMESPACE -class CanBusPlugin : public QObject, public QCanBusFactory +class TinyCanBusPlugin : public QObject, public QCanBusFactory { Q_OBJECT Q_PLUGIN_METADATA(IID "org.qt-project.Qt.QCanBusFactory" FILE "plugin.json") diff --git a/src/src.pro b/src/src.pro index bd12381..c1543b3 100644 --- a/src/src.pro +++ b/src/src.pro @@ -12,7 +12,7 @@ plugins.depends = serialbus SUBDIRS += tools tools.subdir = tools tools.target = sub-tools -tools.depends = serialbus +tools.depends = serialbus plugins !android:contains(QT_CONFIG, private_tests) { SUBDIRS += serialbus_doc_snippets |