Merge #16578: Do not pass in command line arguments to QApplication
a2714a5c69
Give QApplication dummy arguments (Andrew Chow) Pull request description: QApplication takes the command line arguments and parses them itself for some [built in command line arguments](https://doc.qt.io/qt-5/qapplication.html#QApplication) that it has. We don't want any of those built in arguments, so instead give it dummy arguments. To test, you can use the `-reverse` option. Without this patch, everything will appear right-to-left; things that were on the left side will be on the right and everything is right aligned. After this patch, `-reverse` will now give a startup error since we do not support this argument. ACKs for top commit: laanwj: ACKa2714a5c69
hebasto: ACKa2714a5c69
fanquake: ACKa2714a5c69
- Have tested that arguments like `-reverse` are no longer being passed through and result in an error. Tree-SHA512: 983bd948ca6999f895b6662b58c37e33af7ed61fdd600c6b4623febb87ec06a92c66e3b3300783530110cc711902793ef82d751d7f563696c4c3a8416b2b1f51
This commit is contained in:
commit
8fc7f0cba9
3 changed files with 8 additions and 5 deletions
|
@ -169,8 +169,11 @@ void BitcoinCore::shutdown()
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
BitcoinApplication::BitcoinApplication(interfaces::Node& node, int &argc, char **argv):
|
static int qt_argc = 1;
|
||||||
QApplication(argc, argv),
|
static const char* qt_argv = "bitcoin-qt";
|
||||||
|
|
||||||
|
BitcoinApplication::BitcoinApplication(interfaces::Node& node):
|
||||||
|
QApplication(qt_argc, const_cast<char **>(&qt_argv)),
|
||||||
coreThread(nullptr),
|
coreThread(nullptr),
|
||||||
m_node(node),
|
m_node(node),
|
||||||
optionsModel(nullptr),
|
optionsModel(nullptr),
|
||||||
|
@ -433,7 +436,7 @@ int GuiMain(int argc, char* argv[])
|
||||||
QApplication::setAttribute(Qt::AA_DontShowIconsInMenus);
|
QApplication::setAttribute(Qt::AA_DontShowIconsInMenus);
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
BitcoinApplication app(*node, argc, argv);
|
BitcoinApplication app(*node);
|
||||||
|
|
||||||
// Register meta types used for QMetaObject::invokeMethod
|
// Register meta types used for QMetaObject::invokeMethod
|
||||||
qRegisterMetaType< bool* >();
|
qRegisterMetaType< bool* >();
|
||||||
|
|
|
@ -56,7 +56,7 @@ class BitcoinApplication: public QApplication
|
||||||
{
|
{
|
||||||
Q_OBJECT
|
Q_OBJECT
|
||||||
public:
|
public:
|
||||||
explicit BitcoinApplication(interfaces::Node& node, int &argc, char **argv);
|
explicit BitcoinApplication(interfaces::Node& node);
|
||||||
~BitcoinApplication();
|
~BitcoinApplication();
|
||||||
|
|
||||||
#ifdef ENABLE_WALLET
|
#ifdef ENABLE_WALLET
|
||||||
|
|
|
@ -68,7 +68,7 @@ int main(int argc, char *argv[])
|
||||||
|
|
||||||
// Don't remove this, it's needed to access
|
// Don't remove this, it's needed to access
|
||||||
// QApplication:: and QCoreApplication:: in the tests
|
// QApplication:: and QCoreApplication:: in the tests
|
||||||
BitcoinApplication app(*node, argc, argv);
|
BitcoinApplication app(*node);
|
||||||
app.setApplicationName("Bitcoin-Qt-test");
|
app.setApplicationName("Bitcoin-Qt-test");
|
||||||
|
|
||||||
AppTests app_tests(app);
|
AppTests app_tests(app);
|
||||||
|
|
Loading…
Reference in a new issue