Skip to content

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 the 4.1.0 milestone Oct 27, 2019
@Fuzzbawls Fuzzbawls force-pushed the 2019_qt-no-keywords branch from 2f54451 to baff29a Compare January 1, 2020 02:19
@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.
@Fuzzbawls Fuzzbawls force-pushed the 2019_qt-no-keywords branch from baff29a to 3c7ec95 Compare January 29, 2020 00:39
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

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
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Projects

None yet

Development

Successfully merging this pull request may close these issues.

3 participants