diff --git a/assets/shared.qrc b/assets/shared.qrc
index a7cd388..4d8ed66 100644
--- a/assets/shared.qrc
+++ b/assets/shared.qrc
@@ -1,11 +1,3 @@
-
- shared/fonts/TitilliumWeb-Bold.ttf
- shared/fonts/TitilliumWeb-Italic.ttf
- shared/fonts/TitilliumWeb-Regular.ttf
- shared/fonts/fontawesome-webfont.ttf
- shared/qml/TvRemoteInputArea.qml
- shared/qml/TvRemoteInputMethod.qml
- shared/qml/Time.qml
-
+
diff --git a/plugin/plugin.qbs b/plugin/plugin.qbs
index 614731b..9f4a4e3 100644
--- a/plugin/plugin.qbs
+++ b/plugin/plugin.qbs
@@ -16,11 +16,11 @@ QtGuiApplication {
Properties {
condition: qbs.targetOS.contains("android")
- architectures: !qbs.architecture ? ["x86", "armv7a"] : undefined
+ qbs.architectures: !qbs.architecture ? ["x86", "armv7a"] : undefined
Android.ndk.appStl: "gnustl_shared"
}
- architectures: undefined
+ qbs.architectures: undefined
files: [
"Info.plist",
diff --git a/ui/android/AndroidManifest.xml b/ui/android/AndroidManifest.xml
index 267dbcf..b7c4541 100644
--- a/ui/android/AndroidManifest.xml
+++ b/ui/android/AndroidManifest.xml
@@ -1,5 +1,5 @@
-
+
@@ -27,9 +27,11 @@
+
diff --git a/ui/ui.qbs b/ui/ui.qbs
index 43eaa22..d92a472 100644
--- a/ui/ui.qbs
+++ b/ui/ui.qbs
@@ -9,6 +9,7 @@ Project {
name: "qt-tv"
packageName: "io.qt.stbdemo"
targetName: "qt-tv"
+ resourcesDir: FileInfo.joinPaths(sourceDirectory, "android", "res")
Depends {
productTypes: ["android.nativelibrary"]
limitToSubProject: true
@@ -29,11 +30,11 @@ Project {
Properties {
condition: qbs.targetOS.contains("android")
- architectures: !qbs.architecture ? ["x86", "armv7a"] : undefined
+ qbs.architectures: !qbs.architecture ? ["x86", "armv7a"] : undefined
Android.ndk.appStl: "gnustl_shared"
}
- architectures: undefined
+ qbs.architectures: undefined
cpp.minimumIosVersion: "8.0"
cpp.cxxLanguageVersion: "c++11"
cpp.rpaths: qbs.targetOS.contains("darwin") ? ["@loader_path/../Frameworks"] : undefined