diff --git a/build-aux/m4/bitcoin_qt.m4 b/build-aux/m4/bitcoin_qt.m4 index 186a89721d..89f3e188ee 100644 --- a/build-aux/m4/bitcoin_qt.m4 +++ b/build-aux/m4/bitcoin_qt.m4 @@ -137,7 +137,6 @@ AC_DEFUN([BITCOIN_QT_CONFIGURE],[ fi fi - AC_DEFINE(QT_STATICPLUGIN, 1, [Define this symbol if qt plugins are static]) if test "x$TARGET_OS" != xandroid; then _BITCOIN_QT_CHECK_STATIC_PLUGIN([QMinimalIntegrationPlugin], [-lqminimal]) AC_DEFINE(QT_QPA_PLATFORM_MINIMAL, 1, [Define this symbol if the minimal qt platform exists]) diff --git a/src/qt/bitcoin.cpp b/src/qt/bitcoin.cpp index 52bd0767b3..af50ae0129 100644 --- a/src/qt/bitcoin.cpp +++ b/src/qt/bitcoin.cpp @@ -58,7 +58,7 @@ #include #include -#if defined(QT_STATICPLUGIN) +#if defined(QT_STATIC) #include #if defined(QT_QPA_PLATFORM_XCB) Q_IMPORT_PLUGIN(QXcbIntegrationPlugin); diff --git a/src/qt/guiutil.cpp b/src/qt/guiutil.cpp index 649b009f25..3ce055f7d0 100644 --- a/src/qt/guiutil.cpp +++ b/src/qt/guiutil.cpp @@ -1862,29 +1862,24 @@ void LogQtInfo() #else const std::string qt_link{"dynamic"}; #endif -#ifdef QT_STATICPLUGIN - const std::string plugin_link{"static"}; -#else - const std::string plugin_link{"dynamic"}; -#endif - LogPrintf("Qt %s (%s), plugin=%s (%s)\n", qVersion(), qt_link, QGuiApplication::platformName().toStdString(), plugin_link); + LogInfo("Qt %s (%s), plugin=%s\n", qVersion(), qt_link, QGuiApplication::platformName().toStdString()); const auto static_plugins = QPluginLoader::staticPlugins(); if (static_plugins.empty()) { - LogPrintf("No static plugins.\n"); + LogInfo("No static plugins.\n"); } else { - LogPrintf("Static plugins:\n"); + LogInfo("Static plugins:\n"); for (const QStaticPlugin& p : static_plugins) { QJsonObject meta_data = p.metaData(); const std::string plugin_class = meta_data.take(QString("className")).toString().toStdString(); const int plugin_version = meta_data.take(QString("version")).toInt(); - LogPrintf(" %s, version %d\n", plugin_class, plugin_version); + LogInfo(" %s, version %d\n", plugin_class, plugin_version); } } - LogPrintf("Style: %s / %s\n", QApplication::style()->objectName().toStdString(), QApplication::style()->metaObject()->className()); - LogPrintf("System: %s, %s\n", QSysInfo::prettyProductName().toStdString(), QSysInfo::buildAbi().toStdString()); + LogInfo("Style: %s / %s\n", QApplication::style()->objectName().toStdString(), QApplication::style()->metaObject()->className()); + LogInfo("System: %s, %s\n", QSysInfo::prettyProductName().toStdString(), QSysInfo::buildAbi().toStdString()); for (const QScreen* s : QGuiApplication::screens()) { - LogPrintf("Screen: %s %dx%d, pixel ratio=%.1f\n", s->name().toStdString(), s->size().width(), s->size().height(), s->devicePixelRatio()); + LogInfo("Screen: %s %dx%d, pixel ratio=%.1f\n", s->name().toStdString(), s->size().width(), s->size().height(), s->devicePixelRatio()); } } diff --git a/src/qt/test/test_main.cpp b/src/qt/test/test_main.cpp index 34ea983441..4bf49ba8a0 100644 --- a/src/qt/test/test_main.cpp +++ b/src/qt/test/test_main.cpp @@ -25,7 +25,7 @@ #include #include -#if defined(QT_STATICPLUGIN) +#if defined(QT_STATIC) #include #if defined(QT_QPA_PLATFORM_MINIMAL) Q_IMPORT_PLUGIN(QMinimalIntegrationPlugin);