Skip to content

Commit

Permalink
Browse files Browse the repository at this point in the history
Merge pull request #91 from stskeeps/master
[connectionagent] Boost connectionagent
  • Loading branch information
monich committed Oct 27, 2014
2 parents 9b1817f + c93c67a commit 6fa4a55
Show file tree
Hide file tree
Showing 4 changed files with 12 additions and 4 deletions.
6 changes: 3 additions & 3 deletions config/connectionagent.service
@@ -1,11 +1,11 @@
[Unit]
Description=Connection Agent
Requires=dbus.service
After=pre-user-session.target
Requires=dbus.service booster-qt5.service
After=pre-user-session.target booster-qt5.service

[Service]
EnvironmentFile=-/etc/tracing/connectionagent/connectionagent.tracing
ExecStart=/usr/bin/connectionagent $TRACING
ExecStart=/usr/bin/invoker -o --type=qt5 /usr/bin/connectionagent $TRACING
Type=dbus
BusName=com.jolla.Connectiond
Restart=always
Expand Down
7 changes: 7 additions & 0 deletions connd/connd.pro
Expand Up @@ -4,6 +4,13 @@ QT = core network dbus
TARGET = connectionagent
PKGCONFIG += connman-qt5 qofono-qt5

packagesExist(qt5-boostable) {
DEFINES += HAS_BOOSTER
PKGCONFIG += qt5-boostable
} else {
warning("qt5-boostable not available; startup times will be slower")
}

CONFIG += console link_pkgconfig
CONFIG -= app_bundle

Expand Down
2 changes: 1 addition & 1 deletion connd/main.cpp
Expand Up @@ -87,7 +87,7 @@ void messageOutput(QtMsgType type, const QMessageLogContext &context, const QStr
previousMessageHandler(type,context,str);
}

int main(int argc, char *argv[])
Q_DECL_EXPORT int main(int argc, char *argv[])
{
previousMessageHandler = qInstallMessageHandler(messageOutput);

Expand Down
1 change: 1 addition & 0 deletions rpm/connectionagent-qt5.spec
Expand Up @@ -22,6 +22,7 @@ BuildRequires: pkgconfig(qofono-qt5)
BuildRequires: pkgconfig(Qt5Network)
BuildRequires: pkgconfig(Qt5Test)
BuildRequires: pkgconfig(Qt5Qml)
BuildRequires: pkgconfig(qt5-boostable)
Provides: connectionagent > 0.10.1
Obsoletes: connectionagent <= 0.7.6

Expand Down

0 comments on commit 6fa4a55

Please sign in to comment.