Merge remote-tracking branch 'origin/KDE/4.14'

Conflicts:
	kmail/mailmerge/tests/CMakeLists.txt
	kmail/mailmerge/widgets/selectattachmentdialog.cpp
	kontact/plugins/korganizer/CMakeLists.txt
	korganizer/CMakeLists.txt
	libkdepimdbusinterfaces/CMakeLists.txt
	mailcommon/CMakeLists.txt
	mobile/calendar/CMakeLists.txt
	pimcommon/shorturl/engine/googleshorturl.cpp
	pimcommon/shorturl/engine/migremeshorturl.cpp
	pimcommon/shorturl/engine/tinyurlshorturl.cpp
	pimcommon/shorturl/engine/triopabshorturl.cpp
	plugins/messageviewer/bodypartformatter/CMakeLists.txt

mailmerge/autotests/selectattachmentdialogtest.cpp

@@ -0,0 +1,44 @@
+/*
+  Copyright (c) 2015 Montel Laurent <montel@kde.org>
+
+  This program is free software; you can redistribute it and/or modify it
+  under the terms of the GNU General Public License, version 2, as
+  published by the Free Software Foundation.
+
+  This program is distributed in the hope that it will be useful, but
+  WITHOUT ANY WARRANTY; without even the implied warranty of
+  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+  General Public License for more details.
+
+  You should have received a copy of the GNU General Public License along
+  with this program; if not, write to the Free Software Foundation, Inc.,
+  51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
+*/
+
+
+#include "selectattachmentdialogtest.h"
+#include "../widgets/selectattachmentdialog.h"
+#include <KUrlRequester>
+#include <QLabel>
+#include <qtest_kde.h>
+SelectAttachmentDialogTest::SelectAttachmentDialogTest(QObject *parent)
+    : QObject(parent)
+{
+
+}
+
+SelectAttachmentDialogTest::~SelectAttachmentDialogTest()
+{
+
+}
+
+void SelectAttachmentDialogTest::shouldHaveDefaultValue()
+{
+    MailMerge::SelectAttachmentDialog dlg;
+    QLabel *lab = qFindChild<QLabel *>(&dlg, QLatin1String("selectattachment_label"));
+    QVERIFY(lab);
+    KUrlRequester *urlRequester = qFindChild<KUrlRequester *>(&dlg, QLatin1String("urlrequester"));
+    QVERIFY(urlRequester);
+}
+
+QTEST_KDEMAIN(SelectAttachmentDialogTest, GUI)

mailmerge/autotests/selectattachmentdialogtest.h

@@ -0,0 +1,33 @@
+/*
+  Copyright (c) 2015 Montel Laurent <montel@kde.org>
+
+  This program is free software; you can redistribute it and/or modify it
+  under the terms of the GNU General Public License, version 2, as
+  published by the Free Software Foundation.
+
+  This program is distributed in the hope that it will be useful, but
+  WITHOUT ANY WARRANTY; without even the implied warranty of
+  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+  General Public License for more details.
+
+  You should have received a copy of the GNU General Public License along
+  with this program; if not, write to the Free Software Foundation, Inc.,
+  51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
+*/
+
+#ifndef SELECTATTACHMENTDIALOGTEST_H
+#define SELECTATTACHMENTDIALOGTEST_H
+
+#include <QObject>
+
+class SelectAttachmentDialogTest : public QObject
+{
+    Q_OBJECT
+public:
+    explicit SelectAttachmentDialogTest(QObject *parent = 0);
+    ~SelectAttachmentDialogTest();
+private Q_SLOTS:
+    void shouldHaveDefaultValue();
+};
+
+#endif // SELECTATTACHMENTDIALOGTEST_H

mailmerge/widgets/selectattachmentdialog.cpp

@@ -43,9 +43,11 @@ SelectAttachmentDialog::SelectAttachmentDialog(QWidget *parent)
     QVBoxLayout *vbox = new QVBoxLayout;
     w->setLayout(vbox);
     QLabel *lab = new QLabel(i18n("Select attachment:"));
+    lab->setObjectName(QLatin1String("selectattachment_label"));
     vbox->addWidget(lab);
     mUrlRequester = new KUrlRequester;
     mUrlRequester->setMode(KFile::LocalOnly | KFile::ExistingOnly);
+    mUrlRequester->setObjectName(QLatin1String("urlrequester"));
     vbox->addWidget(mUrlRequester);
     mainLayout->addWidget(w);
     mainLayout->addWidget(buttonBox);