easthighNerd/qcma
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Removed QtGui from android deps.

Browse Source 
Force iconv as link dep for android build.
Enable metadata support for android build.
This commit is contained in:
codestation
2015-05-27 14:05:47 -04:30
parent b6eebd79b1
commit 613dd97561
2 changed files with 3 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
android/android.pro
View File

@@ -4,11 +4,12 @@ include(../common/defines.pri)
TARGET = qcma_android TARGET = qcma_android
TEMPLATE=app TEMPLATE=app
QT += network sql androidextras QT += network sql androidextras
QT -= gui
LIBS += -L../common -lqcma_common LIBS += -L../common -lqcma_common
# this library needs to link statically their deps but Qt doesn't pass --static to PKGCONFIG # 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) 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 += \ SOURCES += \
main_android.cpp \ main_android.cpp \

2
android/sevicemanager.cpp
View File

@@ -183,7 +183,7 @@ void ServiceManager::loadDefaultSettings()
settings.setValue("pkgPath", defaultdir); settings.setValue("pkgPath", defaultdir);
settings.setValue("offlineMode", true); settings.setValue("offlineMode", true);
settings.setValue("skipMetadata", true); settings.setValue("skipMetadata", false);
// disable USB for now // disable USB for now
settings.setValue("disableUSB", true); settings.setValue("disableUSB", true);