From a64d038dba63725e48a75ffb0ee98e6280185db0 Mon Sep 17 00:00:00 2001 From: Christian Muehlhaeuser Date: Wed, 28 Oct 2015 05:40:58 +0100 Subject: [PATCH] Don't set a window icon on OSX and don't try to use the unified toolbar anymore. --- src/tomahawk/TomahawkApp.cpp | 4 +--- src/tomahawk/TomahawkWindow.cpp | 1 - 2 files changed, 1 insertion(+), 4 deletions(-) diff --git a/src/tomahawk/TomahawkApp.cpp b/src/tomahawk/TomahawkApp.cpp index 5ca7d26c3..3cfd41316 100644 --- a/src/tomahawk/TomahawkApp.cpp +++ b/src/tomahawk/TomahawkApp.cpp @@ -174,12 +174,10 @@ TomahawkApp::init() QWebSettings::globalSettings()->setAttribute(QWebSettings::OfflineStorageDatabaseEnabled, true); //QWebSettings::setOfflineStoragePath(QLatin1String("/tmp")); - - m_headless = true; m_headless = arguments().contains( "--headless" ); - setWindowIcon( QIcon( RESPATH "icons/tomahawk-icon-128x128.png" ) ); #ifndef Q_OS_MAC + setWindowIcon( QIcon( RESPATH "icons/tomahawk-icon-128x128.png" ) ); setQuitOnLastWindowClosed( false ); #endif diff --git a/src/tomahawk/TomahawkWindow.cpp b/src/tomahawk/TomahawkWindow.cpp index 2d202bf08..558118c2e 100644 --- a/src/tomahawk/TomahawkWindow.cpp +++ b/src/tomahawk/TomahawkWindow.cpp @@ -270,7 +270,6 @@ TomahawkWindow::applyPlatformTweaks() qApp->setStyle( new ProxyStyle( isQtCurve ) ); #ifdef Q_OS_MAC - setUnifiedTitleAndToolBarOnMac( true ); delete ui->hline1; delete ui->hline2; #else