Permalink
Browse files

Replace Q_OS_MACOS with Q_OS_MAC (#6223)

  • Loading branch information...
jonaski authored and hatstand committed Nov 29, 2018
1 parent 9f946a2 commit 2d1f6cd23939f4e8c5ff0f4d9926a84317010782
@@ -229,7 +229,7 @@ void WorkerPool<HandlerType>::DoStart() {

QStringList search_path;
search_path << qApp->applicationDirPath();
#if defined(Q_OS_MACOS) && defined(USE_BUNDLE)
#if defined(Q_OS_MAC) && defined(USE_BUNDLE)
search_path << qApp->applicationDirPath() + "/" + USE_BUNDLE_DIR;
#endif

@@ -90,7 +90,7 @@ SpotifyService::SpotifyService(Application* app, InternetModel* parent)
// Build the search path for the binary blob.
// Look for one distributed alongside clementine first, then check in the
// user's home directory for any that have been downloaded.
#if defined(Q_OS_MACOS) && defined(USE_BUNDLE)
#if defined(Q_OS_MAC) && defined(USE_BUNDLE)
system_blob_path_ = QCoreApplication::applicationDirPath() + "/" +
USE_BUNDLE_DIR + "/clementine-spotifyblob";
#else
@@ -80,7 +80,7 @@ AppearanceSettingsPage::AppearanceSettingsPage(SettingsDialog* dialog)
SLOT(DisableBlurAndOpacitySliders(bool)));
connect(ui_->use_no_background, SIGNAL(toggled(bool)),
SLOT(DisableBlurAndOpacitySliders(bool)));
#if !defined (Q_OS_UNIX) || defined (Q_OS_MACOS)
#if !defined(Q_OS_UNIX) || defined(Q_OS_MAC)
ui_->b_use_sys_icons->setDisabled(true);
#endif
}

0 comments on commit 2d1f6cd

Please sign in to comment.