Blob Blame History Raw
From 3aae8924f735b23d051b5ccb8dc10eac1e40d56b Mon Sep 17 00:00:00 2001
From: Lubomir Rintel <lkundrak@v3.sk>
Date: Fri, 3 Jan 2014 23:30:46 +0100
Subject: [PATCH] Use external QtXdg

---
 3rdparty/libqtxdg         | 1 -
 src/client/CMakeLists.txt | 6 +++++-
 2 files changed, 5 insertions(+), 2 deletions(-)
 delete mode 160000 3rdparty/libqtxdg

diff --git a/src/client/CMakeLists.txt b/src/client/CMakeLists.txt
index 3bdb0fd..f54b83c 100644
--- a/src/client/CMakeLists.txt
+++ b/src/client/CMakeLists.txt
@@ -4,12 +4,16 @@ find_package(QtAccountsService REQUIRED)
 # Find ALSA
 find_package(ALSA)
 
+# Find QtXdg
+find_package(Qt5Xdg REQUIRED)
+
 include_directories(
     ${Qt5Gui_PRIVATE_INCLUDE_DIRS}
     ${POLKITQT-1_INCLUDE_DIR}
     ${WaylandClient_INCLUDE_DIRS}
     ${QtAccountsService_INCLUDE_DIRS}
     ${ALSA_INCLUDE_DIR}
+    ${QTXDG_INCLUDE_DIR}
     ${CMAKE_SOURCE_DIR}/3rdparty/libqtxdg
     ${CMAKE_SOURCE_DIR}/src
     ${CMAKE_SOURCE_DIR}/headers
@@ -33,7 +37,6 @@ configure_file(
 )
 
 set(SOURCES
-    ${CMAKE_SOURCE_DIR}/3rdparty/libqtxdg/xdgdesktopfile.cpp
     appcategories.cpp
     appinfo.cpp
     applicationiconprovider.cpp
@@ -114,6 +117,7 @@ target_link_libraries(hawaii-desktop-shell
     ${POLKITQT-1_CORE_LIBRARY}
     ${POLKITQT-1_AGENT_LIBRARY}
     ${ALSA_LIBRARIES}
+    ${QTXDG_LIBRARY}
     ${QtAccountsService_LIBRARIES}
     HawaiiCore
 )
-- 
1.8.4.2