[kde-doc-english] [skrooge/kf5] /: Merge branch 'master' of kde:skrooge into kf5

[Stephane Mankowski]

Git commit d6435927f318ffd3078ada6da75d587794aaebaf by Stephane Mankowski.
Committed on 05/04/2015 at 20:48.
Pushed by smankowski into branch 'kf5'.

Merge branch 'master' of kde:skrooge into kf5

Conflicts:
	CMakeLists.txt
	images/splash.png
	skgbankgui/skgquerycreator.cpp

M  +4    -1    CHANGELOG
M  +3    -2    doc/index.docbook
R  +1    -0    plugins/applet/account/org.kde.accountskroogoid.desktop
M  +1    -1    plugins/generic/skg_properties/skgpropertiesplugin.cpp
M  +25   -16   plugins/skrooge/skrooge_operation/skgoperationpluginwidget.cpp
M  +1    -1    skgbankgui/skgquerycreator.cpp
M  +1    -1    skgbankmodeler/skgdocumentbank.cpp
M  +1    -1    skgbasegui/skgcalculatoredit.cpp
M  +1    -1    skgbasemodeler/skgservices.cpp

http://commits.kde.org/skrooge/d6435927f318ffd3078ada6da75d587794aaebaf

diff --cc skgbankgui/skgquerycreator.cpp
index 2bb5cfd,cd2e11f..7e305b0
--- a/skgbankgui/skgquerycreator.cpp
+++ b/skgbankgui/skgquerycreator.cpp
@@@ -64,7 -64,7 +64,7 @@@ void SKGQueryCreator::setParameters(SKG
      // Build list of attributes
      if (m_document) {
          SKGQueryDelegate* delegate = new SKGQueryDelegate(ui.kList, m_document, m_updateMode, iListAttribute);
-         connect(delegate, &SKGQueryDelegate::closeEditor, this, &SKGQueryCreator::onCloseEditor);
 -        connect(delegate, SIGNAL(commitData(QWidget*)), this, SLOT(onCloseEditor()), Qt::QueuedConnection);
++        connect(delegate, &SKGQueryDelegate::commitData, this, &SKGQueryCreator::onCloseEditor, Qt::QueuedConnection);
  
          ui.kList->setItemDelegate(delegate);