diff options
| author | Denis Shienkov <denis.shienkov@gmail.com> | 2016-05-12 15:39:03 +0300 |
|---|---|---|
| committer | Denis Shienkov <denis.shienkov@gmail.com> | 2016-05-13 11:27:46 +0000 |
| commit | 78eb4438fd65fe4539b414db91dbc2dd7696434a (patch) | |
| tree | 14ea399906d679adc33646ed0528bc817c292213 | |
| parent | 70ffb4775bec0549fe0da03aab6a6227d10e581b (diff) | |
CAN: Do not use PUBLIC(PRIVATE)_HEADERS division
... also made small cosmetic dependent refactoring of
plugins project files.
Change-Id: I0fbfd585c14868944a3cac8ff5bd82408a5cace6
Reviewed-by: André Hartmann <aha_1980@gmx.de>
Reviewed-by: Alex Blasche <alexander.blasche@theqtcompany.com>
| -rw-r--r-- | src/plugins/canbus/peakcan/peakcan.pro | 8 | ||||
| -rw-r--r-- | src/plugins/canbus/socketcan/socketcan.pro | 7 | ||||
| -rw-r--r-- | src/plugins/canbus/tinycan/tinycan.pro | 8 | ||||
| -rw-r--r-- | tests/auto/plugins/genericcanbus/genericcanbus.pro | 4 |
4 files changed, 11 insertions, 16 deletions
diff --git a/src/plugins/canbus/peakcan/peakcan.pro b/src/plugins/canbus/peakcan/peakcan.pro index 38c22ae..bcea9ac 100644 --- a/src/plugins/canbus/peakcan/peakcan.pro +++ b/src/plugins/canbus/peakcan/peakcan.pro @@ -2,10 +2,8 @@ TARGET = qtpeakcanbus QT = core-private serialbus -PUBLIC_HEADERS += \ - peakcanbackend.h - -PRIVATE_HEADERS += \ +HEADERS += \ + peakcanbackend.h \ peakcanbackend_p.h \ peakcan_symbols_p.h @@ -15,8 +13,6 @@ SOURCES += \ DISTFILES = plugin.json -HEADERS += $$PUBLIC_HEADERS $$PRIVATE_HEADERS - PLUGIN_TYPE = canbus PLUGIN_EXTENDS = serialbus PLUGIN_CLASS_NAME = PeakCanBusPlugin diff --git a/src/plugins/canbus/socketcan/socketcan.pro b/src/plugins/canbus/socketcan/socketcan.pro index f115b71..6a5504f 100644 --- a/src/plugins/canbus/socketcan/socketcan.pro +++ b/src/plugins/canbus/socketcan/socketcan.pro @@ -3,10 +3,11 @@ TARGET = qtsocketcanbus QT = core-private serialbus HEADERS += \ - socketcanbackend.h \ + socketcanbackend.h -SOURCES += main.cpp \ - socketcanbackend.cpp \ +SOURCES += \ + main.cpp \ + socketcanbackend.cpp DISTFILES = plugin.json diff --git a/src/plugins/canbus/tinycan/tinycan.pro b/src/plugins/canbus/tinycan/tinycan.pro index bc1f810..ab6a58b 100644 --- a/src/plugins/canbus/tinycan/tinycan.pro +++ b/src/plugins/canbus/tinycan/tinycan.pro @@ -2,10 +2,8 @@ TARGET = qttinycanbus QT = core-private serialbus -PUBLIC_HEADERS += \ - tinycanbackend.h - -PRIVATE_HEADERS += \ +HEADERS += \ + tinycanbackend.h \ tinycanbackend_p.h \ tinycan_symbols_p.h @@ -14,8 +12,6 @@ SOURCES += main.cpp \ DISTFILES = plugin.json -HEADERS += $$PUBLIC_HEADERS $$PRIVATE_HEADERS - PLUGIN_TYPE = canbus PLUGIN_EXTENDS = serialbus PLUGIN_CLASS_NAME = TinyCanBusPlugin diff --git a/tests/auto/plugins/genericcanbus/genericcanbus.pro b/tests/auto/plugins/genericcanbus/genericcanbus.pro index e58df3c..f78c3d4 100644 --- a/tests/auto/plugins/genericcanbus/genericcanbus.pro +++ b/tests/auto/plugins/genericcanbus/genericcanbus.pro @@ -5,8 +5,10 @@ QT = core serialbus HEADERS += \ dummybackend.h -SOURCES += main.cpp \ +SOURCES += \ + main.cpp \ dummybackend.cpp + DISTFILES = plugin.json PLUGIN_TYPE = canbus |