qt, build: Drop QT_STATICPLUGIN macro
Our `QT_STATICPLUGIN` macro is effectively equivalent to the Qt's `QT_STATIC` macro. No need to handle both of them.
This commit is contained in:
5 files changed
+3
-14
No files matched your search
+1
-1
@@ -60,7 +60,7 @@
|
||||
#include <QTranslator>
|
||||
#include <QWindow>
|
||||
|
||||
#if defined(QT_STATICPLUGIN)
|
||||
#if defined(QT_STATIC)
|
||||
#include <QtPlugin>
|
||||
#if defined(QT_QPA_PLATFORM_XCB)
|
||||
Q_IMPORT_PLUGIN(QXcbIntegrationPlugin);
|
||||
|
||||
+1
-8
@@ -2,8 +2,6 @@
|
||||
// Distributed under the MIT software license, see the accompanying
|
||||
// file COPYING or http://www.opensource.org/licenses/mit-license.php.
|
||||
|
||||
#include <config/bitcoin-config.h> // IWYU pragma: keep
|
||||
|
||||
#include <qt/guiutil.h>
|
||||
|
||||
#include <qt/bitcoinaddressvalidator.h>
|
||||
@@ -918,12 +916,7 @@ 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);
|
||||
LogPrintf("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");
|
||||
|
||||
@@ -28,7 +28,7 @@
|
||||
|
||||
#include <functional>
|
||||
|
||||
#if defined(QT_STATICPLUGIN)
|
||||
#if defined(QT_STATIC)
|
||||
#include <QtPlugin>
|
||||
#if defined(QT_QPA_PLATFORM_MINIMAL)
|
||||
Q_IMPORT_PLUGIN(QMinimalIntegrationPlugin);
|
||||
|
||||
Reference in new issue
Block a user