diff options
| author | Alex Blasche <alexander.blasche@theqtcompany.com> | 2016-03-09 15:57:34 +0100 |
|---|---|---|
| committer | Alex Blasche <alexander.blasche@theqtcompany.com> | 2016-03-09 15:57:45 +0100 |
| commit | 42f123bb3c6eb8faf48173aa939b478c57d132e6 (patch) | |
| tree | e3cd8fafeb306ffab085dd02e1c4c566b9491742 /tests | |
| parent | 63e40c9f8ac12e280ae89e938916d5a65bdda8c2 (diff) | |
| parent | 7076c45016ac68aaf1cf15e499a8a435ce14f501 (diff) | |
Merge remote-tracking branch 'gerrit/5.6' into 5.7
Change-Id: I9b374c2520417955e940b280c80c70731d123f05
Diffstat (limited to 'tests')
| -rw-r--r-- | tests/auto/plugins/genericcanbus/genericcanbus.pro | 12 | ||||
| -rw-r--r-- | tests/tests.pro | 2 |
2 files changed, 8 insertions, 6 deletions
diff --git a/tests/auto/plugins/genericcanbus/genericcanbus.pro b/tests/auto/plugins/genericcanbus/genericcanbus.pro index d9a4647..6d1b6dc 100644 --- a/tests/auto/plugins/genericcanbus/genericcanbus.pro +++ b/tests/auto/plugins/genericcanbus/genericcanbus.pro @@ -1,11 +1,6 @@ -QT = core serialbus - TARGET = qtcanbustestgeneric -PLUGIN_TYPE = canbus -PLUGIN_EXTENDS = serialbus -PLUGIN_CLASS_NAME = DummyBusPlugin -load(qt_plugin) +QT = core serialbus HEADERS += \ dummybackend.h @@ -14,3 +9,8 @@ SOURCES += main.cpp \ dummybackend.cpp OTHER_FILES = plugin.json + +PLUGIN_TYPE = canbus +PLUGIN_EXTENDS = serialbus +PLUGIN_CLASS_NAME = DummyBusPlugin +load(qt_plugin) diff --git a/tests/tests.pro b/tests/tests.pro index 157ef34..f2f91d3 100644 --- a/tests/tests.pro +++ b/tests/tests.pro @@ -1,2 +1,4 @@ +requires(qtHaveModule(serialbus)) + TEMPLATE = subdirs SUBDIRS += auto |