From ae2686717e51736fd207e4e40d1ebd204d4aa3c0 Mon Sep 17 00:00:00 2001
From: Jing Bai <jing.t.bai@nokia.com>
Date: Mon, 3 Sep 2012 10:14:38 +0200
Subject: [PATCH] QStandardPaths should still work without desktop service

To fix a compile problem when QT_NO_DESKTOPSERVICES is defined.
We should enable QStandardPaths on Mac even without desktop service,
since it doesn't rely on desktop service and it is used in other files.

Change-Id: I29267ebfe81b79c598043f8287fd2bb419573570
Reviewed-by: David Faure <faure@kde.org>
---
 src/corelib/io/qstandardpaths_mac.cpp | 4 ----
 1 file changed, 4 deletions(-)

diff --git a/src/corelib/io/qstandardpaths_mac.cpp b/src/corelib/io/qstandardpaths_mac.cpp
index dfc802a78c..e8b3f9621d 100644
--- a/src/corelib/io/qstandardpaths_mac.cpp
+++ b/src/corelib/io/qstandardpaths_mac.cpp
@@ -39,8 +39,6 @@
 **
 ****************************************************************************/
 
-#ifndef QT_NO_DESKTOPSERVICES
-
 #include "qstandardpaths.h"
 #include <qdir.h>
 #include <private/qcore_mac_p.h>
@@ -201,5 +199,3 @@ QString QStandardPaths::displayName(StandardLocation type)
 }
 
 QT_END_NAMESPACE
-
-#endif // QT_NO_DESKTOPSERVICES