Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

[Qt] Define QT_NO_KEYWORDS #1044

Merged
merged 1 commit into from
Jan 30, 2020
Merged

Conversation

Fuzzbawls
Copy link
Collaborator

QT_NO_KEYWORDS prevents Qt from defining the foreach, signals, slots and emit macros.

This avoids overlap between Qt macros and boost, and enforces the standard.

Marked as [WIP] for the time being so as to not merge and create conflicts with existing open PRs. Can still be reviewed however.

Ported mostly from bitcoin#6433

@Fuzzbawls Fuzzbawls self-assigned this Oct 17, 2019
@Fuzzbawls Fuzzbawls added this to In Progress in perpetual updating PIVX Core to BTC Core via automation Oct 17, 2019
@Fuzzbawls Fuzzbawls added this to the 4.1.0 milestone Oct 27, 2019
@Fuzzbawls Fuzzbawls changed the title [WIP][Qt] Define QT_NO_KEYWORDS [Qt] Define QT_NO_KEYWORDS Jan 1, 2020
@Fuzzbawls
Copy link
Collaborator Author

Rebased and updated

QT_NO_KEYWORDS prevents Qt from defining the `foreach`, `signals`, `slots` and `emit` macros.

This avoids overlap between Qt macros and boost, and enforces the standard.
Copy link

@random-zebra random-zebra left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

ACK 3c7ec95

perpetual updating PIVX Core to BTC Core automation moved this from In Progress to Ready Jan 30, 2020
Copy link

@furszy furszy left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

utACK 3c7ec95

furszy added a commit that referenced this pull request Jan 30, 2020
3c7ec95 [Qt] Define QT_NO_KEYWORDS (Fuzzbawls)

Pull request description:

  QT_NO_KEYWORDS prevents Qt from defining the `foreach`, `signals`, `slots` and `emit` macros.

  This avoids overlap between Qt macros and boost, and enforces the standard.

  Marked as [WIP] for the time being so as to not merge and create conflicts with existing open PRs. Can still be reviewed however.

  Ported mostly from bitcoin#6433

ACKs for top commit:
  random-zebra:
    ACK 3c7ec95
  furszy:
    utACK 3c7ec95

Tree-SHA512: 867498a1774ad0d3b1b987e82c5023bead62b2669af8f4343903651e49eab204f3444cbfbc1f9ce54d70546d3d7ea128705d8d46470a8a7bbe01ac82f76cefa9
@furszy furszy merged commit 3c7ec95 into PIVX-Project:master Jan 30, 2020
perpetual updating PIVX Core to BTC Core automation moved this from Ready to Done Jan 30, 2020
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Development

Successfully merging this pull request may close these issues.

None yet

3 participants