summaryrefslogtreecommitdiff
Side-by-side diff
Diffstat (more/less context) (ignore whitespace changes)
-rw-r--r--noncore/net/opietooth/lib/devicehandler.cpp (renamed from noncore/net/opietooth/manager/devicehandler.cpp)0
-rw-r--r--noncore/net/opietooth/lib/devicehandler.h (renamed from noncore/net/opietooth/manager/devicehandler.h)0
-rw-r--r--noncore/net/opietooth/lib/lib.pro4
-rw-r--r--noncore/net/opietooth/manager/manager.pro4
4 files changed, 4 insertions, 4 deletions
diff --git a/noncore/net/opietooth/manager/devicehandler.cpp b/noncore/net/opietooth/lib/devicehandler.cpp
index 320ad44..320ad44 100644
--- a/noncore/net/opietooth/manager/devicehandler.cpp
+++ b/noncore/net/opietooth/lib/devicehandler.cpp
diff --git a/noncore/net/opietooth/manager/devicehandler.h b/noncore/net/opietooth/lib/devicehandler.h
index 5cfe048..5cfe048 100644
--- a/noncore/net/opietooth/manager/devicehandler.h
+++ b/noncore/net/opietooth/lib/devicehandler.h
diff --git a/noncore/net/opietooth/lib/lib.pro b/noncore/net/opietooth/lib/lib.pro
index e11af9a..08d79ea 100644
--- a/noncore/net/opietooth/lib/lib.pro
+++ b/noncore/net/opietooth/lib/lib.pro
@@ -1,15 +1,15 @@
TEMPLATE = lib
CONFIG += qte warn_on
HEADERS = connection.h parser.h device.h manager.h remotedevice.h services.h \
startpanconnection.h startdunconnection.h obexpush.h \
- bt-serial.h forwarder.h
+ bt-serial.h forwarder.h devicehandler.h
SOURCES = connection.cpp parser.cc device.cc manager.cc remotedevice.cc services.cc \
startpanconnection.cpp startdunconnection.cpp obexpush.cpp \
- bt-serial.c forwarder.cc
+ bt-serial.c forwarder.cc devicehandler.cpp
TARGET = opietooth1
INCLUDEPATH += $(OPIEDIR)/include .
DESTDIR = $(OPIEDIR)/lib
LIBS += -lopiecore2
include( $(OPIEDIR)/include.pro )
diff --git a/noncore/net/opietooth/manager/manager.pro b/noncore/net/opietooth/manager/manager.pro
index dc048c4..567932e 100644
--- a/noncore/net/opietooth/manager/manager.pro
+++ b/noncore/net/opietooth/manager/manager.pro
@@ -1,45 +1,45 @@
CONFIG = qt warn_on quick-app
HEADERS = btconnectionitem.h btdeviceitem.h \
btserviceitem.h stdpopups.h \
popuphelper.h bluebase.h \
scandialog.h btlistitem.h filistitem.h \
hciconfwrapper.h bticonloader.h \
pppdialog.h dundialog.h pandialog.h \
obexdialog.h obexftpdialog.h \
rfcommassigndialogimpl.h rfcommassigndialogitem.h \
- devicehandler.h rfcpopup.h obexpopup.h obexftpopup.h \
+ rfcpopup.h obexpopup.h obexftpopup.h \
rfcommhelper.h panpopup.h dunpopup.h rfcommconfhandler.h \
servicesdialog.h btconfhandler.h hidpopup.h
SOURCES = btconnectionitem.cpp btdeviceitem.cpp \
btserviceitem.cpp filelistitem.cpp stdpopups.cpp \
popuphelper.cpp main.cpp \
bluebase.cpp scandialog.cpp \
btlistitem.cpp hciconfwrapper.cpp \
bticonloader.cpp pppdialog.cpp dundialog.cpp pandialog.cpp \
rfcommassigndialogimpl.cpp rfcommassigndialogitem.cpp \
- obexdialog.cpp devicehandler.cpp \
+ obexdialog.cpp \
rfcpopup.cpp obexpopup.cpp obexftpopup.cpp obexftpdialog.cpp \
rfcommhelper.cpp panpopup.cpp dunpopup.cpp rfcommconfhandler.cpp \
servicesdialog.cpp btconfhandler.cpp hidpopup.cpp
INCLUDEPATH += $(OPIEDIR)/include
INCLUDEPATH += $(OPIEDIR)/noncore/net/opietooth/lib
DEPENDPATH += $(OPIEDIR)/include
LIBS += -lqpe -lbluetooth -lopietooth1 -lopiecore2 -lopieui2 -lopenobex
INTERFACES = bluetoothbase.ui devicedialog.ui rfcommassigndialogbase.ui \
rfcommdialogitembase.ui obexftpdialogbase.ui \
servicesdialogbase.ui
TARGET = bluetooth-manager
include( $(OPIEDIR)/include.pro )
!isEmpty( LIBOBEXFTP_INC_DIR ) {
INCLUDEPATH += $$LIBOBEXFTP_INC_DIR
}
!isEmpty( LIBOBEXFTP_LIB_DIR ) {
LIBS += $$LIBOBEXFTP_LIB_DIR/libobexftp.a
LIBS += $$LIBOBEXFTP_LIB_DIR/libmulticobex.a
LIBS += $$LIBOBEXFTP_LIB_DIR/libbfb.a
}