From a62666602992641ea12d8a416c580bd0c3e12c26 Mon Sep 17 00:00:00 2001 From: Christian Muehlhaeuser Date: Wed, 1 Oct 2014 19:11:07 +0200 Subject: [PATCH 1/3] * Only look for dbus on Linux systems. --- CMakeLists.txt | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index b172f11fe..b36fe3455 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -38,7 +38,9 @@ if(Qt5Core_DIR) set(LASTFM_LIB_VERSION_SUFFIX 5) message(STATUS "Found Qt5! Please keep in mind, this is highly experimental and not our main development target..") include_directories(${Qt5Core_INCLUDE_DIRS}) - find_package(Qt5DBus REQUIRED) + if(UNIX AND NOT APPLE) + find_package(Qt5DBus REQUIRED) + endif() # macro(qt_wrap_ui) # qt5_wrap_ui(${ARGN}) From 31e80e17362ff02a20da7949afafd52e1f8e1059 Mon Sep 17 00:00:00 2001 From: Christian Muehlhaeuser Date: Thu, 2 Oct 2014 06:08:57 +0200 Subject: [PATCH 2/3] * Fixed broken ifdef. --- src/InternetConnectionMonitor.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/InternetConnectionMonitor.cpp b/src/InternetConnectionMonitor.cpp index d5f0c5cb1..6b54f3859 100644 --- a/src/InternetConnectionMonitor.cpp +++ b/src/InternetConnectionMonitor.cpp @@ -131,7 +131,7 @@ lastfm::InternetConnectionMonitor::createNetworkConnectionMonitor() { NetworkConnectionMonitor* ncm = 0; -#ifdef defined(Q_OS_MAC) +#if defined(Q_OS_MAC) ncm = new MNetworkConnectionMonitor( this ); #elif defined(Q_OS_WIN) && ! defined __MINGW32__ ncm = new WNetworkConnectionMonitor( this ); From d9bea7bf89dea6d602089865914bfcd55bf0d619 Mon Sep 17 00:00:00 2001 From: Christian Muehlhaeuser Date: Thu, 2 Oct 2014 06:18:04 +0200 Subject: [PATCH 3/3] * Fixed ifdef's for Qt5. --- src/InternetConnectionMonitor.cpp | 2 +- src/misc.cpp | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/src/InternetConnectionMonitor.cpp b/src/InternetConnectionMonitor.cpp index 6b54f3859..9ac6900b8 100644 --- a/src/InternetConnectionMonitor.cpp +++ b/src/InternetConnectionMonitor.cpp @@ -135,7 +135,7 @@ lastfm::InternetConnectionMonitor::createNetworkConnectionMonitor() ncm = new MNetworkConnectionMonitor( this ); #elif defined(Q_OS_WIN) && ! defined __MINGW32__ ncm = new WNetworkConnectionMonitor( this ); -#elif defined(Q_OS_UNIX) +#elif defined(Q_OS_LINUX) ncm = new LNetworkConnectionMonitor( this ); #endif diff --git a/src/misc.cpp b/src/misc.cpp index 7d819a3ae..d19987b3c 100644 --- a/src/misc.cpp +++ b/src/misc.cpp @@ -62,7 +62,7 @@ static QDir dataDotDot() return QDir::home(); #elif defined(Q_OS_MAC) return QDir::home().filePath( "Library/Application Support" ); -#elif defined(Q_OS_UNIX) +#elif defined(Q_OS_LINUX) || defined(Q_OS_UNIX) return QDir::home().filePath( ".local/share" ); #else return QDir::home(); @@ -199,7 +199,7 @@ lastfm::platform() default: return "Unknown"; } -#elif defined Q_OS_UNIX +#elif defined(Q_OS_LINUX) || defined(Q_OS_UNIX) return "UNIX X11"; #else return "Unknown";