From daa5144ccc92c9060f712f7fccfe750966186f51 Mon Sep 17 00:00:00 2001 From: Dominik Holland Date: Tue, 4 Dec 2018 14:14:19 +0100 Subject: Use the new appman qmake integration for packaging the apps Fixes: AUTOSUITE-691 Change-Id: I9e7b2f8ce6443c72e44e63b50902a50c8654bf6f Reviewed-by: Robert Griebl --- com.pelagicore.camera/app/app.pro | 8 ++++++-- com.pelagicore.camera/com.pelagicore.camera.pro | 5 +++++ com.pelagicore.camera/plugin/plugin.pro | 8 ++++++-- 3 files changed, 17 insertions(+), 4 deletions(-) (limited to 'com.pelagicore.camera') diff --git a/com.pelagicore.camera/app/app.pro b/com.pelagicore.camera/app/app.pro index ff6386e..b59aebe 100644 --- a/com.pelagicore.camera/app/app.pro +++ b/com.pelagicore.camera/app/app.pro @@ -1,7 +1,11 @@ +TEMPLATE = aux + FILES += info.yaml \ icon.png \ Camera.qml -NAME = com.pelagicore.camera +app.files = $$FILES +app.path = /apps/com.pelagicore.camera +INSTALLS += app -load(app) +OTHER_FILES += $$FILES diff --git a/com.pelagicore.camera/com.pelagicore.camera.pro b/com.pelagicore.camera/com.pelagicore.camera.pro index 0740149..db9ffa1 100644 --- a/com.pelagicore.camera/com.pelagicore.camera.pro +++ b/com.pelagicore.camera/com.pelagicore.camera.pro @@ -3,3 +3,8 @@ SUBDIRS += plugin \ app app.depends = plugin + +AM_MANIFEST = $$PWD/app/info.yaml +AM_PACKAGE_DIR = /apps/com.pelagicore.camera + +load(am-app) diff --git a/com.pelagicore.camera/plugin/plugin.pro b/com.pelagicore.camera/plugin/plugin.pro index 8988a37..9edcc7d 100644 --- a/com.pelagicore.camera/plugin/plugin.pro +++ b/com.pelagicore.camera/plugin/plugin.pro @@ -4,8 +4,6 @@ QT += qml quick CONFIG += plugin TARGET = $$qtLibraryTarget($$TARGET) -uri = camera -load(qmlplugin) # Input SOURCES += \ @@ -16,4 +14,10 @@ HEADERS += \ camera_plugin.h \ camerastream.h +installPath = /apps/com.pelagicore.camera/imports/camera +target.path = $$installPath +qmldir.files = qmldir +qmldir.path = $$installPath +INSTALLS += target qmldir + OTHER_FILES = qmldir -- cgit v1.2.3