diff options
| author | Alex Blasche <alexander.blasche@theqtcompany.com> | 2016-03-08 10:33:06 +0100 |
|---|---|---|
| committer | Alex Blasche <alexander.blasche@theqtcompany.com> | 2016-03-08 10:33:06 +0100 |
| commit | f60eb3f04b44c4e933b9628f8f058d4f642d9853 (patch) | |
| tree | b4bab4d1387cfff3052ce0b6f4fcd87bdc355a8e /src/plugins/canbus/tinycan | |
| parent | 97e9c6d8e9a97af31af1aad75cb0162323e98b65 (diff) | |
| parent | 48f32572590e45a57573944c0822855819d138df (diff) | |
Merge remote-tracking branch 'gerrit/5.6.0' into 5.6
Conflicts:
src/plugins/canbus/socketcan/main.cpp
Change-Id: I17ac8fdbbbb4569f840bf2be1f25d571c2920451
Diffstat (limited to 'src/plugins/canbus/tinycan')
| -rw-r--r-- | src/plugins/canbus/tinycan/main.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
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") |