[SCM] ktp-accounts-kcm packaging branch, master, updated. debian/15.12.1-1-1157-gc4589c5

[Maximiliano Curia]

Gitweb-URL: http://git.debian.org/?p=pkg-kde/applications/ktp-accounts-kcm.git;a=commitdiff;h=6fc0aa5

The following commit has been merged in the master branch:
commit 6fc0aa56432c19f41544d715fc303331b6d57d4a
Author: Martin Klapetek <mklapetek at kde.org>
Date:   Mon Jul 20 16:48:43 2015 +0200

    Port and enable the morse plugin
---
 plugins/CMakeLists.txt                    |  6 +++---
 plugins/morse/CMakeLists.txt              | 12 +++++++-----
 plugins/morse/Messages.sh                 |  2 +-
 plugins/morse/main-options-widget.ui      | 12 +-----------
 plugins/morse/morse-account-ui-plugin.cpp |  1 -
 5 files changed, 12 insertions(+), 21 deletions(-)

diff --git a/plugins/CMakeLists.txt b/plugins/CMakeLists.txt
index ecf610b..140c829 100644
--- a/plugins/CMakeLists.txt
+++ b/plugins/CMakeLists.txt
@@ -6,6 +6,6 @@ add_subdirectory (idle)
 # macro_optional_add_subdirectory (salut)
 # macro_optional_add_subdirectory (sunshine)
 # macro_optional_add_subdirectory (pintxo)
-# macro_optional_add_subdirectory (morse)
-add_subdirectory(sipe)
-add_subdirectory(kaccounts)
+add_subdirectory (morse)
+add_subdirectory (sipe)
+add_subdirectory (kaccounts)
diff --git a/plugins/morse/CMakeLists.txt b/plugins/morse/CMakeLists.txt
index cadf17b..d2cbb2b 100644
--- a/plugins/morse/CMakeLists.txt
+++ b/plugins/morse/CMakeLists.txt
@@ -4,25 +4,27 @@ include_directories (${CMAKE_CURRENT_BINARY_DIR}
                      ${CMAKE_CURRENT_SOURCE_DIR}
 )
 
+add_definitions(-DTRANSLATION_DOMAIN=\"kcmtelepathyaccounts_plugin_morse\")
+
 set (ktpaccountskcm_plugin_morse_SRCS
      morse-account-ui-plugin.cpp
      telegram-account-ui.cpp
      main-options-widget.cpp
 )
 
-kde4_add_ui_files (ktpaccountskcm_plugin_morse_SRCS
+qt5_wrap_ui (ktpaccountskcm_plugin_morse_SRCS
                    main-options-widget.ui
 )
 
-kde4_add_plugin (ktpaccountskcm_plugin_morse
+add_library (ktpaccountskcm_plugin_morse MODULE
                  ${ktpaccountskcm_plugin_morse_SRCS}
 )
 
 target_link_libraries (ktpaccountskcm_plugin_morse
                        ktpaccountskcminternal
-                       ${QT_LIBRARIES}
-                       ${KDE4_KDEUI_LIBS}
-                       ${TELEPATHY_QT4_LIBRARIES}
+                       Qt5::Core
+                       Qt5::Widgets
+                       ${TELEPATHY_QT5_LIBRARIES}
 )
 
 # Install:
diff --git a/plugins/morse/Messages.sh b/plugins/morse/Messages.sh
index 753cac9..b3be4b7 100755
--- a/plugins/morse/Messages.sh
+++ b/plugins/morse/Messages.sh
@@ -1,4 +1,4 @@
 #! /usr/bin/env bash
 $EXTRACTRC `find . -name "*.ui"` >> rc.cpp || exit 11
-$XGETTEXT `find . -name "*.cpp"` -o $podir/kcmtelepathyaccounts_plugin_butterfly.pot
+$XGETTEXT `find . -name "*.cpp"` -o $podir/kcmtelepathyaccounts_plugin_morse.pot
 rm -f rc.cpp
diff --git a/plugins/morse/main-options-widget.ui b/plugins/morse/main-options-widget.ui
index 497f88b..2eb43ac 100644
--- a/plugins/morse/main-options-widget.ui
+++ b/plugins/morse/main-options-widget.ui
@@ -34,10 +34,7 @@
     </widget>
    </item>
    <item row="2" column="1">
-    <widget class="KLineEdit" name="accountLineEdit">
-     <property name="showClearButton" stdset="0">
-      <bool>false</bool>
-     </property>
+    <widget class="QLineEdit" name="accountLineEdit">
     </widget>
    </item>
    <item row="2" column="0">
@@ -52,13 +49,6 @@
    </item>
   </layout>
  </widget>
- <customwidgets>
-  <customwidget>
-   <class>KLineEdit</class>
-   <extends>QLineEdit</extends>
-   <header>klineedit.h</header>
-  </customwidget>
- </customwidgets>
  <resources/>
  <connections/>
 </ui>
diff --git a/plugins/morse/morse-account-ui-plugin.cpp b/plugins/morse/morse-account-ui-plugin.cpp
index 1adc823..9dbce02 100644
--- a/plugins/morse/morse-account-ui-plugin.cpp
+++ b/plugins/morse/morse-account-ui-plugin.cpp
@@ -50,6 +50,5 @@ AbstractAccountUi* MorseAccountUiPlugin::accountUi(const QString &connectionMana
 }
 
 K_PLUGIN_FACTORY(factory, registerPlugin<MorseAccountUiPlugin>();)
-K_EXPORT_PLUGIN(factory("kcmtelepathyaccounts_plugin_morse"))
 
 #include "morse-account-ui-plugin.moc"

-- 
ktp-accounts-kcm packaging