diff options
| author | Samuli Piippo <samuli.piippo@qt.io> | 2016-10-12 15:59:03 +0300 |
|---|---|---|
| committer | Samuli Piippo <samuli.piippo@qt.io> | 2016-10-12 16:25:02 +0300 |
| commit | f73f001826f9df801708e087af4ca121cf058b7d (patch) | |
| tree | 1b4cb30fb5e2c360c74dabb0e4d14d847f0abd85 /recipes-qt | |
| parent | c1bd2a954272b2c2aca0891b1a19348062efa002 (diff) | |
| parent | 415e9f875b9c153c62883b5177bf836e722e8800 (diff) | |
| download | meta-boot2qt-f73f001826f9df801708e087af4ca121cf058b7d.tar.gz | |
Merge remote-tracking branch 'origin/jethro' into dev
* origin/jethro:
Always append to MACHINE_EXTRA_INSTALL
qt5: update submodules
Enable dbus by default for neptune ui
qt5: update submodules
Add connman patch to disable connman with boot over nfs
Update dbus-session-init to work with systemd
Conflicts:
conf/distro/include/am335x-evm.conf
conf/distro/include/beaglebone.conf
conf/distro/include/nvidia-logan.conf
recipes-qt/qt5/nativesdk-qtbase_git.bbappend
recipes-qt/qt5/qt3d_git.bbappend
recipes-qt/qt5/qtbase-native_git.bbappend
recipes-qt/qt5/qtbase_git.bbappend
recipes-qt/qt5/qtcharts_git.bbappend
recipes-qt/qt5/qtconnectivity_git.bbappend
recipes-qt/qt5/qtdeclarative-render2d_git.bbappend
recipes-qt/qt5/qtdeclarative_git.bbappend
recipes-qt/qt5/qtimageformats_git.bbappend
recipes-qt/qt5/qtlocation_git.bbappend
recipes-qt/qt5/qtmultimedia_git.bbappend
recipes-qt/qt5/qtquickcompiler_git.bb
recipes-qt/qt5/qtquickcontrols2_git.bbappend
recipes-qt/qt5/qtquickcontrols_git.bbappend
recipes-qt/qt5/qtsvg_git.bbappend
recipes-qt/qt5/qttools_git.bbappend
recipes-qt/qt5/qtwayland-native_git.bbappend
recipes-qt/qt5/qtwayland_git.bbappend
recipes-qt/qt5/qtwebengine_git.bbappend
recipes-qt/qt5/qtxmlpatterns_git.bbappend
Change-Id: Ia73290b54a213a9670baab11e14522956e7bfec0
Diffstat (limited to 'recipes-qt')
| -rw-r--r-- | recipes-qt/automotive/neptune-ui/neptune.service | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/recipes-qt/automotive/neptune-ui/neptune.service b/recipes-qt/automotive/neptune-ui/neptune.service index 32e3243..e9f3793 100644 --- a/recipes-qt/automotive/neptune-ui/neptune.service +++ b/recipes-qt/automotive/neptune-ui/neptune.service | |||
| @@ -1,9 +1,9 @@ | |||
| 1 | [Unit] | 1 | [Unit] |
| 2 | Description=Neptune | 2 | Description=Neptune |
| 3 | After=systemd-user-sessions.service | 3 | After=dbus.service dbus-session.service systemd-user-sessions.service |
| 4 | 4 | ||
| 5 | [Service] | 5 | [Service] |
| 6 | ExecStart=/usr/bin/appcontroller /usr/bin/appman -r -c /opt/am/config.yaml -c am-config.yaml --dbus none Main.qml | 6 | ExecStart=/usr/bin/appcontroller /usr/bin/appman -r -c /opt/am/config.yaml --dbus session -c am-config.yaml Main.qml |
| 7 | Restart=on-failure | 7 | Restart=on-failure |
| 8 | WorkingDirectory=/opt/neptune | 8 | WorkingDirectory=/opt/neptune |
| 9 | 9 | ||