diff options
| author | Andre Moreira Magalhaes (andrunko) <andre.magalhaes@collabora.co.uk> | 2012-02-29 17:57:17 -0300 |
|---|---|---|
| committer | Andre Moreira Magalhaes (andrunko) <andre.magalhaes@collabora.co.uk> | 2012-04-02 10:26:30 -0300 |
| commit | 2defc720c08392d38ed58556d87d5b1ea20c3340 (patch) | |
| tree | 657984a5752917e01a57f583b7f29f025be05d25 /examples | |
| parent | ab36ec6f15e8ab2af32be862bcc6a13d4bffaf88 (diff) | |
Remove separation from client and service side high-level APIs.
To be more consitent with how client side is implemented, the service side high-level
classes are now moved to the TelepathyQt dir, removing the separate Service dir.
Library specific globals (TP_QT_EXPORT, etc) are now shared between tp-qt-service and tp-qt.
The plan is to merge both libraries into tp-qt in the future, when the service side bindings
are API/ABI stable.
Diffstat (limited to 'examples')
| -rw-r--r-- | examples/cm/CMakeLists.txt | 22 | ||||
| -rw-r--r-- | examples/cm/main.cpp | 3 |
2 files changed, 13 insertions, 12 deletions
diff --git a/examples/cm/CMakeLists.txt b/examples/cm/CMakeLists.txt index bacd9179..13203e6f 100644 --- a/examples/cm/CMakeLists.txt +++ b/examples/cm/CMakeLists.txt @@ -1,11 +1,13 @@ -set(cm_SRCS - main.cpp) +if(ENABLE_EXPERIMENTAL_SERVICE_SUPPORT) + set(cm_SRCS + main.cpp) -add_executable(cm ${cm_SRCS}) -target_link_libraries(cm - ${QT_QTCORE_LIBRARY} - ${QT_QTDBUS_LIBRARY} - ${QT_QTNETWORK_LIBRARY} - ${QT_QTXML_LIBRARY} - telepathy-qt${QT_VERSION_MAJOR} - telepathy-qt${QT_VERSION_MAJOR}-service) + add_executable(cm ${cm_SRCS}) + target_link_libraries(cm + ${QT_QTCORE_LIBRARY} + ${QT_QTDBUS_LIBRARY} + ${QT_QTNETWORK_LIBRARY} + ${QT_QTXML_LIBRARY} + telepathy-qt${QT_VERSION_MAJOR} + telepathy-qt${QT_VERSION_MAJOR}-service) +endif(ENABLE_EXPERIMENTAL_SERVICE_SUPPORT) diff --git a/examples/cm/main.cpp b/examples/cm/main.cpp index 5a0f723b..de0d09e0 100644 --- a/examples/cm/main.cpp +++ b/examples/cm/main.cpp @@ -2,13 +2,12 @@ #include <TelepathyQt/Debug> #include <TelepathyQt/Types> -#include <TelepathyQt/Service/BaseConnectionManager> +#include <TelepathyQt/BaseConnectionManager> #include <QDebug> #include <QtCore> using namespace Tp; -using namespace Tp::Service; int main(int argc, char **argv) { |