sikkienl/dash
1
0
Fork 0
mirror of https://github.com/dashpay/dash.git synced 2024-12-26 12:32:48 +01:00
Code Issues Actions Packages Projects Releases Wiki Activity

merge bitcoin#17427: Fix missing qRegisterMetaType for size_t

Browse Source
This commit is contained in:
Kittywhiskers Van Gogh 2019-11-10 12:03:53 +02:00
parent d863696814
commit 6db0332d14
1 changed files with 9 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
src/qt/dash.cpp
View File

@ -470,16 +470,19 @@ int GuiMain(int argc, char* argv[])
BitcoinApplication app(*node, argc, argv); BitcoinApplication app(*node, argc, argv);
// Register meta types used for QMetaObject::invokeMethod // Register meta types used for QMetaObject::invokeMethod and Qt::QueuedConnection
qRegisterMetaType< bool* >(); qRegisterMetaType<bool*>();
#ifdef ENABLE_WALLET #ifdef ENABLE_WALLET
qRegisterMetaType<WalletModel*>(); qRegisterMetaType<WalletModel*>();
#endif #endif
// Need to pass name here as CAmount is a typedef (see http://qt-project.org/doc/qt-5/qmetatype.html#qRegisterMetaType) // Register typedefs (see http://qt-project.org/doc/qt-5/qmetatype.html#qRegisterMetaType)
// IMPORTANT if it is no longer a typedef use the normal variant above // IMPORTANT: if CAmount is no longer a typedef use the normal variant above (see https://doc.qt.io/qt-5/qmetatype.html#qRegisterMetaType-1)
qRegisterMetaType< CAmount >("CAmount"); qRegisterMetaType<CAmount>("CAmount");
qRegisterMetaType< std::function<void()> >("std::function<void()>"); qRegisterMetaType<size_t>("size_t");
qRegisterMetaType<std::function<void()>>("std::function<void()>");
qRegisterMetaType<QMessageBox::Icon>("QMessageBox::Icon"); qRegisterMetaType<QMessageBox::Icon>("QMessageBox::Icon");
/// 2. Parse command-line options. We do this after qt in order to show an error if there are problems parsing these /// 2. Parse command-line options. We do this after qt in order to show an error if there are problems parsing these
// Command-line options take precedence: // Command-line options take precedence:
node->setupServerArgs(); node->setupServerArgs();