diff options
| author | Russell Yanofsky <[email protected]> | 2017-03-27 14:34:38 -0400 |
|---|---|---|
| committer | Russell Yanofsky <[email protected]> | 2017-03-27 14:34:38 -0400 |
| commit | e9a64615c8e18692a775765787f404266767260b (patch) | |
| tree | 4513ecb574ca9bdb3526cfea8713b068a5035bb5 /src/Makefile.qt.include | |
| parent | Merge #10039: Fix compile errors with Qt 5.3.2 and Boost 1.55.0 (diff) | |
| download | discoin-e9a64615c8e18692a775765787f404266767260b.tar.xz discoin-e9a64615c8e18692a775765787f404266767260b.zip | |
Make qt wallet test compatible with qt4
Unlike Qt5, the Qt4 signals implementation doesn't allow a signal to be
directly connected to a c++ lambda expression. Work around this by defining a
Callback QObject with a virtual method that can forward calls to a closure.
The Qt4 error was reported by Patrick Strateman <[email protected]>
in https://github.com/bitcoin/bitcoin/pull/10039#issuecomment-289248763
Diffstat (limited to 'src/Makefile.qt.include')
| -rw-r--r-- | src/Makefile.qt.include | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/src/Makefile.qt.include b/src/Makefile.qt.include index edc3c4b29..48411f29e 100644 --- a/src/Makefile.qt.include +++ b/src/Makefile.qt.include @@ -122,6 +122,7 @@ QT_MOC_CPP = \ qt/moc_bitcoinamountfield.cpp \ qt/moc_bitcoingui.cpp \ qt/moc_bitcoinunits.cpp \ + qt/moc_callback.cpp \ qt/moc_clientmodel.cpp \ qt/moc_coincontroldialog.cpp \ qt/moc_coincontroltreewidget.cpp \ @@ -167,6 +168,7 @@ BITCOIN_MM = \ QT_MOC = \ qt/bitcoin.moc \ qt/bitcoinamountfield.moc \ + qt/callback.moc \ qt/intro.moc \ qt/overviewpage.moc \ qt/rpcconsole.moc @@ -189,6 +191,7 @@ BITCOIN_QT_H = \ qt/bitcoinamountfield.h \ qt/bitcoingui.h \ qt/bitcoinunits.h \ + qt/callback.h \ qt/clientmodel.h \ qt/coincontroldialog.h \ qt/coincontroltreewidget.h \ |