benkyd/flameshot
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Code refactoring - remove Q_OS_MAC64 (is not required, is covered by Q_OS_DARWIN)

Browse Source 
(cherry picked from commit e511b521cec6edd9f77916c6ee753329326a5f91)
This commit is contained in:
Yuriy Puchkov
2021-02-10 20:12:25 +02:00
parent a5cd4cd1bc
commit ebdb3743dd
16 changed files with 30 additions and 32 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/main.cpp
View File

@@ -108,7 +108,7 @@ int main(int argc, char* argv[])
app.setOrganizationName(QStringLiteral("flameshot"));
auto c = Controller::getInstance();
#if not(defined(Q_OS_MAC64) || defined(Q_OS_MACOS) || defined(Q_OS_WIN))
#if not(defined(Q_OS_MACOS) || defined(Q_OS_WIN))
new FlameshotDBusAdapter(c);
QDBusConnection dbus = QDBusConnection::sessionBus();
if (!dbus.isConnected()) {
@@ -124,7 +124,7 @@ int main(int argc, char* argv[])
return app.exec();
}
#if not(defined(Q_OS_MAC64) || defined(Q_OS_MACOS) || defined(Q_OS_WIN))
#if not(defined(Q_OS_MACOS) || defined(Q_OS_WIN))
/*--------------|
* CLI parsing |
* ------------*/