Merge branch 'KDE/4.7' into ksecretsservice

data/services/plasma.protocol

@@ -49,6 +49,7 @@ Description[tr]=Plasma servisleri için bir protokol
 Description[ug]=پلازما(Plasma) مۇلازىمىتىنىڭ كېلىشىمى
 Description[uk]=Протокол для служб Плазми
 Description[x-test]=xxA protocol for Plasma servicesxx
+Description[zh_CN]=Plasma 服务协议
 Description[zh_TW]=Plasma 服務協定
 
 helper=true

dataengine.cpp

@@ -330,10 +330,10 @@ void DataEngine::removeAllSources()
     QMutableHashIterator<QString, Plasma::DataContainer*> it(d->sources);
     while (it.hasNext()) {
         it.next();
-        const QString source = it.key();
         Plasma::DataContainer *s = it.value();
         it.remove();
-        emit sourceRemoved(source);
+        emit sourceRemoved(it.key());
+        s->disconnect(this);
         delete s;
     }
 }

framesvg.cpp

@@ -321,7 +321,7 @@ void FrameSvg::resizeFrame(const QSizeF &size)
     }
 
     if (size.isEmpty()) {
-        kDebug() << "Invalid size" << size;
+        //kDebug() << "Invalid size" << size;
         return;
     }
 

private/style.cpp

@@ -314,6 +314,16 @@ QRect Style::subControlRect(ComplexControl control, const QStyleOptionComplex *o
     }
 }
 
+int Style::styleHint(StyleHint hint, const QStyleOption *option, const QWidget *widget, QStyleHintReturn *returnData) const
+{
+    switch (hint) {
+    case SH_RequestSoftwareInputPanel:
+        return RSIP_OnMouseClick;
+    default:
+        return QCommonStyle::styleHint(hint, option, widget, returnData);
+    }
+}
+
 int Style::pixelMetric(PixelMetric metric, const QStyleOption *option, const QWidget *widget) const
 {
     if (Theme::defaultTheme()->useNativeWidgetStyle()) {

private/style_p.h

@@ -45,6 +45,7 @@ public:
     ~Style();
 
     void drawPrimitive(PrimitiveElement element, const QStyleOption *option, QPainter *painter, const QWidget *widget = 0) const;
+    int styleHint(StyleHint hint, const QStyleOption *option=0, const QWidget *widget=0, QStyleHintReturn *returnData=0) const;
 
 protected:
     void drawComplexControl(ComplexControl control,

widgets/textedit.cpp

@@ -112,7 +112,6 @@ void TextEdit::setNativeWidget(KTextEdit *nativeWidget)
 
     nativeWidget->setAttribute(Qt::WA_NoSystemBackground);
     nativeWidget->setFrameShape(QFrame::NoFrame);
-    nativeWidget->setTextBackgroundColor(Qt::transparent);
     nativeWidget->viewport()->setAutoFillBackground(false);
     nativeWidget->verticalScrollBar()->setStyle(d->style.data());
     nativeWidget->horizontalScrollBar()->setStyle(d->style.data());