qt: define QT_NO_KEYWORDS
QT_NO_KEYWORDS prevents Qt from defining the `foreach`, `signals`, `slots` and `emit` macros. Avoid overlap between Qt macros and boost - for example #undef hackiness in #6421. Conflicts: src/qt/addressbookpage.cpp src/qt/peertablemodel.cpp src/qt/receivecoinsdialog.cpp src/qt/rpcconsole.cpp Rebased-From: d29ec6c2301e593d577126d1ca85b93307b32bf1 Github-Pull: #6433
This commit is contained in:
@@ -32,7 +32,7 @@ public:
|
||||
explicit QRImageWidget(QWidget *parent = 0);
|
||||
QImage exportImage();
|
||||
|
||||
public slots:
|
||||
public Q_SLOTS:
|
||||
void saveImage();
|
||||
void copyImage();
|
||||
|
||||
@@ -55,7 +55,7 @@ public:
|
||||
void setModel(OptionsModel *model);
|
||||
void setInfo(const SendCoinsRecipient &info);
|
||||
|
||||
private slots:
|
||||
private Q_SLOTS:
|
||||
void on_btnCopyURI_clicked();
|
||||
void on_btnCopyAddress_clicked();
|
||||
|
||||
|
||||
Reference in New Issue
Block a user