diff options
| author | Grigorii Zimin <gzimin@luxoft.com> | 2019-11-19 15:29:48 +0300 |
|---|---|---|
| committer | Grigorii Zimin <gzimin@luxoft.com> | 2019-11-19 13:57:22 +0000 |
| commit | 4c3de58639815d178a87f82ef63e52d9674acb4a (patch) | |
| tree | c61796bad2a2e22ea24e93fd928ef900ee751640 | |
| parent | 7552972c339a9fec75beeff0d59936e9f269c644 (diff) | |
[build] fix build according to appman 5.14
- it can be build now, but works only in SP mode
Task-number: AUTOSUITE-1342
Change-Id: I4b741b5acc25b3d4c0206a811ecef30d29842856
Reviewed-by: Bramastyo Harimukti Santoso <bramastyo.harimukti.santoso@pelagicore.com>
| -rw-r--r-- | am-config-android.yaml | 2 | ||||
| -rw-r--r-- | am-config-lucee.yaml | 2 | ||||
| -rw-r--r-- | am-config-neptune.yaml | 2 | ||||
| -rw-r--r-- | src/neptune3-ui/main.cpp | 6 |
4 files changed, 3 insertions, 9 deletions
diff --git a/am-config-android.yaml b/am-config-android.yaml index 6adce907..5d9e10aa 100644 --- a/am-config-android.yaml +++ b/am-config-android.yaml @@ -6,7 +6,5 @@ formatType: am-configuration applications: builtinAppsManifestDir: "${CONFIG_PWD}/apps" installedAppsManifestDir: ~ - appImageMountDir: ~ - database: "am/apps.db" installationLocations: ~ diff --git a/am-config-lucee.yaml b/am-config-lucee.yaml index d78860d5..5cb40daa 100644 --- a/am-config-lucee.yaml +++ b/am-config-lucee.yaml @@ -8,8 +8,6 @@ formatType: am-configuration applications: builtinAppsManifestDir: "${CONFIG_PWD}/apps" installedAppsManifestDir: "${stdpath:AppLocalDataLocation}/neptune3-ui/manifests" - appImageMountDir: "${stdpath:AppLocalDataLocation}/neptune3-ui/image-mounts" - database: "${stdpath:AppLocalDataLocation}/neptune3-ui/apps.db" # QML apps will be able to import from modules... diff --git a/am-config-neptune.yaml b/am-config-neptune.yaml index 96699d9b..5ba099cf 100644 --- a/am-config-neptune.yaml +++ b/am-config-neptune.yaml @@ -8,8 +8,6 @@ formatType: am-configuration applications: builtinAppsManifestDir: "${CONFIG_PWD}/apps" installedAppsManifestDir: "${stdpath:AppLocalDataLocation}/neptune3-ui/manifests" - appImageMountDir: "${stdpath:AppLocalDataLocation}/neptune3-ui/image-mounts" - database: "${stdpath:AppLocalDataLocation}/neptune3-ui/apps.db" # QML apps will be able to import from modules... diff --git a/src/neptune3-ui/main.cpp b/src/neptune3-ui/main.cpp index 80591cb8..3c9390b9 100644 --- a/src/neptune3-ui/main.cpp +++ b/src/neptune3-ui/main.cpp @@ -36,8 +36,8 @@ #include <QtIviCore/QtIviCoreVersion> #include <QtAppManMain/main.h> #include <QtAppManMain/defaultconfiguration.h> -#include <QtAppManPackage/package.h> -#include <QtAppManInstaller/sudo.h> +#include <QtAppManPackage/packageutilities.h> +#include <QtAppManManager/sudo.h> #include <QtAppManWindow/touchemulation.h> #include <QGuiApplication> #include <QTranslator> @@ -90,7 +90,7 @@ Q_DECL_EXPORT int main(int argc, char *argv[]) Logging::initialize(); - Package::ensureCorrectLocale(); + PackageUtilities::ensureCorrectLocale(); try { QStringList deploymentWarnings; |