diff --git a/AndroidManifest.xml b/AndroidManifest.xml new file mode 100644 index 0000000..f9df5b7 --- /dev/null +++ b/AndroidManifest.xml @@ -0,0 +1,60 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/CMakeLists.txt b/CMakeLists.txt index 9c04086..fe327e2 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -1,56 +1,60 @@ project(plasma-camera) cmake_minimum_required(VERSION 2.8.12) set(KF5_MIN_VERSION "5.18.0") set(QT_MIN_VERSION "5.5.0") ################# Disallow in-source build ################# if("${CMAKE_SOURCE_DIR}" STREQUAL "${CMAKE_BINARY_DIR}") message(FATAL_ERROR "This application requires an out of source build. Please create a separate build directory.") endif() # Make CPack available to easy generate binary packages include(CPack) include(FeatureSummary) ################# set KDE specific information ################# find_package(ECM 0.0.8 REQUIRED NO_MODULE) # where to look first for cmake modules, before ${CMAKE_ROOT}/Modules/ is checked set(CMAKE_MODULE_PATH ${CMAKE_MODULE_PATH} ${ECM_MODULE_PATH} ${ECM_KDE_MODULE_DIR}) include(ECMSetupVersion) include(ECMGenerateHeaders) include(KDEInstallDirs) include(KDECMakeSettings) include(ECMPoQmTools) include(KDECompilerSettings NO_POLICY_SCOPE) set(KF5_VERSION "5.22.0") find_package(Qt5 ${QT_MIN_VERSION} REQUIRED NO_MODULE COMPONENTS Core Quick Test Gui Svg QuickControls2) +if(ANDROID) + find_package(Qt5 ${QT_MIN_VERSION} REQUIRED COMPONENTS AndroidExtras) +endif() + find_package(KF5 ${KF5_MIN_VERSION} REQUIRED COMPONENTS Kirigami2 CoreAddons I18n) ################# Enable C++11 features for clang and gcc ################# if(UNIX) set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Wall -std=c++0x") endif() ################# now find all used packages ################# set (QT_MIN_VERSION "5.6.0") find_package(PkgConfig) ######################################################################### add_subdirectory(src) install(PROGRAMS org.kde.mobile.camera.desktop DESTINATION ${KDE_INSTALL_APPDIR}) install(FILES org.kde.mobile.camera.appdata.xml DESTINATION ${KDE_INSTALL_METAINFODIR}) feature_summary(WHAT ALL INCLUDE_QUIET_PACKAGES FATAL_ON_MISSING_REQUIRED_PACKAGES) diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt index a36a246..ddc4c71 100644 --- a/src/CMakeLists.txt +++ b/src/CMakeLists.txt @@ -1,8 +1,13 @@ set(plasma-camera_SRCS main.cpp ) qt5_add_resources(RESOURCES resources.qrc) add_executable(plasma-camera ${plasma-camera_SRCS} ${RESOURCES}) target_link_libraries(plasma-camera Qt5::Core Qt5::Qml Qt5::Quick Qt5::Svg KF5::CoreAddons KF5::I18n) + +if(ANDROID) + target_link_libraries(plasma-camera Qt5::AndroidExtras Qt5::Svg KF5::Kirigami2) +endif() + install(TARGETS plasma-camera ${KF5_INSTALL_TARGETS_DEFAULT_ARGS}) diff --git a/src/main.cpp b/src/main.cpp index a3d2749..334f1c0 100644 --- a/src/main.cpp +++ b/src/main.cpp @@ -1,49 +1,57 @@ // Qt includes #include #include #include #include #include // KDE includes #include #include #include +#ifdef Q_OS_ANDROID +#include +#endif + Q_DECL_EXPORT int main(int argc, char *argv[]) { QGuiApplication::setAttribute(Qt::AA_EnableHighDpiScaling); QApplication app(argc, argv); QCoreApplication::setOrganizationName("KDE"); QCoreApplication::setOrganizationDomain("kde.org"); QCoreApplication::setApplicationName("plasma-camera"); QGuiApplication::setApplicationDisplayName("Plasma Camera"); QGuiApplication::setWindowIcon(QIcon::fromTheme(QStringLiteral("camera-photo"))); // About Data KAboutData about(app.applicationName(), app.applicationDisplayName(), app.applicationVersion(), QString(), KAboutLicense::GPL, i18n("© Plasma Mobile Developers"), QString()); about.addAuthor(i18n("Marco Martin"), QString(), QStringLiteral("mart@kde.org"), QStringLiteral("notmart.org")); about.addAuthor(i18n("Jonah Brüchert"), QString(), QStringLiteral("jbb@kaidan.im"), QStringLiteral("jbbgameich.github.io")); about.setProgramLogo(app.windowIcon()); KAboutData::setApplicationData(about); +#ifdef Q_OS_ANDROID + QtAndroid::requestPermissionsSync({"android.permission.CAMERA"}); +#endif + // QML Engine QQmlApplicationEngine engine; engine.rootContext()->setContextProperty(QStringLiteral("cameraAboutData"), QVariant::fromValue(KAboutData::applicationData())); engine.rootContext()->setContextObject(new KLocalizedContext(&engine)); engine.load(QUrl(QStringLiteral("qrc:///main.qml"))); if (engine.rootObjects().isEmpty()) { return -1; } return app.exec(); }