Fix static build

Make sure we link in the generator plugins.

Fixes: QBS-1491
Change-Id: I8c48a73f972c4089cfc8c097a67e2945837e9ed4
Reviewed-by: Joerg Bornemann <joerg.bornemann@qt.io>

6 files changed, 6 insertions, 6 deletions

diff --git a/src/plugins/scanner/cpp/cpp.pri b/src/plugins/scanner/cpp/cpp.pri
new file mode 100644
index 000000000..515e65635
--- /dev/null
+++ b/src/plugins/scanner/cpp/cpp.pri
@@ -0,0 +1 @@
+qbsPluginTarget = qbs_cpp_scanner
diff --git a/src/plugins/scanner/cpp/cpp.pro b/src/plugins/scanner/cpp/cpp.pro
index cf8e6c347..12a6d7b6c 100644
--- a/src/plugins/scanner/cpp/cpp.pro
+++ b/src/plugins/scanner/cpp/cpp.pro
@@ -1,8 +1,7 @@
+include(cpp.pri)
 include(../../plugins.pri)
 DEFINES += CPLUSPLUS_NO_PARSER
 
-TARGET = qbs_cpp_scanner
-
 QT = core
 
 HEADERS += CPlusPlusForwardDeclarations.h Lexer.h Token.h ../scanner.h \
diff --git a/src/plugins/scanner/cpp/cppscanner.cpp b/src/plugins/scanner/cpp/cppscanner.cpp
index cbab8a012..1cebc52eb 100644
--- a/src/plugins/scanner/cpp/cppscanner.cpp
+++ b/src/plugins/scanner/cpp/cppscanner.cpp
@@ -330,6 +330,6 @@ static void QbsCppScannerPluginUnload()
 {
 }
 
-QBS_REGISTER_STATIC_PLUGIN(extern "C" CPPSCANNER_EXPORT, QbsCppScannerPlugin,
+QBS_REGISTER_STATIC_PLUGIN(extern "C" CPPSCANNER_EXPORT, qbs_cpp_scanner,
                            QbsCppScannerPluginLoad, QbsCppScannerPluginUnload)
 
diff --git a/src/plugins/scanner/qt/qt.pri b/src/plugins/scanner/qt/qt.pri
new file mode 100644
index 000000000..71e3a8a45
--- /dev/null
+++ b/src/plugins/scanner/qt/qt.pri
@@ -0,0 +1 @@
+qbsPluginTarget = qbs_qt_scanner
diff --git a/src/plugins/scanner/qt/qt.pro b/src/plugins/scanner/qt/qt.pro
index d90f61b2a..f231ea9e2 100644
--- a/src/plugins/scanner/qt/qt.pro
+++ b/src/plugins/scanner/qt/qt.pro
@@ -1,7 +1,6 @@
+include(qt.pri)
 include(../../plugins.pri)
 
-TARGET = qbs_qt_scanner
-
 QT = core
 
 HEADERS += ../scanner.h
diff --git a/src/plugins/scanner/qt/qtscanner.cpp b/src/plugins/scanner/qt/qtscanner.cpp
index 40d062e1f..22fdcb79d 100644
--- a/src/plugins/scanner/qt/qtscanner.cpp
+++ b/src/plugins/scanner/qt/qtscanner.cpp
@@ -191,5 +191,5 @@ static void QbsQtScannerPluginUnload()
 {
 }
 
-QBS_REGISTER_STATIC_PLUGIN(extern "C" SCANNER_EXPORT, QbsQtScannerPlugin,
+QBS_REGISTER_STATIC_PLUGIN(extern "C" SCANNER_EXPORT, qbs_qt_scanner,
                            QbsQtScannerPluginLoad, QbsQtScannerPluginUnload)