[SCM] ktp-text-ui packaging branch, master, updated. debian/15.12.1-1-1918-gdf4b0ec

[Maximiliano Curia]

Gitweb-URL: http://git.debian.org/?p=pkg-kde/applications/ktp-text-ui.git;a=commitdiff;h=d4a64d5

The following commit has been merged in the master branch:
commit d4a64d5855e16d0d44e02c40b68949aab8762f6b
Author: Aleix Pol <aleixpol at kde.org>
Date:   Fri Oct 24 18:13:22 2014 +0200

    Make ktp-text-ui with Qt5+KF5
---
 CMakeLists.txt                                     | 51 ++++++++++------------
 adiumxtra-protocol-handler/CMakeLists.txt          | 10 ++---
 .../adiumxtra-protocol-handler.cpp                 | 10 ++---
 .../chat-style-installer.cpp                       |  9 ++--
 .../emoticon-set-installer.cpp                     | 11 ++---
 adiumxtra-protocol-handler/main.cpp                | 10 ++---
 app/CMakeLists.txt                                 | 37 +++++++---------
 app/chat-tab.h                                     |  2 +-
 app/chat-window.cpp                                |  5 ++-
 app/emoticon-text-edit-action.cpp                  |  2 +-
 app/emoticon-text-edit-selector.cpp                |  2 +-
 app/main.cpp                                       | 12 ++---
 app/telepathy-chat-ui.cpp                          |  4 +-
 app/telepathy-chat-ui.h                            |  2 +-
 cmake/modules/COPYING-CMAKE-SCRIPTS                | 22 ----------
 cmake/modules/FindKTp.cmake                        | 42 ------------------
 cmake/modules/FindQJSON.cmake                      | 48 --------------------
 config/CMakeLists.txt                              | 44 ++++++++-----------
 config/appearance-config-tab.cpp                   |  3 ++
 config/appearance-config.cpp                       |  7 ++-
 config/behavior-config.cpp                         |  5 ++-
 config/messages-config.cpp                         |  8 +++-
 config/otr-config.cpp                              |  4 +-
 filters/CMakeLists.txt                             | 13 +++---
 filters/bugzilla/CMakeLists.txt                    | 15 ++-----
 filters/bugzilla/bugzilla-filter.cpp               |  2 +
 filters/emoticons/CMakeLists.txt                   | 18 ++------
 filters/emoticons/emoticon-filter.cpp              |  2 +-
 filters/formatting/CMakeLists.txt                  | 18 ++------
 filters/formatting/format-filter.cpp               |  3 +-
 filters/highlight/CMakeLists.txt                   | 14 ++----
 filters/highlight/highlight-filter.cpp             |  2 +
 filters/images/CMakeLists.txt                      | 19 +++-----
 filters/images/images-filter.cpp                   |  4 +-
 filters/latex/CMakeLists.txt                       | 29 ++++--------
 filters/latex/latex-config.cpp                     |  4 +-
 filters/latex/latex-filter.cpp                     |  2 +
 filters/otr/CMakeLists.txt                         | 16 +++----
 filters/otr/otr-filter.cpp                         |  5 ++-
 filters/searchexpansion/CMakeLists.txt             | 17 ++------
 filters/searchexpansion/searchexpansion-filter.cpp |  2 +
 filters/texttospeech/CMakeLists.txt                | 18 ++------
 filters/urlexpansion/CMakeLists.txt                | 20 ++-------
 filters/urlexpansion/urlexpansion-filter.cpp       | 11 +++--
 filters/youtube/CMakeLists.txt                     | 14 ++----
 filters/youtube/youtube-filter.cpp                 |  2 +
 image-sharer/CMakeLists.txt                        | 26 +++++------
 image-sharer/imgursharer.cpp                       | 23 +++++-----
 lib/CMakeLists.txt                                 | 25 ++++++-----
 lib/adium-theme-view.cpp                           | 16 +++----
 lib/chat-search-bar.cpp                            |  3 +-
 lib/chat-search-bar.h                              |  4 +-
 lib/chat-text-edit.cpp                             |  7 +--
 lib/chat-text-edit.h                               |  3 +-
 lib/chat-widget.cpp                                | 14 +++---
 lib/chat-widget.h                                  |  4 +-
 lib/chat-window-style.cpp                          |  1 +
 lib/chat-window-style.h                            |  1 +
 lib/contact-delegate.cpp                           |  6 +--
 lib/notify-filter.cpp                              |  8 ++--
 lib/otr-notifications.cpp                          |  4 +-
 lib/proxy-service.cpp                              |  1 +
 lib/text-chat-config.cpp                           |  2 +
 lib/text-chat-config.h                             |  1 +
 logviewer/CMakeLists.txt                           | 20 ++++-----
 logviewer/config/CMakeLists.txt                    |  8 ++--
 logviewer/config/behavior-config.cpp               |  5 +--
 logviewer/dates-view-delegate.cpp                  |  4 +-
 logviewer/dates-view-delegate.h                    |  2 +-
 logviewer/entity-view-delegate.cpp                 |  5 ++-
 logviewer/entity-view-delegate.h                   |  2 +-
 logviewer/log-viewer.cpp                           |  6 ++-
 logviewer/logs-import-dialog.cpp                   |  5 ++-
 logviewer/main.cpp                                 | 10 ++---
 logviewer/message-view.cpp                         |  2 +
 logviewer/person-entity-merge-model.cpp            |  2 +
 76 files changed, 314 insertions(+), 506 deletions(-)

The diff has been stripped from this email because it exceeds 50KB


-- 
ktp-text-ui packaging