← Back to branch summary

~phablet-team/telephony-service/trunk

~phablet-team/telephony-service/trunk

« back to all changes in this revision

Viewing changes to Ubuntu/Telephony/CMakeLists.txt

Committer: Tiago Salem Herrmann
Date: 2016-12-06 16:45:01 UTC
mfrom: (1212.1.6 fix-hardcoded-paths)
mto: This revision was merged to the branch mainline in revision 1222.
Revision ID: tiago.herrmann@canonical.com-20161206164501-rw041bjz35wq9t17

merge parent branch

files added:
handler/ChatStartingJob.xml

handler/MessageSendingJob.xml

handler/chatstartingjob.cpp

handler/chatstartingjob.h

handler/messagejob.cpp

handler/messagejob.h

handler/messagesendingjob.cpp

handler/messagesendingjob.h

libtelephonyservice/accountlist.cpp

libtelephonyservice/accountlist.h

libtelephonyservice/participant.cpp

libtelephonyservice/participant.h

libtelephonyservice/rolesinterface.cpp

libtelephonyservice/rolesinterface.h

protocols/README.protocols

tests/common/data

tests/common/data/dialer-app.png

files removed:
libtelephonyservice/multimediaaccountentry.cpp

libtelephonyservice/multimediaaccountentry.h

tests/libtelephonyservice/MultimediaAccountEntryTest.cpp

files renamed:
Ubuntu/Telephony/contactwatcher.cpp => libtelephonyservice/contactwatcher.cpp

Ubuntu/Telephony/contactwatcher.h => libtelephonyservice/contactwatcher.h

files modified:
.bzrignore

CMakeLists.txt

Ubuntu/Telephony/CMakeLists.txt

Ubuntu/Telephony/components.cpp

approver/TelephonyServiceApprover.client

approver/approver.cpp

approver/approverdbus.cpp

cmake/modules/GenerateTest.cmake

debian/changelog

debian/control

handler/CMakeLists.txt

handler/Handler.xml

handler/TelephonyServiceHandler.client

handler/handler.cpp

handler/handlerdbus.cpp

handler/handlerdbus.h

handler/main.cpp

handler/texthandler.cpp

handler/texthandler.h

indicator/TelephonyServiceIndicator.client

indicator/indicatordbus.cpp

indicator/messagingmenu.cpp

indicator/messagingmenu.h

indicator/textchannelobserver.cpp

indicator/textchannelobserver.h

libtelephonyservice/CMakeLists.txt

libtelephonyservice/accountentry.cpp

libtelephonyservice/accountentry.h

libtelephonyservice/accountentryfactory.cpp

libtelephonyservice/channelobserver.cpp

libtelephonyservice/chatentry.cpp

libtelephonyservice/chatentry.h

libtelephonyservice/chatmanager.cpp

libtelephonyservice/chatmanager.h

libtelephonyservice/dbustypes.h

libtelephonyservice/greetercontacts.cpp

libtelephonyservice/greetercontacts.h

libtelephonyservice/protocol.cpp

libtelephonyservice/protocol.h

libtelephonyservice/telepathyhelper.cpp

libtelephonyservice/telepathyhelper.h

po/am.po

po/ar.po

po/ast.po

po/az.po

po/be.po

po/br.po

po/bs.po

po/ca.po

po/ca@valencia.po

po/cs.po

po/cy.po

po/da.po

po/de.po

po/el.po

po/en_AU.po

po/en_GB.po

po/es.po

po/eu.po

po/fa.po

po/fi.po

po/fr.po

po/gd.po

po/gl.po

po/he.po

po/hr.po

po/hu.po

po/ia.po

po/id.po

po/is.po

po/it.po

po/ja.po

po/km.po

po/ko.po

po/lv.po

po/ms.po

po/my.po

po/nb.po

po/ne.po

po/nl.po

po/oc.po

po/pa.po

po/pl.po

po/pt.po

po/pt_BR.po

po/ro.po

po/ru.po

po/sk.po

po/sl.po

po/sq.po

po/sr.po

po/sv.po

po/ta.po

po/telephony-service.pot

po/th.po

po/tr.po

po/ug.po

po/uk.po

po/zh_CN.po

po/zh_HK.po

po/zh_TW.po

protocols/ofono.protocol

tests/common/mock/CMakeLists.txt

tests/common/mock/connection.cpp

tests/common/mock/mockconnectiondbus.cpp

tests/common/mock/textchannel.cpp

tests/common/mock/textchannel.h

tests/handler/HandlerTest.cpp

tests/handler/handlercontroller.cpp

tests/handler/handlercontroller.h

tests/libtelephonyservice/CMakeLists.txt

tests/libtelephonyservice/ChatEntryTest.cpp

tests/libtelephonyservice/ChatManagerTest.cpp

tests/libtelephonyservice/ProtocolTest.cpp

tests/libtelephonyservice/testProtocols/foo.protocol

Show diffs side-by-side

added added

removed removed

Ubuntu/Telephony/CMakeLists.txt

1

1

# QML plugin

2

2

3

3

set(plugin_SRCS

4

contactwatcher.cpp

5

4

presencerequest.cpp

6

5

components.cpp

7

6

)

Older »