Commit 3a240602 authored by Alexander Stippich's avatar Alexander Stippich
Browse files

bump Qt version to 5.11 and remove unrequired code

Summary:
Bump the minimum Qt version to 5.11.
With D21943, Elisa will effictively depend on 5.11 anyways.
Additionally, Qt 5.10 is now untested by CI.
Bumping also allows to remove a local copy of the
model tester and gives a nice cleanup.

Reviewers: ngraham, mgallien

Reviewed By: ngraham

Tags: #elisa

Differential Revision: https://phabricator.kde.org/D22741
parent 97fc2413
......@@ -7,7 +7,7 @@ project(elisa
set(CMAKE_CXX_STANDARD_REQUIRED ON)
set(CMAKE_CXX_STANDARD 17)
set(REQUIRED_QT_VERSION "5.10.0")
set(REQUIRED_QT_VERSION "5.11.0")
find_package(Qt5 ${REQUIRED_QT_VERSION} CONFIG REQUIRED Core Network Qml Quick Test Sql Multimedia Svg Gui Widgets QuickTest Concurrent QuickControls2)
find_package(Qt5Core ${REQUIRED_QT_VERSION} CONFIG REQUIRED Private)
......
This diff is collapsed.
......@@ -67,7 +67,6 @@ ecm_add_test(${manageaudioplayerTest_SOURCES}
target_include_directories(manageaudioplayerTest PRIVATE ${CMAKE_SOURCE_DIR}/src)
set(mediaplaylistTest_SOURCES
qabstractitemmodeltester.cpp
mediaplaylisttest.cpp
../src/elisautils.cpp
)
......@@ -96,7 +95,6 @@ ecm_add_test(${trackslistenertest_SOURCES}
target_include_directories(trackslistenertest PRIVATE ${CMAKE_SOURCE_DIR}/src)
set(datamodeltest_SOURCES
qabstractitemmodeltester.cpp
datamodeltest.cpp
)
......@@ -111,7 +109,6 @@ ecm_add_test(${datamodeltest_SOURCES}
target_include_directories(datamodeltest PRIVATE ${CMAKE_SOURCE_DIR}/src)
set(trackmetadatamodeltest_SOURCES
qabstractitemmodeltester.cpp
trackmetadatamodeltest.cpp
)
......@@ -126,7 +123,6 @@ ecm_add_test(${trackmetadatamodeltest_SOURCES}
target_include_directories(trackmetadatamodeltest PRIVATE ${CMAKE_SOURCE_DIR}/src)
set(alltracksproxymodeltest_SOURCES
qabstractitemmodeltester.cpp
alltracksproxymodeltest.cpp
)
......
......@@ -21,7 +21,6 @@
#include "databaseinterface.h"
#include "models/datamodel.h"
#include "models/alltracksproxymodel.h"
#include "qabstractitemmodeltester.h"
#include <QObject>
#include <QUrl>
......@@ -33,6 +32,7 @@
#include <QStandardPaths>
#include <QDir>
#include <QFile>
#include <QAbstractItemModelTester>
#include <QDebug>
......
......@@ -20,7 +20,6 @@
#include "musicaudiotrack.h"
#include "databaseinterface.h"
#include "models/datamodel.h"
#include "qabstractitemmodeltester.h"
#include <QObject>
#include <QUrl>
......@@ -32,6 +31,7 @@
#include <QStandardPaths>
#include <QDir>
#include <QFile>
#include <QAbstractItemModelTester>
#include <QDebug>
......
......@@ -22,7 +22,6 @@
#include "databaseinterface.h"
#include "musicaudiotrack.h"
#include "trackslistener.h"
#include "qabstractitemmodeltester.h"
#include <QtTest>
#include <QStandardItemModel>
......@@ -30,6 +29,7 @@
#include <QUrl>
#include <QTime>
#include <QTemporaryFile>
#include <QAbstractItemModelTester>
MediaPlayListTest::MediaPlayListTest(QObject *parent) : QObject(parent)
{
......
This diff is collapsed.
/****************************************************************************
**
** Copyright (C) 2016 The Qt Company Ltd.
** Contact: https://www.qt.io/licensing/
**
** This file is part of the QtTest module of the Qt Toolkit.
**
** $QT_BEGIN_LICENSE:LGPL$
** Commercial License Usage
** Licensees holding valid commercial Qt licenses may use this file in
** accordance with the commercial license agreement provided with the
** Software or, alternatively, in accordance with the terms contained in
** a written agreement between you and The Qt Company. For licensing terms
** and conditions see https://www.qt.io/terms-conditions. For further
** information use the contact form at https://www.qt.io/contact-us.
**
** GNU Lesser General Public License Usage
** Alternatively, this file may be used under the terms of the GNU Lesser
** General Public License version 3 as published by the Free Software
** Foundation and appearing in the file LICENSE.LGPL3 included in the
** packaging of this file. Please review the following information to
** ensure the GNU Lesser General Public License version 3 requirements
** will be met: https://www.gnu.org/licenses/lgpl-3.0.html.
**
** GNU General Public License Usage
** Alternatively, this file may be used under the terms of the GNU
** General Public License version 2.0 or (at your option) the GNU General
** Public license version 3 or any later version approved by the KDE Free
** Qt Foundation. The licenses are as published by the Free Software
** Foundation and appearing in the file LICENSE.GPL2 and LICENSE.GPL3
** included in the packaging of this file. Please review the following
** information to ensure the GNU General Public License requirements will
** be met: https://www.gnu.org/licenses/gpl-2.0.html and
** https://www.gnu.org/licenses/gpl-3.0.html.
**
** $QT_END_LICENSE$
**
****************************************************************************/
#ifndef QABSTRACTITEMMODELTESTER_H
#define QABSTRACTITEMMODELTESTER_H
#include <QtCore/QObject>
#include <QtGui/QFont>
#include <QtGui/QColor>
#include <QtGui/QBrush>
#include <QtGui/QPixmap>
#include <QtGui/QImage>
#include <QtGui/QIcon>
#include <QAbstractItemModel>
QT_BEGIN_NAMESPACE
class QAbstractItemModel;
class QAbstractItemModelTester;
class QAbstractItemModelTesterPrivate;
namespace QTestPrivate {
inline bool testDataGuiRoles(QAbstractItemModelTester *tester);
}
class QAbstractItemModelTester : public QObject
{
Q_OBJECT
Q_DECLARE_PRIVATE(QAbstractItemModelTester)
public:
enum class FailureReportingMode {
QtTest,
Warning,
Fatal
};
QAbstractItemModelTester(QAbstractItemModel *model, QObject *parent = nullptr);
QAbstractItemModelTester(QAbstractItemModel *model, FailureReportingMode mode, QObject *parent = nullptr);
QAbstractItemModel *model() const;
FailureReportingMode failureReportingMode() const;
private:
friend inline bool QTestPrivate::testDataGuiRoles(QAbstractItemModelTester *tester);
bool verify(bool statement, const char *statementStr, const char *description, const char *file, int line);
};
namespace QTestPrivate {
inline bool testDataGuiRoles(QAbstractItemModelTester *tester)
{
#define MODELTESTER_VERIFY(statement) \
do { \
if (!tester->verify(static_cast<bool>(statement), #statement, "", __FILE__, __LINE__)) \
return false; \
} while (false)
const auto model = tester->model();
Q_ASSERT(model);
if (!model->hasChildren())
return true;
QVariant variant;
variant = model->data(model->index(0, 0), Qt::DecorationRole);
if (variant.isValid()) {
MODELTESTER_VERIFY(variant.canConvert<QPixmap>()
|| variant.canConvert<QImage>()
|| variant.canConvert<QIcon>()
|| variant.canConvert<QColor>()
|| variant.canConvert<QBrush>());
}
// General Purpose roles that should return a QFont
variant = model->data(model->index(0, 0), Qt::FontRole);
if (variant.isValid())
MODELTESTER_VERIFY(variant.canConvert<QFont>());
// General Purpose roles that should return a QColor or a QBrush
variant = model->data(model->index(0, 0), Qt::BackgroundRole);
if (variant.isValid())
MODELTESTER_VERIFY(variant.canConvert<QColor>() || variant.canConvert<QBrush>());
variant = model->data(model->index(0, 0), Qt::ForegroundRole);
if (variant.isValid())
MODELTESTER_VERIFY(variant.canConvert<QColor>() || variant.canConvert<QBrush>());
#undef MODELTESTER_VERIFY
return true;
}
} // namespaceQTestPrivate
QT_END_NAMESPACE
#endif // QABSTRACTITEMMODELTESTER_H
......@@ -17,9 +17,9 @@
#include "models/trackmetadatamodel.h"
#include "qabstractitemmodeltester.h"
#include "databasetestdata.h"
#include <QAbstractItemModelTester>
#include <QDebug>
#include <QtTest>
......
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