From 73ed687cf11cb2d4e7f263ef5754039b96b69aaa Mon Sep 17 00:00:00 2001 From: Christian Kandeler Date: Mon, 23 Sep 2019 17:13:24 +0200 Subject: Fix static build Make sure we link in the generator plugins. Fixes: QBS-1491 Change-Id: I8c48a73f972c4089cfc8c097a67e2945837e9ed4 Reviewed-by: Joerg Bornemann --- src/plugins/scanner/cpp/cpp.pri | 1 + src/plugins/scanner/cpp/cpp.pro | 3 +-- src/plugins/scanner/cpp/cppscanner.cpp | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) create mode 100644 src/plugins/scanner/cpp/cpp.pri (limited to 'src/plugins/scanner/cpp') 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) -- cgit v1.2.3