Fix android compilation on Qt 5.7.

2016-09-04 10:33:23 -04:00
parent 1549add8f8
commit 1c0ca82072
10 changed files with 462 additions and 47 deletions
--- a/android/android-src/.gitignore
+++ b/android/android-src/.gitignore
@@ -0,0 +1,2 @@
+local.properties*
+gradle.properties*
--- a/android/android-src/AndroidManifest.xml
+++ b/android/android-src/AndroidManifest.xml
@@ -0,0 +1,77 @@
+<?xml version="1.0"?>
+<manifest package="com.codestation.qcma" xmlns:android="http://schemas.android.com/apk/res/android" android:versionName="1.0" android:versionCode="1" android:installLocation="auto">
+    <application android:hardwareAccelerated="true" android:name="org.qtproject.qt5.android.bindings.QtApplication" android:label="Qcma">
+        <activity android:configChanges="orientation|uiMode|screenLayout|screenSize|smallestScreenSize|layoutDirection|locale|fontScale|keyboard|keyboardHidden|navigation" android:name="org.qtproject.qt5.android.bindings.QtActivity" android:label="QcmaApp" android:screenOrientation="unspecified" android:launchMode="singleTop">
+            <intent-filter>
+                <action android:name="android.intent.action.MAIN"/>
+                <category android:name="android.intent.category.LAUNCHER"/>
+            </intent-filter>
+
+            <!-- Application arguments -->
+            <!-- meta-data android:name="android.app.arguments" android:value="arg1 arg2 arg3"/ -->
+            <!-- Application arguments -->
+
+            <meta-data android:name="android.app.lib_name" android:value="qcma_android"/>
+            <meta-data android:name="android.app.qt_sources_resource_id" android:resource="@array/qt_sources"/>
+            <meta-data android:name="android.app.repository" android:value="default"/>
+            <meta-data android:name="android.app.qt_libs_resource_id" android:resource="@array/qt_libs"/>
+            <meta-data android:name="android.app.bundled_libs_resource_id" android:resource="@array/bundled_libs"/>
+            <!-- Deploy Qt libs as part of package -->
+            <meta-data android:name="android.app.bundle_local_qt_libs" android:value="-- %%BUNDLE_LOCAL_QT_LIBS%% --"/>
+            <meta-data android:name="android.app.bundled_in_lib_resource_id" android:resource="@array/bundled_in_lib"/>
+            <meta-data android:name="android.app.bundled_in_assets_resource_id" android:resource="@array/bundled_in_assets"/>
+            <!-- Run with local libs -->
+            <meta-data android:name="android.app.use_local_qt_libs" android:value="-- %%USE_LOCAL_QT_LIBS%% --"/>
+            <meta-data android:name="android.app.libs_prefix" android:value="/data/local/tmp/qt/"/>
+            <meta-data android:name="android.app.load_local_libs" android:value="-- %%INSERT_LOCAL_LIBS%% --"/>
+            <meta-data android:name="android.app.load_local_jars" android:value="-- %%INSERT_LOCAL_JARS%% --"/>
+            <meta-data android:name="android.app.static_init_classes" android:value="-- %%INSERT_INIT_CLASSES%% --"/>
+            <!--  Messages maps -->
+            <meta-data android:value="@string/ministro_not_found_msg" android:name="android.app.ministro_not_found_msg"/>
+            <meta-data android:value="@string/ministro_needed_msg" android:name="android.app.ministro_needed_msg"/>
+            <meta-data android:value="@string/fatal_error_msg" android:name="android.app.fatal_error_msg"/>
+            <!--  Messages maps -->
+
+            <!-- Splash screen -->
+            <!-- meta-data android:name="android.app.splash_screen_drawable" android:resource="@drawable/logo"/ -->
+            <!-- meta-data android:name="android.app.splash_screen_sticky" android:value="true"/ -->
+            <!-- Splash screen -->
+
+            <!-- Background running -->
+            <!-- Warning: changing this value to true may cause unexpected crashes if the
+                          application still try to draw after
+                          "applicationStateChanged(Qt::ApplicationSuspended)"
+                          signal is sent! -->
+            <meta-data android:name="android.app.background_running" android:value="false"/>
+            <!-- Background running -->
+
+            <!-- auto screen scale factor -->
+            <meta-data android:name="android.app.auto_screen_scale_factor" android:value="false"/>
+            <!-- auto screen scale factor -->
+
+            <!-- extract android style -->
+            <!-- available android:values :
+                * full - useful QWidget & Quick Controls 1 apps
+                * minimal - useful for Quick Controls 2 apps, it is much faster than "full"
+                * none - useful for apps that don't use any of the above Qt modules
+                -->
+            <meta-data android:name="android.app.extract_android_style" android:value="full"/>
+            <!-- extract android style -->
+    </activity>
+
+    <!-- For adding service(s) please check: https://wiki.qt.io/AndroidServices -->
+
+    </application>
+
+    <uses-sdk android:minSdkVersion="16" android:targetSdkVersion="23"/>
+    <supports-screens android:largeScreens="true" android:normalScreens="true" android:anyDensity="true" android:smallScreens="true"/>
+
+    <!-- The following comment will be replaced upon deployment with default permissions based on the dependencies of the application.
+         Remove the comment if you do not require these default permissions. -->
+    <!-- %%INSERT_PERMISSIONS -->
+
+    <!-- The following comment will be replaced upon deployment with default features based on the dependencies of the application.
+         Remove the comment if you do not require these default features. -->
+    <!-- %%INSERT_FEATURES -->
+
+</manifest>
--- a/android/android-src/build.gradle
+++ b/android/android-src/build.gradle
@@ -0,0 +1,57 @@
+buildscript {
+    repositories {
+        jcenter()
+    }
+
+    dependencies {
+        classpath 'com.android.tools.build:gradle:1.1.0'
+    }
+}
+
+allprojects {
+    repositories {
+        jcenter()
+    }
+}
+
+apply plugin: 'com.android.application'
+
+dependencies {
+    compile fileTree(dir: 'libs', include: ['*.jar'])
+}
+
+android {
+    /*******************************************************
+     * The following variables:
+     * - androidBuildToolsVersion,
+     * - androidCompileSdkVersion
+     * - qt5AndroidDir - holds the path to qt android files
+     *                   needed to build any Qt application
+     *                   on Android.
+     *
+     * are defined in gradle.properties file. This file is
+     * updated by QtCreator and androiddeployqt tools.
+     * Changing them manually might break the compilation!
+     *******************************************************/
+
+    compileSdkVersion androidCompileSdkVersion.toInteger()
+
+    buildToolsVersion androidBuildToolsVersion
+
+    sourceSets {
+        main {
+            manifest.srcFile 'AndroidManifest.xml'
+            java.srcDirs = [qt5AndroidDir + '/src', 'src', 'java']
+            aidl.srcDirs = [qt5AndroidDir + '/src', 'src', 'aidl']
+            res.srcDirs = [qt5AndroidDir + '/res', 'res']
+            resources.srcDirs = ['src']
+            renderscript.srcDirs = ['src']
+            assets.srcDirs = ['assets']
+            jniLibs.srcDirs = ['libs']
+       }
+    }
+
+    lintOptions {
+        abortOnError false
+    }
+}
--- a/android/android-src/gradle/wrapper/gradle-wrapper.jar
+++ b/android/android-src/gradle/wrapper/gradle-wrapper.jar
--- a/android/android-src/gradle/wrapper/gradle-wrapper.properties
+++ b/android/android-src/gradle/wrapper/gradle-wrapper.properties
@@ -0,0 +1,6 @@
+#Wed Apr 10 15:27:10 PDT 2013
+distributionBase=GRADLE_USER_HOME
+distributionPath=wrapper/dists
+zipStoreBase=GRADLE_USER_HOME
+zipStorePath=wrapper/dists
+distributionUrl=https\://services.gradle.org/distributions/gradle-2.2.1-all.zip
--- a/android/android-src/gradlew
+++ b/android/android-src/gradlew
@@ -0,0 +1,164 @@
+#!/usr/bin/env bash
+
+##############################################################################
+##
+##  Gradle start up script for UN*X
+##
+##############################################################################
+
+# Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script.
+DEFAULT_JVM_OPTS=""
+
+APP_NAME="Gradle"
+APP_BASE_NAME=`basename "$0"`
+
+# Use the maximum available, or set MAX_FD != -1 to use that value.
+MAX_FD="maximum"
+
+warn ( ) {
+    echo "$*"
+}
+
+die ( ) {
+    echo
+    echo "$*"
+    echo
+    exit 1
+}
+
+# OS specific support (must be 'true' or 'false').
+cygwin=false
+msys=false
+darwin=false
+case "`uname`" in
+  CYGWIN* )
+    cygwin=true
+    ;;
+  Darwin* )
+    darwin=true
+    ;;
+  MINGW* )
+    msys=true
+    ;;
+esac
+
+# For Cygwin, ensure paths are in UNIX format before anything is touched.
+if $cygwin ; then
+    [ -n "$JAVA_HOME" ] && JAVA_HOME=`cygpath --unix "$JAVA_HOME"`
+fi
+
+# Attempt to set APP_HOME
+# Resolve links: $0 may be a link
+PRG="$0"
+# Need this for relative symlinks.
+while [ -h "$PRG" ] ; do
+    ls=`ls -ld "$PRG"`
+    link=`expr "$ls" : '.*-> \(.*\)$'`
+    if expr "$link" : '/.*' > /dev/null; then
+        PRG="$link"
+    else
+        PRG=`dirname "$PRG"`"/$link"
+    fi
+done
+SAVED="`pwd`"
+cd "`dirname \"$PRG\"`/" >&-
+APP_HOME="`pwd -P`"
+cd "$SAVED" >&-
+
+CLASSPATH=$APP_HOME/gradle/wrapper/gradle-wrapper.jar
+
+# Determine the Java command to use to start the JVM.
+if [ -n "$JAVA_HOME" ] ; then
+    if [ -x "$JAVA_HOME/jre/sh/java" ] ; then
+        # IBM's JDK on AIX uses strange locations for the executables
+        JAVACMD="$JAVA_HOME/jre/sh/java"
+    else
+        JAVACMD="$JAVA_HOME/bin/java"
+    fi
+    if [ ! -x "$JAVACMD" ] ; then
+        die "ERROR: JAVA_HOME is set to an invalid directory: $JAVA_HOME
+
+Please set the JAVA_HOME variable in your environment to match the
+location of your Java installation."
+    fi
+else
+    JAVACMD="java"
+    which java >/dev/null 2>&1 || die "ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH.
+
+Please set the JAVA_HOME variable in your environment to match the
+location of your Java installation."
+fi
+
+# Increase the maximum file descriptors if we can.
+if [ "$cygwin" = "false" -a "$darwin" = "false" ] ; then
+    MAX_FD_LIMIT=`ulimit -H -n`
+    if [ $? -eq 0 ] ; then
+        if [ "$MAX_FD" = "maximum" -o "$MAX_FD" = "max" ] ; then
+            MAX_FD="$MAX_FD_LIMIT"
+        fi
+        ulimit -n $MAX_FD
+        if [ $? -ne 0 ] ; then
+            warn "Could not set maximum file descriptor limit: $MAX_FD"
+        fi
+    else
+        warn "Could not query maximum file descriptor limit: $MAX_FD_LIMIT"
+    fi
+fi
+
+# For Darwin, add options to specify how the application appears in the dock
+if $darwin; then
+    GRADLE_OPTS="$GRADLE_OPTS \"-Xdock:name=$APP_NAME\" \"-Xdock:icon=$APP_HOME/media/gradle.icns\""
+fi
+
+# For Cygwin, switch paths to Windows format before running java
+if $cygwin ; then
+    APP_HOME=`cygpath --path --mixed "$APP_HOME"`
+    CLASSPATH=`cygpath --path --mixed "$CLASSPATH"`
+
+    # We build the pattern for arguments to be converted via cygpath
+    ROOTDIRSRAW=`find -L / -maxdepth 1 -mindepth 1 -type d 2>/dev/null`
+    SEP=""
+    for dir in $ROOTDIRSRAW ; do
+        ROOTDIRS="$ROOTDIRS$SEP$dir"
+        SEP="|"
+    done
+    OURCYGPATTERN="(^($ROOTDIRS))"
+    # Add a user-defined pattern to the cygpath arguments
+    if [ "$GRADLE_CYGPATTERN" != "" ] ; then
+        OURCYGPATTERN="$OURCYGPATTERN|($GRADLE_CYGPATTERN)"
+    fi
+    # Now convert the arguments - kludge to limit ourselves to /bin/sh
+    i=0
+    for arg in "$@" ; do
+        CHECK=`echo "$arg"|egrep -c "$OURCYGPATTERN" -`
+        CHECK2=`echo "$arg"|egrep -c "^-"`                                 ### Determine if an option
+
+        if [ $CHECK -ne 0 ] && [ $CHECK2 -eq 0 ] ; then                    ### Added a condition
+            eval `echo args$i`=`cygpath --path --ignore --mixed "$arg"`
+        else
+            eval `echo args$i`="\"$arg\""
+        fi
+        i=$((i+1))
+    done
+    case $i in
+        (0) set -- ;;
+        (1) set -- "$args0" ;;
+        (2) set -- "$args0" "$args1" ;;
+        (3) set -- "$args0" "$args1" "$args2" ;;
+        (4) set -- "$args0" "$args1" "$args2" "$args3" ;;
+        (5) set -- "$args0" "$args1" "$args2" "$args3" "$args4" ;;
+        (6) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" ;;
+        (7) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" ;;
+        (8) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" "$args7" ;;
+        (9) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" "$args7" "$args8" ;;
+    esac
+fi
+
+# Split up the JVM_OPTS And GRADLE_OPTS values into an array, following the shell quoting and substitution rules
+function splitJvmOpts() {
+    JVM_OPTS=("$@")
+}
+eval splitJvmOpts $DEFAULT_JVM_OPTS $JAVA_OPTS $GRADLE_OPTS
+JVM_OPTS[${#JVM_OPTS[*]}]="-Dorg.gradle.appname=$APP_BASE_NAME"
+
+exec "$JAVACMD" "${JVM_OPTS[@]}" -classpath "$CLASSPATH" org.gradle.wrapper.GradleWrapperMain "$@"
--- a/android/android-src/gradlew.bat
+++ b/android/android-src/gradlew.bat
@@ -0,0 +1,90 @@
+@if "%DEBUG%" == "" @echo off
+@rem ##########################################################################
+@rem
+@rem  Gradle startup script for Windows
+@rem
+@rem ##########################################################################
+
+@rem Set local scope for the variables with windows NT shell
+if "%OS%"=="Windows_NT" setlocal
+
+@rem Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script.
+set DEFAULT_JVM_OPTS=
+
+set DIRNAME=%~dp0
+if "%DIRNAME%" == "" set DIRNAME=.
+set APP_BASE_NAME=%~n0
+set APP_HOME=%DIRNAME%
+
+@rem Find java.exe
+if defined JAVA_HOME goto findJavaFromJavaHome
+
+set JAVA_EXE=java.exe
+%JAVA_EXE% -version >NUL 2>&1
+if "%ERRORLEVEL%" == "0" goto init
+
+echo.
+echo ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH.
+echo.
+echo Please set the JAVA_HOME variable in your environment to match the
+echo location of your Java installation.
+
+goto fail
+
+:findJavaFromJavaHome
+set JAVA_HOME=%JAVA_HOME:"=%
+set JAVA_EXE=%JAVA_HOME%/bin/java.exe
+
+if exist "%JAVA_EXE%" goto init
+
+echo.
+echo ERROR: JAVA_HOME is set to an invalid directory: %JAVA_HOME%
+echo.
+echo Please set the JAVA_HOME variable in your environment to match the
+echo location of your Java installation.
+
+goto fail
+
+:init
+@rem Get command-line arguments, handling Windowz variants
+
+if not "%OS%" == "Windows_NT" goto win9xME_args
+if "%@eval[2+2]" == "4" goto 4NT_args
+
+:win9xME_args
+@rem Slurp the command line arguments.
+set CMD_LINE_ARGS=
+set _SKIP=2
+
+:win9xME_args_slurp
+if "x%~1" == "x" goto execute
+
+set CMD_LINE_ARGS=%*
+goto execute
+
+:4NT_args
+@rem Get arguments from the 4NT Shell from JP Software
+set CMD_LINE_ARGS=%$
+
+:execute
+@rem Setup the command line
+
+set CLASSPATH=%APP_HOME%\gradle\wrapper\gradle-wrapper.jar
+
+@rem Execute Gradle
+"%JAVA_EXE%" %DEFAULT_JVM_OPTS% %JAVA_OPTS% %GRADLE_OPTS% "-Dorg.gradle.appname=%APP_BASE_NAME%" -classpath "%CLASSPATH%" org.gradle.wrapper.GradleWrapperMain %CMD_LINE_ARGS%
+
+:end
+@rem End local scope for the variables with windows NT shell
+if "%ERRORLEVEL%"=="0" goto mainEnd
+
+:fail
+rem Set variable GRADLE_EXIT_CONSOLE if you need the _script_ return code instead of
+rem the _cmd.exe /c_ return code!
+if  not "" == "%GRADLE_EXIT_CONSOLE%" exit 1
+exit /b 1
+
+:mainEnd
+if "%OS%"=="Windows_NT" endlocal
+
+:omega
--- a/android/android.pro
+++ b/android/android.pro
@@ -3,13 +3,19 @@ include(../common/defines.pri)

 TARGET = qcma_android
 TEMPLATE=app
-QT += network sql androidextras
+QT += network sql
+
+android {
+  QT += androidextras
+}
+
 QT -= gui
 LIBS += -L../common -lqcma_common
+CONFIG += mobility

 # 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) -liconv
+QMAKE_CXXFLAGS += $$system(pkg-config --static --cflags libvitamtp)
+LIBS += -lvitamtp -lxml2 -liconv

 SOURCES += \
    main_android.cpp \
@@ -19,12 +25,12 @@ HEADERS += \
    servicemanager.h

 DISTFILES += \
-    android-src/gradle/wrapper/gradle-wrapper.jar \
    android-src/AndroidManifest.xml \
-    android-src/gradlew.bat \
+    android-src/gradle/wrapper/gradle-wrapper.jar \
+    android-src/gradlew \
    android-src/res/values/libs.xml \
    android-src/build.gradle \
    android-src/gradle/wrapper/gradle-wrapper.properties \
-    android-src/gradlew
+    android-src/gradlew.bat

 ANDROID_PACKAGE_SOURCE_DIR = $$PWD/android-src
--- a/android/main_android.cpp
+++ b/android/main_android.cpp
@@ -53,7 +53,7 @@ static void cleanOutput(QtMsgType type, const QMessageLogContext &, const QStrin

    switch (type) {
    case QtDebugMsg:
-        __android_log_print(ANDROID_LOG_INFO, "qcma", "%s", message);
+        __android_log_print(ANDROID_LOG_DEBUG, "qcma", "%s", message);
        break;
    case QtWarningMsg:
        __android_log_print(ANDROID_LOG_WARN, "qcma", "%s", message);
@@ -64,6 +64,11 @@ static void cleanOutput(QtMsgType type, const QMessageLogContext &, const QStrin
    case QtFatalMsg:
        __android_log_print(ANDROID_LOG_FATAL, "qcma", "%s", message);
        abort();
+#if QT_VERSION >= QT_VERSION_CHECK(5, 5, 0)
+    case QtInfoMsg:
+        __android_log_print(ANDROID_LOG_INFO, "qcma", "%s", message);
+        break;
+#endif
    }
 }

@@ -88,13 +93,10 @@ int main(int argc, char *argv[])
    QString appname = getAppName();
    qDebug("Class name: %s", qPrintable(appname));

-    // set $HOME, Qt/Android doesn't currently do this
-    qputenv("HOME", QString("/data/data/%1").arg(appname).toLocal8Bit());
-
    app.addLibraryPath(appname + "/lib");

    QTranslator translator;
-    QString locale = "en"; //QLocale().system().name();
+    QString locale = QLocale().system().name();
    qDebug() << "Current locale:" << locale;

    if(app.arguments().contains("--set-locale")) {
--- a/android/sevicemanager.cpp
+++ b/android/sevicemanager.cpp
@@ -31,8 +31,8 @@
 #include <QAndroidJniObject>
 #include <vitamtp.h>

-ServiceManager::ServiceManager(QObject *obj_parent) :
-    QObject(obj_parent)
+ServiceManager::ServiceManager(QObject *obj_parent)
+    : QObject(obj_parent)
 {
 }

@@ -44,13 +44,13 @@ ServiceManager::~ServiceManager()

 void ServiceManager::refreshDatabase()
 {
-    if(m_db->load()) {
+    if (m_db->load()) {
        return;
    }

    QTextStream(stdout) << "Database scan has started" << endl;

-    if(!m_db->rescan()) {
+    if (!m_db->rescan()) {
        qWarning("No PS Vita system has been registered");
    }
 }
@@ -61,7 +61,7 @@ void ServiceManager::start()

    loadDefaultSettings();

-    if(QSettings().value("useMemoryStorage", true).toBool()) {
+    if (QSettings().value("useMemoryStorage", true).toBool()) {
        m_db = new QListDB();
    } else {
        m_db = new SQLiteDB();
@@ -78,43 +78,51 @@ void ServiceManager::start()
    CmaClient *client;
    QSettings settings;

-    if(!settings.value("disableUSB", false).toBool()) {
-
+    if (!settings.value("disableUSB", false).toBool()) {
        usb_thread = new QThread();
        client = new CmaClient(m_db);
        usb_thread->setObjectName("usb_thread");
        connect(usb_thread, SIGNAL(started()), client, SLOT(connectUsb()));
-        connect(client, SIGNAL(finished()), usb_thread, SLOT(quit()), Qt::DirectConnection);
-        connect(usb_thread, SIGNAL(finished()), usb_thread, SLOT(deleteLater()));
+        connect(client, SIGNAL(finished()), usb_thread, SLOT(quit()),
+                Qt::DirectConnection);
+        connect(usb_thread, SIGNAL(finished()), usb_thread,
+                SLOT(deleteLater()));
        connect(usb_thread, SIGNAL(finished()), this, SLOT(threadStopped()));
        connect(usb_thread, SIGNAL(finished()), client, SLOT(deleteLater()));

-        connect(client, SIGNAL(refreshDatabase()), this, SLOT(refreshDatabase()));
+        connect(client, SIGNAL(refreshDatabase()), this,
+                SLOT(refreshDatabase()));

        client->moveToThread(usb_thread);
        usb_thread->start();
        thread_count++;
    }

-    if(!settings.value("disableWireless", false).toBool()) {
+    if (!settings.value("disableWireless", false).toBool()) {
        CmaBroadcast *broadcast = new CmaBroadcast(this);
        wireless_thread = new QThread();
        client = new CmaClient(m_db, broadcast);
        wireless_thread->setObjectName("wireless_thread");
-        connect(wireless_thread, SIGNAL(started()), client, SLOT(connectWireless()));
-        connect(client, SIGNAL(finished()), wireless_thread, SLOT(quit()), Qt::DirectConnection);
-        connect(wireless_thread, SIGNAL(finished()), wireless_thread, SLOT(deleteLater()));
-        connect(wireless_thread, SIGNAL(finished()), this, SLOT(threadStopped()));
-        connect(wireless_thread, SIGNAL(finished()), client, SLOT(deleteLater()));
+        connect(wireless_thread, SIGNAL(started()), client,
+                SLOT(connectWireless()));
+        connect(client, SIGNAL(finished()), wireless_thread, SLOT(quit()),
+                Qt::DirectConnection);
+        connect(wireless_thread, SIGNAL(finished()), wireless_thread,
+                SLOT(deleteLater()));
+        connect(wireless_thread, SIGNAL(finished()), this,
+                SLOT(threadStopped()));
+        connect(wireless_thread, SIGNAL(finished()), client,
+                SLOT(deleteLater()));

-        connect(client, SIGNAL(refreshDatabase()), this, SLOT(refreshDatabase()));
+        connect(client, SIGNAL(refreshDatabase()), this,
+                SLOT(refreshDatabase()));

        client->moveToThread(wireless_thread);
        wireless_thread->start();
        thread_count++;
    }

-    if(thread_count == 0) {
+    if (thread_count == 0) {
        qCritical("You must enable at least USB or Wireless monitoring");
    }
 }
@@ -126,7 +134,7 @@ void ServiceManager::receiveMessage(QString message)

 void ServiceManager::stop()
 {
-    if(CmaClient::stop() < 0) {
+    if (CmaClient::stop() < 0) {
        QCoreApplication::quit();
    }
 }
@@ -134,7 +142,7 @@ void ServiceManager::stop()
 void ServiceManager::threadStopped()
 {
    mutex.lock();
-    if(--thread_count == 0) {
+    if (--thread_count == 0) {
        QCoreApplication::quit();
    }
    mutex.unlock();
@@ -142,43 +150,45 @@ void ServiceManager::threadStopped()

 void ServiceManager::loadDefaultSettings()
 {
-    QString defaultdir = QStandardPaths::writableLocation(QStandardPaths::GenericDataLocation);
-
-    // save config to /sdcard, remove when the app works properly
-    qputenv("XDG_CONFIG_HOME", defaultdir.toLocal8Bit());
-
    QSettings settings;
+    qDebug() << "config location:" << settings.fileName();

    // skip initialization if some config is already present
-    if(!settings.value("appsPath").isNull())
+    if (!settings.value("appsPath").isNull())
        return;

    qDebug("saving to: %s", qPrintable(settings.fileName()));

-    defaultdir = QStandardPaths::writableLocation(QStandardPaths::PicturesLocation);
+    QString defaultdir =
+        QStandardPaths::writableLocation(QStandardPaths::PicturesLocation);
    qDebug("photoPath: %s", qPrintable(defaultdir));
    settings.setValue("photoPath", defaultdir);

-    defaultdir = QStandardPaths::writableLocation(QStandardPaths::MusicLocation);
+    defaultdir =
+        QStandardPaths::writableLocation(QStandardPaths::MusicLocation);
    qDebug("musicPath: %s", qPrintable(defaultdir));
    settings.setValue("musicPath", defaultdir);

-    defaultdir = QStandardPaths::writableLocation(QStandardPaths::MoviesLocation);
+    defaultdir =
+        QStandardPaths::writableLocation(QStandardPaths::MoviesLocation);
    qDebug("photoPath: %s", qPrintable(defaultdir));
    settings.setValue("videoPath", defaultdir);

-    defaultdir = QStandardPaths::writableLocation(QStandardPaths::GenericDataLocation);
-    defaultdir.append(QDir::separator()).append("PS Vita");
+    defaultdir =
+        QStandardPaths::writableLocation(QStandardPaths::GenericDataLocation);
+    defaultdir.append("/Qcma/PS Vita");
    qDebug("appsPath: %s", qPrintable(defaultdir));
    settings.setValue("appsPath", defaultdir);

-    defaultdir = QStandardPaths::writableLocation(QStandardPaths::GenericDataLocation);
-    defaultdir.append(QDir::separator()).append("PSV Updates");
+    defaultdir =
+        QStandardPaths::writableLocation(QStandardPaths::GenericDataLocation);
+    defaultdir.append("/Qcma/PSV Updates");
    qDebug("urlPath: %s", qPrintable(defaultdir));
    settings.setValue("urlPath", defaultdir);

-    defaultdir = QStandardPaths::writableLocation(QStandardPaths::GenericDataLocation);
-    defaultdir.append(QDir::separator()).append("PSV Packages");
+    defaultdir =
+        QStandardPaths::writableLocation(QStandardPaths::GenericDataLocation);
+    defaultdir.append("/Qcma/PSV Packages");
    qDebug("pkgPath: %s", qPrintable(defaultdir));
    settings.setValue("pkgPath", defaultdir);

@@ -202,7 +212,8 @@ void ServiceManager::loadDefaultSettings()
    settings.setValue("protocolVersion", VITAMTP_PROTOCOL_MAX_VERSION);

    QString deviceName = QAndroidJniObject::getStaticObjectField(
-                "android/os/Build", "MODEL", "Ljava/lang/String;").toString();
+                             "android/os/Build", "MODEL", "Ljava/lang/String;")
+                             .toString();

    qDebug("Detected device model: %s", qPrintable(deviceName));
    settings.setValue("hostName", deviceName);