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

Fix android compilation on Qt 5.7.

Browse Source
This commit is contained in:
codestation
2016-09-04 10:33:23 -04:00
parent 1549add8f8
commit 1c0ca82072
10 changed files with 462 additions and 47 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
android/android.pro
View File

@@ -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