mirror of
https://github.com/swift-project/pilotclient.git
synced 2026-04-23 05:45:35 +08:00
refactor: Remove unused code
This was only used for Qt 5.8 on Win.
This commit is contained in:
@@ -3,28 +3,6 @@
|
|||||||
|
|
||||||
#include "misc/dbus.h"
|
#include "misc/dbus.h"
|
||||||
|
|
||||||
#ifdef Q_OS_WIN
|
|
||||||
# include <qt_windows.h>
|
|
||||||
|
|
||||||
# include <QDBusConnection>
|
|
||||||
|
|
||||||
// https://blogs.msdn.microsoft.com/oldnewthing/20131105-00/?p=2733
|
|
||||||
// See https://bugreports.qt.io/browse/QTBUG-53031 for more details
|
|
||||||
// why this is necessary.
|
|
||||||
void preventQtDBusDllUnload()
|
|
||||||
{
|
|
||||||
// Only Qt 5.8.0 is affected.
|
|
||||||
if (qVersion() != QByteArray("5.8.0")) { return; }
|
|
||||||
|
|
||||||
static HMODULE dbusDll;
|
|
||||||
GetModuleHandleEx(GET_MODULE_HANDLE_EX_FLAG_FROM_ADDRESS | GET_MODULE_HANDLE_EX_FLAG_PIN,
|
|
||||||
reinterpret_cast<LPCTSTR>(&QDBusConnection::staticMetaObject), &dbusDll);
|
|
||||||
Q_ASSERT(dbusDll);
|
|
||||||
}
|
|
||||||
#else
|
|
||||||
void preventQtDBusDllUnload() {}
|
|
||||||
#endif
|
|
||||||
|
|
||||||
QDBusArgument &operator<<(QDBusArgument &arg, const std::string &s)
|
QDBusArgument &operator<<(QDBusArgument &arg, const std::string &s)
|
||||||
{
|
{
|
||||||
arg.beginStructure();
|
arg.beginStructure();
|
||||||
|
|||||||
@@ -78,11 +78,4 @@ const QDBusArgument &operator>>(const QDBusArgument &arg, QFlags<T> &value)
|
|||||||
return arg;
|
return arg;
|
||||||
}
|
}
|
||||||
|
|
||||||
// *INDENT-ON*
|
#endif // SWIFT_MISC_DBUS_H
|
||||||
|
|
||||||
//! Windows: prevents unloading of QtDBus shared library until the process is terminated.
|
|
||||||
//! QtDBus must have been loaded already by the calling process.
|
|
||||||
//! Does nothing on non-Windows platforms.
|
|
||||||
SWIFT_MISC_EXPORT void preventQtDBusDllUnload();
|
|
||||||
|
|
||||||
#endif // guard
|
|
||||||
|
|||||||
Reference in New Issue
Block a user