Git-Mirrors/RetroShare
1
0
Fork 0
mirror of https://github.com/RetroShare/RetroShare.git synced 2025-06-24 22:30:42 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge remote-tracking branch 'retro/master' into qml_app_avatar_picker

Browse source
This commit is contained in:
Angela Mazzurco 2017-07-12 17:56:26 +02:00
commit 0494dd7516
102 changed files with 4608 additions and 1861 deletions
Download patch file Download diff file Expand all files Collapse all files

13
retroshare-qml-app/src/retroshare-qml-app.pro
View file

@ -6,17 +6,24 @@ CONFIG += c++11
HEADERS += libresapilocalclient.h \
rsqmlappengine.h \
androidimagepicker.h
androidimagepicker.h \
platforminteracions.h
SOURCES += main-app.cpp \
libresapilocalclient.cpp \
rsqmlappengine.cpp
RESOURCES += qml.qrc
# Platform interaction specific code
android-g++ {
QT += androidextras
SOURCES += NativeCalls.cpp
HEADERS += NativeCalls.h
HEADERS += NativeCalls.h androidplatforminteracions.h
SOURCES += NativeCalls.cpp androidplatforminteracions.cpp
} else {
HEADERS += defaultplatforminteracions.h
SOURCES += defaultplatforminteracions.cpp
}
# Additional import path used to resolve QML modules in Qt Creator's code model