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

Sat May 28 00:06:29 UTC 2016

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

The following commit has been merged in the master branch:
commit a70dfda2d1f028c7af643c1d540f4264376a5c36
Author: Martin Klapetek <mklapetek at kde.org>
Date:   Mon Mar 16 16:41:14 2015 +0100

    [gabble] Replace KTextEdit with QTextEdit
    
    It's not really required and we can spare a dependency on
    KF5::TextWidgets
---
 plugins/gabble/proxy-settings-widget.ui | 7 +------
 1 file changed, 1 insertion(+), 6 deletions(-)

diff --git a/plugins/gabble/proxy-settings-widget.ui b/plugins/gabble/proxy-settings-widget.ui
index 5e78a72..d9b4a2d 100644
--- a/plugins/gabble/proxy-settings-widget.ui
+++ b/plugins/gabble/proxy-settings-widget.ui
@@ -121,7 +121,7 @@
        </widget>
       </item>
       <item>
-       <widget class="KTextEdit" name="fallbackSocks5ProxiesTextEdit">
+       <widget class="QTextEdit" name="fallbackSocks5ProxiesTextEdit">
         <property name="html">
          <string><!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0//EN" "http://www.w3.org/TR/REC-html40/strict.dtd">
 <html><head><meta name="qrichtext" content="1" /><style type="text/css">
@@ -163,11 +163,6 @@ p, li { white-space: pre-wrap; }
   </layout>
  </widget>
  <customwidgets>
-  <customwidget>
-   <class>KTextEdit</class>
-   <extends>QTextEdit</extends>
-   <header>ktextedit.h</header>
-  </customwidget>
  </customwidgets>
  <tabstops>
   <tabstop>stunServerLineEdit</tabstop>

-- 
ktp-accounts-kcm packaging

