enhance Qt5 compatibility #1844

pull Diapolo wants to merge 1 commits into bitcoin:master from Diapolo:Qt5_compat1 changing 10 files +26 −26

Diapolo commented at 5:09 PM on September 21, 2012: none
- replace Q_WS_MAC (not supported anymore in Qt5) with Q_OS_MAC (supported in Qt4/5)
There is for sure more work to be done, but this easy patch doesn't even hurt our current code! For more details see: http://www.kdab.com/porting-from-qt-4-to-qt-5/

enhance Qt5 compatibility

- replace Q_WS_MAC (not supported anymore in Qt5) with Q_OS_MAC (supported
  in Qt4/5)

81605d90f5

fanquake commented at 4:34 AM on September 22, 2012: member
There is another simple QT5 change that you could include in this pull.

Line 5 of macdockiconhandler.mm can be changed from
```
#include <QtGui/QWidget>
```
to
```
#include <QWidget>
```
BitcoinPullTester commented at 7:13 AM on September 22, 2012: none

Automatic sanity-testing: PASSED, see http://jenkins.bluematt.me/pull-tester/81605d90f53e5ab500f56927f4337bbc7f2d24f8 for binaries and test log.
Diapolo commented at 7:54 AM on September 22, 2012: none

@fanquake Pretty neat catch, I will update this pull :).
laanwj commented at 8:59 AM on September 22, 2012: member

ACK

BTW @fanquake you can get around the problem of displaying < and > on github by indenting code with four spaces :-) I've edited your post to show this.
fanquake commented at 9:17 AM on September 22, 2012: member

@laanwj ah, cheers for that. I couldn't figure out how to make it work.
laanwj referenced this in commit f394f21594 on Sep 22, 2012
laanwj merged this on Sep 22, 2012
laanwj closed this on Sep 22, 2012
laanwj commented at 9:23 AM on September 22, 2012: member

Oops @diapolo seems I merged this without the include change, I think you'll need a new pull for that
fanquake commented at 9:28 AM on September 22, 2012: member

@Diapolo I can do it if you want.
Diapolo commented at 10:06 AM on September 22, 2012: none

@fanquake Yeah that's fine with me!
KolbyML referenced this in commit 7196a35651 on Dec 5, 2020
KolbyML referenced this in commit 98ab596778 on Dec 5, 2020
KolbyML referenced this in commit f152deed36 on Dec 5, 2020
DrahtBot locked this on Sep 8, 2021

Contributors