diff options
| author | Christian Kandeler <christian.kandeler@qt.io> | 2019-09-23 17:13:24 +0200 |
|---|---|---|
| committer | Christian Kandeler <christian.kandeler@qt.io> | 2019-10-10 07:40:49 +0000 |
| commit | 73ed687cf11cb2d4e7f263ef5754039b96b69aaa (patch) | |
| tree | c01dcb59c5c6b32d8c4f5ce0bd667b39a5cf323f /src/lib | |
| parent | c84f4c258ef91c76e19198d7eeb64291d0171938 (diff) | |
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>
Diffstat (limited to 'src/lib')
| -rw-r--r-- | src/lib/corelib/corelib.pro | 9 | ||||
| -rw-r--r-- | src/lib/corelib/corelib.qbs | 1 | ||||
| -rw-r--r-- | src/lib/corelib/tools/qbspluginmanager.h | 2 |
3 files changed, 1 insertions, 11 deletions
diff --git a/src/lib/corelib/corelib.pro b/src/lib/corelib/corelib.pro index 9299ab953..002e36683 100644 --- a/src/lib/corelib/corelib.pro +++ b/src/lib/corelib/corelib.pro @@ -28,15 +28,6 @@ include(logging/logging.pri) include(parser/parser.pri) include(tools/tools.pri) -CONFIG(static, static|shared) { - !isEmpty(QBS_PLUGINS_BUILD_DIR) { - destdirPrefix = $${QBS_PLUGINS_BUILD_DIR} - } else { - destdirPrefix = $$shadowed($$PWD)/../../../$${QBS_LIBRARY_DIRNAME} - } - LIBS += -L$${destdirPrefix}/qbs/plugins -lqbs_cpp_scanner -lqbs_qt_scanner -} - win32:LIBS += -lpsapi -lshell32 HEADERS += \ diff --git a/src/lib/corelib/corelib.qbs b/src/lib/corelib/corelib.qbs index 2f0ced926..019d9aa51 100644 --- a/src/lib/corelib/corelib.qbs +++ b/src/lib/corelib/corelib.qbs @@ -15,7 +15,6 @@ QbsLibrary { condition: qbsbuildconfig.useBundledQtScript || !Qt.script.present } Depends { condition: qbsbuildconfig.enableProjectFileUpdates; name: "Qt.gui" } - Depends { condition: staticBuild; productTypes: ["qbsplugin"] } name: "qbscore" property stringList bundledQtScriptIncludes: qbsbuildconfig.useBundledQtScript || !Qt.script.present ? qbsscriptengine.includePaths : [] diff --git a/src/lib/corelib/tools/qbspluginmanager.h b/src/lib/corelib/tools/qbspluginmanager.h index 9c9dcc9f8..1113c413d 100644 --- a/src/lib/corelib/tools/qbspluginmanager.h +++ b/src/lib/corelib/tools/qbspluginmanager.h @@ -77,7 +77,7 @@ private: #ifdef QBS_STATIC_LIB #define QBS_REGISTER_STATIC_PLUGIN(exportmacro, name, load, unload) \ - static auto qbs_static_plugin_register##name = [] { \ + extern "C" bool qbs_static_plugin_register_##name = [] { \ qbs::Internal::QbsPluginManager::instance()->registerStaticPlugin(load, unload); \ return true; \ }(); |