diff --git a/CMakeLists.txt b/CMakeLists.txt index 86b386e..9931682 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -1,53 +1,53 @@ project(peruse) cmake_minimum_required(VERSION 2.8.12) if(POLICY CMP0063) cmake_policy (SET CMP0063 NEW) endif(POLICY CMP0063) option(USE_PERUSE_PDFTHUMBNAILER "Use the internal thumbnail generator for PDF files (defaults to true on windows)" OFF) if(WIN32) set(USE_PERUSE_PDFTHUMBNAILER ON) endif() find_package(ECM 0.0.9 REQUIRED NO_MODULE) set(CMAKE_MODULE_PATH "${CMAKE_CURRENT_SOURCE_DIR}/cmake" ${ECM_MODULE_PATH}) # Android has no DBus, so we can't use that. Sniff things and tell the code if(CMAKE_SYSTEM_NAME STREQUAL Android) message("Building for Android - this means no dbus, and other small details. Work with that") add_definitions(-DANDROID) SET(QT_QMAKE_EXECUTABLE "$ENV{Qt5_android}/bin/qmake") elseif(WIN32) message("Building for Windows - this means no dbus, and other small details. Work with that") add_definitions(-DWINDOWS) endif() -find_package(Qt5 5.10 REQUIRED NO_MODULE COMPONENTS Qml Quick Gui Widgets OpenGL Sql) +find_package(Qt5 5.12 REQUIRED NO_MODULE COMPONENTS Qml Quick Gui Widgets OpenGL Sql) find_package(KF5 5.56 REQUIRED COMPONENTS I18n Declarative Config FileMetaData IconThemes KIO NewStuffQuick) find_package(KF5Baloo) # optional - we'll just let it pass if it's missing find_package(KF5Archive ${KF5_VERSION} REQUIRED) find_package(KF5Kirigami2 5.56.0) set_package_properties(KF5Kirigami2 PROPERTIES PURPOSE "Required at runtime to display the GUI" TYPE RUNTIME ) include(FeatureSummary) include(KDEInstallDirs) include(KDECMakeSettings) include(KDECompilerSettings) include(GenerateExportHeader) include(ECMInstallIcons) include(ECMAddAppIcon) include(ECMQtDeclareLoggingCategory) set(CMAKE_AUTORCC ON) kde_enable_exceptions() add_subdirectory(src) feature_summary(WHAT ALL FATAL_ON_MISSING_REQUIRED_PACKAGES) diff --git a/src/app/qml/About.qml b/src/app/qml/About.qml index 0db8ac0..4295f38 100644 --- a/src/app/qml/About.qml +++ b/src/app/qml/About.qml @@ -1,29 +1,29 @@ /* * Copyright (C) 2019 Dan Leinir Turthra Jensen * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public * License as published by the Free Software Foundation; either * version 2.1 of the License, or (at your option) version 3, or any * later version accepted by the membership of KDE e.V. (or its * successor approved by the membership of KDE e.V.), which shall * act as a proxy defined in Section 6 of version 3 of the license. * * This library 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 * Lesser General Public License for more details. * * You should have received a copy of the GNU Lesser General Public * License along with this library. If not, see . * */ -import QtQuick 2.7 +import QtQuick 2.12 import org.kde.kirigami 2.7 as Kirigami Kirigami.AboutPage { id: component property string categoryName: "aboutPage"; aboutData: peruseAboutData } diff --git a/src/creator/qml/About.qml b/src/creator/qml/About.qml index 0db8ac0..4295f38 100644 --- a/src/creator/qml/About.qml +++ b/src/creator/qml/About.qml @@ -1,29 +1,29 @@ /* * Copyright (C) 2019 Dan Leinir Turthra Jensen * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public * License as published by the Free Software Foundation; either * version 2.1 of the License, or (at your option) version 3, or any * later version accepted by the membership of KDE e.V. (or its * successor approved by the membership of KDE e.V.), which shall * act as a proxy defined in Section 6 of version 3 of the license. * * This library 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 * Lesser General Public License for more details. * * You should have received a copy of the GNU Lesser General Public * License along with this library. If not, see . * */ -import QtQuick 2.7 +import QtQuick 2.12 import org.kde.kirigami 2.7 as Kirigami Kirigami.AboutPage { id: component property string categoryName: "aboutPage"; aboutData: peruseAboutData }