1
0
mirror of https://github.com/tomahawk-player/tomahawk.git synced 2025-08-14 01:54:07 +02:00

Merge branch 'master' of github.com:tomahawk-player/tomahawk

This commit is contained in:
Leo Franchi
2010-10-21 22:37:37 -04:00

View File

@@ -1,10 +1,11 @@
#include "tomahawk/tomahawkapp.h"
#include "tomahawksettings.h"
#ifndef TOMAHAWK_HEADLESS
#include <QDesktopServices>
#include "settingsdialog.h"
#endif
#include <QDesktopServices>
#include <QDir>
#include <QDebug>
@@ -37,7 +38,7 @@ TomahawkSettings::~TomahawkSettings()
QString TomahawkSettings::scannerPath() const
{
#ifdef TOMAHAWK_HEADLESS
#ifndef TOMAHAWK_HEADLESS
return value( "scannerpath", QDesktopServices::storageLocation( QDesktopServices::MusicLocation ) ).toString();
#else
return value( "scannerpath", "" ).toString();