From fc128723a73c42ceac1469e5078ac91d5ef048e8 Mon Sep 17 00:00:00 2001
From: Lubomir Rintel <lkundrak@v3.sk>
Date: Fri, 14 Feb 2014 20:45:13 +0100
Subject: [PATCH 2/3] Use external QtXdg

---
 3rdparty/libqtxdg                           | 1 -
 src/client/CMakeLists.txt                   | 5 +++++
 src/libhawaiishell/CMakeLists.txt           | 2 --
 src/libhawaiishell/applications/appinfo.cpp | 2 +-
 src/libhawaiishell/pluginmetadata.cpp       | 2 +-
 5 files changed, 7 insertions(+), 5 deletions(-)
 delete mode 160000 3rdparty/libqtxdg

diff --git a/src/client/CMakeLists.txt b/src/client/CMakeLists.txt
index 54a14f4..60bfbeb 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}/src/libhawaiishell
@@ -92,6 +96,7 @@ target_link_libraries(hawaii-shell-client
     ${POLKITQT-1_CORE_LIBRARY}
     ${POLKITQT-1_AGENT_LIBRARY}
     ${ALSA_LIBRARIES}
+    ${QTXDG_LIBRARY}
     ${QtAccountsService_LIBRARIES}
     HF1HawaiiShell
 )
diff --git a/src/libhawaiishell/CMakeLists.txt b/src/libhawaiishell/CMakeLists.txt
index b93c0e0..05ab86e 100644
--- a/src/libhawaiishell/CMakeLists.txt
+++ b/src/libhawaiishell/CMakeLists.txt
@@ -4,12 +4,10 @@ include_directories(
     ${CMAKE_CURRENT_SOURCE_DIR}/includes
     ${CMAKE_CURRENT_SOURCE_DIR}/applications
     ${CMAKE_CURRENT_SOURCE_DIR}/settings
-    ${CMAKE_SOURCE_DIR}/3rdparty/libqtxdg
     ${CMAKE_CURRENT_BINARY_DIR}
 )
 
 set(SOURCES
-    ${CMAKE_SOURCE_DIR}/3rdparty/libqtxdg/xdgdesktopfile.cpp
     applications/appcategories.cpp
     applications/appinfo.cpp
     applications/applicationsmodel.cpp
diff --git a/src/libhawaiishell/applications/appinfo.cpp b/src/libhawaiishell/applications/appinfo.cpp
index fac02d5..fb7d2f3 100644
--- a/src/libhawaiishell/applications/appinfo.cpp
+++ b/src/libhawaiishell/applications/appinfo.cpp
@@ -27,8 +27,8 @@
 #include <QtCore/QFileInfo>
 #include <QtCore/QStandardPaths>
 
+#include <qt5xdg/xdgdesktopfile.h>
 #include "appinfo.h"
-#include "xdgdesktopfile.h"
 
 namespace Hawaii {
 
diff --git a/src/libhawaiishell/pluginmetadata.cpp b/src/libhawaiishell/pluginmetadata.cpp
index a04c45b..acd71bb 100644
--- a/src/libhawaiishell/pluginmetadata.cpp
+++ b/src/libhawaiishell/pluginmetadata.cpp
@@ -24,8 +24,8 @@
  * $END_LICENSE$
  ***************************************************************************/
 
+#include <qt5xdg/xdgdesktopfile.h>
 #include "pluginmetadata.h"
-#include "xdgdesktopfile.h"
 
 namespace Hawaii {
 
-- 
1.8.5.3