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 'g1o/android_share_intent' into qml_app_ui_aesthetic

Browse source
This commit is contained in:
Angela Mazzurco 2017-07-09 13:18:12 +02:00
commit 02d4790890
62 changed files with 2294 additions and 1438 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -5,17 +5,24 @@ QT += core network qml quick svg
CONFIG += c++11
HEADERS += libresapilocalclient.h \
rsqmlappengine.h
rsqmlappengine.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