From 613dd9756185ce0d980a736513893b50ac89066d Mon Sep 17 00:00:00 2001
From: codestation <codestation404@gmail.com>
Date: Wed, 27 May 2015 14:05:47 -0430
Subject: [PATCH] Removed QtGui from android deps. Force iconv as link dep for
 android build. Enable metadata support for android build.

---
 android/android.pro       | 3 ++-
 android/sevicemanager.cpp | 2 +-
 2 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/android/android.pro b/android/android.pro
index 4512e9b..1ece891 100644
--- a/android/android.pro
+++ b/android/android.pro
@@ -4,11 +4,12 @@ include(../common/defines.pri)
 TARGET = qcma_android
 TEMPLATE=app
 QT += network sql androidextras
+QT -= gui
 LIBS += -L../common -lqcma_common
 
 # this library needs to link statically their deps but Qt doesn't pass --static to PKGCONFIG
 QMAKE_CXXFLAGS += $$system(pkg-config --static --cflags libvitamtp libavformat libavcodec libavutil libswscale)
-LIBS += $$system(pkg-config --static --libs libvitamtp libavformat libavcodec libavutil libswscale)
+LIBS += $$system(pkg-config --static --libs libvitamtp libavformat libavcodec libavutil libswscale) -liconv
 
 SOURCES += \
     main_android.cpp \
diff --git a/android/sevicemanager.cpp b/android/sevicemanager.cpp
index 1bd821e..4be7d6c 100644
--- a/android/sevicemanager.cpp
+++ b/android/sevicemanager.cpp
@@ -183,7 +183,7 @@ void ServiceManager::loadDefaultSettings()
     settings.setValue("pkgPath", defaultdir);
 
     settings.setValue("offlineMode", true);
-    settings.setValue("skipMetadata", true);
+    settings.setValue("skipMetadata", false);
 
     // disable USB for now
     settings.setValue("disableUSB", true);