Merge pull request nemomobile#9 from lpotter/master

Relocate UserAgent class to libconnman-qt
martyone · Dec 20, 2012 · 8e08ecc · 8e08ecc
2 parents 1a1b7b3 + 6c95550
commit 8e08ecc
Show file tree

Hide file tree

Showing 4 changed files with 6 additions and 4 deletions.
diff --git a/libconnman-qt/libconnman-qt.pro b/libconnman-qt/libconnman-qt.pro
@@ -26,7 +26,8 @@ HEADERS += manager.h \
     commondbustypes.h \
     clockproxy.h \
     clockmodel.h \
-    debug.h
+    debug.h \
+    useragent.h
 
 SOURCES += \
     networkmanager.cpp \
@@ -38,7 +39,8 @@ SOURCES += \
     clockproxy.cpp \
     clockmodel.cpp \
     commondbustypes.cpp \
-    debug.cpp
+    debug.cpp \
+    useragent.cpp
 
 target.path = $$INSTALL_ROOT$$PREFIX/lib
 

diff --git a/plugin/useragent.cpp → libconnman-qt/useragent.cpp b/plugin/useragent.cpp → libconnman-qt/useragent.cpp
diff --git a/plugin/useragent.h → libconnman-qt/useragent.h b/plugin/useragent.h → libconnman-qt/useragent.h
diff --git a/plugin/plugin.pro b/plugin/plugin.pro
@@ -2,8 +2,8 @@ TARGET=ConnmanQtDeclarative
 TEMPLATE = lib
 QT += declarative dbus
 CONFIG += plugin
-SOURCES = components.cpp networkingmodel.cpp technologymodel.cpp useragent.cpp
-HEADERS = components.h networkingmodel.h technologymodel.h useragent.h
+SOURCES = components.cpp networkingmodel.cpp technologymodel.cpp 
+HEADERS = components.h networkingmodel.h technologymodel.h 
 
 INCLUDEPATH += ../libconnman-qt
 LIBS += -L../libconnman-qt -lconnman-qt4