scripted-diff: replace deprecated Q_OS_MAC with Q_OS_MACOS#594
scripted-diff: replace deprecated Q_OS_MAC with Q_OS_MACOS#594hebasto merged 1 commit intobitcoin-core:masterfrom
Conversation
-BEGIN VERIFY SCRIPT- sed -i 's/Q_OS_MAC/Q_OS_MACOS/' $(git grep -l "Q_OS_MAC" src/qt) -END VERIFY SCRIPT-
jarolrod
left a comment
jarolrod
left a comment
There was a problem hiding this comment.
Concept ACK
This change is ok to do. I've checked qt documentation up to Qt 5.7 that mentions Q_OS_MAC is deprecated and to not use. Qt 5.7 docs even mention to use Q_OS_MACOS or Q_OS_DARWIN if targeting all Darwin platforms (macOS, IOS).
|
@fanquake should also rename this? gui/build-aux/m4/bitcoin_qt.m4 Line 234 in 833add0 |
|
https://doc.qt.io/qt-5/qtglobal.html#Q_OS_MAC Concept ACK |
yes, it would be appropriate to update what we want defined here. Should be opened up on the main repo though |
|
tACK e3daeca |
|
Should some of these be |
|
thought the same thing,
didn't tell because I think they can sort those out later 🤔
…On Wed, Apr 27, 2022 at 9:37 PM laanwj ***@***.***> wrote:
Should some of these be Q_OS_DARWIN?
Ping @Sjors <https://github.com/Sjors> he was building for iOS at some
point (bitcoin/bitcoin#1255 <bitcoin/bitcoin#1255>
).
—
Reply to this email directly, view it on GitHub
<#594 (comment)>,
or unsubscribe
<https://github.com/notifications/unsubscribe-auth/AMRS4WYUEUMYG63OR5M4A4DVHGJN3ANCNFSM5UKFFNBQ>
.
You are receiving this because you commented.Message ID:
***@***.***>
|
I'm not sure there's such a hurry, might as well do it properly while we're changing this (and maybe it's not relevant at all, just thought I'd ask). |
|
I didn't get very far with iOs builds... Specifically I never even tried to compile QT. However, the more generic Update: it's actually not that clear cut, some of the code is really specific to macOS. Maybe just stick to |
|
|
||
| #ifdef Q_OS_MAC | ||
| #ifdef Q_OS_MACOS | ||
| #include <qt/macdockiconhandler.h> |
There was a problem hiding this comment.
This is macOS specific, so Q_OS_MACOS makes sense.
6 participants
Q_OS_MACis deprecated but it is also defined when Qt is configured with-xplatform macx-ios-clang, and currently it guards some features not available on iOS, likeQProcess.