Skip to content

Commit

Permalink
Browse files Browse the repository at this point in the history
Merge pull request #6 from pvuorela/invoker
[maliit-framework] Use invoker to launch
  • Loading branch information
pvuorela committed Oct 29, 2014
2 parents f5ae1de + 14e8dd0 commit 7a27ed6
Show file tree
Hide file tree
Showing 5 changed files with 14 additions and 4 deletions.
2 changes: 1 addition & 1 deletion maliit-framework/connection/org.maliit.server.service.in
@@ -1,5 +1,5 @@
[D-BUS Service]
Name=org.maliit.server
Exec=@BINDIR@/maliit-server @MALIIT_SERVER_ARGUMENTS@
Exec=/usr/bin/invoker --type=qt5 @BINDIR@/maliit-server @MALIIT_SERVER_ARGUMENTS@
SystemdService=maliit-server.service

2 changes: 1 addition & 1 deletion maliit-framework/passthroughserver/main.cpp
Expand Up @@ -120,7 +120,7 @@ QSharedPointer<Maliit::AbstractPlatform> createPlatform()

} // unnamed namespace

int main(int argc, char **argv)
Q_DECL_EXPORT int main(int argc, char **argv)
{
qInstallMessageHandler(outputMessagesToStdErr);

Expand Down
9 changes: 9 additions & 0 deletions maliit-framework/passthroughserver/passthroughserver.pro
Expand Up @@ -23,6 +23,15 @@ for(OPTION,$$list($$lower($$COV_OPTION))){
}
}

packagesExist(qt5-boostable) {
message("Building with qt5-boostable support")
CONFIG += link_pkgconfig
PKGCONFIG += qt5-boostable
} else {
warning("qt5-boostable not available")
}


lipstick:DEFINES+=HAVE_LIPSTICK

QMAKE_CLEAN += *.gcno *.gcda
Expand Down
4 changes: 2 additions & 2 deletions maliit-server.service-wayland
@@ -1,10 +1,10 @@
[Unit]
Description=The Maliit server
After=lipstick.service pre-user-session.target
After=lipstick.service pre-user-session.target booster-qt5.service
Requires=dbus.socket pre-user-session.target

[Service]
ExecStart=/usr/bin/maliit-server
ExecStart=/usr/bin/invoker --type=qt5 /usr/bin/maliit-server
Type=dbus
BusName=org.maliit.server

Expand Down
1 change: 1 addition & 0 deletions rpm/maliit-framework-wayland.spec
Expand Up @@ -19,6 +19,7 @@ BuildRequires: pkgconfig(Qt5Quick)
BuildRequires: pkgconfig(Qt5Test)
BuildRequires: pkgconfig(libudev)
BuildRequires: fdupes
Requires: mapplauncherd-qt5
Provides: maliit-framework
Conflicts: maliit-framework-x11
Obsoletes: libmaliit-quick
Expand Down

0 comments on commit 7a27ed6

Please sign in to comment.