Commit 989d031a authored by Andreas Cord-Landwehr's avatar Andreas Cord-Landwehr
Browse files

Merge branch 'master' into feature/kirigami-ui

parents c1f9027c d094fbc9
......@@ -25,7 +25,7 @@
project(artikulate)
cmake_minimum_required(VERSION 3.0.0)
cmake_minimum_required(VERSION 3.5.0)
find_package(ECM 5.15.0 REQUIRED NO_MODULE)
find_package(KF5DocTools)
......
......@@ -44,7 +44,7 @@ target_link_libraries(test_resourcerepository
artikulatecore
Qt5::Test
)
add_test(test_resourcerepository test_resourcerepository)
add_test(NAME test_resourcerepository COMMAND test_resourcerepository)
ecm_mark_as_test(test_resourcerepository)
......@@ -56,7 +56,7 @@ target_link_libraries(test_iresourcerepository_integration
artikulatecore
Qt5::Test
)
add_test(test_iresourcerepository_integration test_iresourcerepository_integration)
add_test(NAME test_iresourcerepository_integration COMMAND test_iresourcerepository_integration)
ecm_mark_as_test(test_iresourcerepository_integration)
......@@ -67,7 +67,7 @@ target_link_libraries(test_trainingsession
artikulatecore
Qt5::Test
)
add_test(test_trainingsession test_trainingsession)
add_test(NAME test_trainingsession COMMAND test_trainingsession)
ecm_mark_as_test(test_trainingsession)
......@@ -81,7 +81,7 @@ target_link_libraries(test_editorsession
artikulatecore
Qt5::Test
)
add_test(test_editorsession test_editorsession)
add_test(NAME test_editorsession COMMAND test_editorsession)
ecm_mark_as_test(test_editorsession)
......@@ -96,7 +96,7 @@ target_link_libraries(test_courseresource
artikulatecore
Qt5::Test
)
add_test(test_courseresource test_courseresource)
add_test(NAME test_courseresource COMMAND test_courseresource)
ecm_mark_as_test(test_courseresource)
......@@ -111,7 +111,7 @@ target_link_libraries(test_skeletonresource
artikulatecore
Qt5::Test
)
add_test(test_skeletonresource test_skeletonresource)
add_test(NAME test_skeletonresource COMMAND test_skeletonresource)
ecm_mark_as_test(test_skeletonresource)
......@@ -127,7 +127,7 @@ target_link_libraries(test_editablecourseresource
artikulatecore
Qt5::Test
)
add_test(test_editablecourseresource test_editablecourseresource)
add_test(NAME test_editablecourseresource COMMAND test_editablecourseresource)
ecm_mark_as_test(test_editablecourseresource)
......@@ -138,5 +138,5 @@ target_link_libraries(TestLanguageFiles
artikulatecore
Qt5::Test
)
add_test(TestLanguageFiles TestLanguageFiles)
add_test(NAME TestLanguageFiles COMMAND TestLanguageFiles)
ecm_mark_as_test(TestLanguageFiles)
......@@ -40,5 +40,5 @@ target_link_libraries(TestLearnerStorage
artikulatelearnerprofile
Qt5::Test
)
add_test(TestLearnerStorage TestLearnerStorage)
add_test(NAME TestLearnerStorage COMMAND TestLearnerStorage)
ecm_mark_as_test(TestLearnerStorage)
......@@ -42,7 +42,7 @@ Storage::Storage(QObject* parent)
}
Storage::Storage(const QString databasePath, QObject* parent)
Storage::Storage(const QString &databasePath, QObject* parent)
: QObject(parent)
, m_databasePath(databasePath)
, m_errorMessage(QString())
......
......@@ -50,7 +50,7 @@ public:
/**
* \note this constructor is tailored for unit tests
*/
explicit Storage(const QString databasePath, QObject* parent = nullptr);
explicit Storage(const QString &databasePath, QObject* parent = nullptr);
QString errorMessage() const;
/**
......
......@@ -23,7 +23,6 @@
#include <QObject>
class CaptureDeviceControllerPrivate;
class QUrl;
/**
* \class CaptureDeviceController
......
......@@ -25,6 +25,8 @@
#include <QString>
#include <QAudioRecorder>
class QAudioRecorder;
class QMediaRecorder;
class QMediaObject;
class QtMultimediaCaptureBackend : public CaptureBackendInterface
......
......@@ -108,6 +108,7 @@
<caption xml:lang="de">Übung in Artikulate</caption>
<caption xml:lang="en-GB">Training in Artikulate</caption>
<caption xml:lang="es">Entrenando en Artikulate</caption>
<caption xml:lang="fr">Séance d'entraînement sur Artikulate</caption>
<caption xml:lang="gl">Adestrando en Artikulate</caption>
<caption xml:lang="id">Berlatih di Artikulate</caption>
<caption xml:lang="nl">Oefening in Artikulate</caption>
......@@ -119,7 +120,7 @@
<caption xml:lang="x-test">xxTraining in Artikulatexx</caption>
<caption xml:lang="zh-CN">使用 Artikulate 训练</caption>
<caption xml:lang="zh-TW">在 Artikulate 中訓練</caption>
<image>http://edu.kde.org/images/screenshots/resized/artikulate.png</image>
<image>https://cdn.kde.org/screenshots/artikulate/artikulate.png</image>
</screenshot>
</screenshots>
<project_group>KDE</project_group>
......
......@@ -24,7 +24,6 @@
#include "artikulatecore_export.h"
#include "phrase.h"
class QString;
class Language;
class IEditableCourse;
class Unit;
......
......@@ -25,7 +25,6 @@
#include "phrase.h"
#include <QVector>
class QString;
class Language;
class ICourse;
class Unit;
......
......@@ -27,8 +27,6 @@
#include "core/trainingsession.h"
class EditorSession;
class KActionCollection;
class KMenu;
class QQuickWidget;
class MainWindowEditor : public KXmlGuiWindow
......
......@@ -25,7 +25,6 @@
class Course;
class CourseModel;
class QSignalMapper;
class CourseFilterModel : public QSortFilterProxyModel
{
......
......@@ -25,7 +25,6 @@
class LanguageResourceModel;
class Language;
class QSignalMapper;
class LanguageModel : public QSortFilterProxyModel
{
......
......@@ -25,7 +25,6 @@
#include <QSortFilterProxyModel>
class PhraseListModel;
class QSignalMapper;
class PhraseFilterModel : public QSortFilterProxyModel
{
......
......@@ -26,7 +26,6 @@
class IEditableRepository;
class ICourse;
class Skeleton;
class Language;
class QSignalMapper;
class SkeletonModel : public QAbstractListModel
......
......@@ -24,7 +24,6 @@
#include <QSortFilterProxyModel>
class UnitModel;
class QSignalMapper;
class UnitFilterModel : public QSortFilterProxyModel
{
......
......@@ -21,7 +21,7 @@
#include "iconitem.h"
#include <QSGSimpleTextureNode>
#include <qquickwindow.h>
#include <QQuickWindow>
#include <QIcon>
#include "imagetexturescache.h"
#include "managedtexturenode.h"
......
......@@ -25,7 +25,6 @@
#include <QTemporaryFile>
#include <QWidget>
class QMediaPlayer;
class SoundDeviceDialogPage :
public QWidget
......
Supports Markdown
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