Commit 31db9843 authored by Laurent Montel's avatar Laurent Montel 😁

Make it compile against qt5.13

parent f03bf406
......@@ -17,6 +17,7 @@
#include "configurepluginslistwidgettest.h"
#include "../configurepluginslistwidget.h"
#include "kdepimtest_layout.h"
#include <QTest>
#include <QTreeWidget>
#include <QVBoxLayout>
......@@ -36,7 +37,7 @@ void ConfigurePluginsListWidgetTest::shouldHaveDefaultValue()
QVBoxLayout *mainLayout = w.findChild<QVBoxLayout *>(QStringLiteral("mainlayout"));
QVERIFY(mainLayout);
QCOMPARE(mainLayout->margin(), 0);
KdepimTestLayout::checkContentsMargins(0, mainLayout);
QTreeWidget *mListWidget = w.findChild<QTreeWidget *>(QStringLiteral("listwidget"));
QVERIFY(mListWidget);
......
/*
Copyright (C) 2019 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 as published by the Free Software Foundation; either
version 2 of the License, or (at your option) any later version.
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; see the file COPYING. If not, write to
the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
Boston, MA 02110-1301, USA.
*/
#ifndef KDEPIMTEST_LAYOUT_H
#define KDEPIMTEST_LAYOUT_H
#include <QTest>
#include <QLayout>
namespace KdepimTestLayout
{
void checkContentsMargins(int margin, QLayout *layout)
{
int top = -1;
int bottom = -1;
int left = -1;
int right = -1;
layout->getContentsMargins(&left, &top, &right, &bottom);
QCOMPARE(top, margin);
QCOMPARE(left, margin);
QCOMPARE(bottom, margin);
QCOMPARE(right, margin);
}
}
#endif
/*
Copyright (C) 2019 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 as published by the Free Software Foundation; either
version 2 of the License, or (at your option) any later version.
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; see the file COPYING. If not, write to
the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
Boston, MA 02110-1301, USA.
*/
#ifndef KDEPIMTEST_LAYOUT_H
#define KDEPIMTEST_LAYOUT_H
#include <QTest>
#include <QLayout>
namespace KdepimTestLayout
{
void checkContentsMargins(int margin, QLayout *layout)
{
int top = -1;
int bottom = -1;
int left = -1;
int right = -1;
layout->getContentsMargins(&left, &top, &right, &bottom);
QCOMPARE(top, margin);
QCOMPARE(left, margin);
QCOMPARE(bottom, margin);
QCOMPARE(right, margin);
}
}
#endif
......@@ -17,6 +17,7 @@
#include "logactivitieswidgettest.h"
#include "../logactivitieswidget.h"
#include "kdepimtest_layout.h"
#include <KPIMTextEdit/PlainTextEditorWidget>
#include <QTest>
#include <QVBoxLayout>
......@@ -35,7 +36,7 @@ void LogActivitiesWidgetTest::shouldHaveDefaultValue()
PimCommon::LogActivitiesWidget w;
QVBoxLayout *mainLayout = w.findChild<QVBoxLayout *>(QStringLiteral("mainLayout"));
QVERIFY(mainLayout);
QCOMPARE(mainLayout->margin(), 0);
KdepimTestLayout::checkContentsMargins(0, mainLayout);
KPIMTextEdit::PlainTextEditorWidget *mLog = w.findChild<KPIMTextEdit::PlainTextEditorWidget *>(QStringLiteral("log"));
QVERIFY(mLog);
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment