Skip to content

Commit

Permalink
Browse files Browse the repository at this point in the history
Merge pull request #58 from lpotter/next
update to connman 1.21
  • Loading branch information
lpotter committed Apr 11, 2014
2 parents f64b17a + 0220f41 commit 7026bd8
Show file tree
Hide file tree
Showing 8 changed files with 603 additions and 1,063 deletions.
8 changes: 4 additions & 4 deletions connd/connd.pro
@@ -1,10 +1,10 @@

QT = core network dbus gui
QT = core network dbus

TARGET = connectionagent
PKGCONFIG += connman-qt5 qofono-qt5

CONFIG += console link_pkgconfig
CONFIG += console link_pkgconfig
CONFIG -= app_bundle

TEMPLATE = app
Expand All @@ -20,11 +20,11 @@ connadaptor.source_flags = -c ConnAdaptor
#system(qdbusxml2cpp -c ConnAdaptor -a connadaptor.h:connadaptor.cpp com.jollamobile.Connectiond.xml)

SOURCES += main.cpp \
qconnectionmanager.cpp \
qconnectionagent.cpp \
wakeupwatcher.cpp

HEADERS+= \
qconnectionmanager.h \
qconnectionagent.h \
wakeupwatcher.h

target.path = /usr/bin
Expand Down
4 changes: 2 additions & 2 deletions connd/main.cpp
Expand Up @@ -24,7 +24,7 @@
#include <sys/types.h>
#include <sys/stat.h>

#include "qconnectionmanager.h"
#include "qconnectionagent.h"
#include "connectiond_adaptor.h"

static void signal_handler(int signum)
Expand Down Expand Up @@ -108,7 +108,7 @@ int main(int argc, char *argv[])
return 1;
}

QConnectionManager::instance();
QConnectionAgent::instance();

return a.exec();
}
Expand Down

0 comments on commit 7026bd8

Please sign in to comment.