Commit c505a726 authored by Marco Martin's avatar Marco Martin
Browse files

use plasma_install_bundled_package

Summary: use the new install macro to install bundled packages in the form of an rcc

Test Plan: added and tried every single plasmoid

Reviewers: #plasma, kossebau

Reviewed By: kossebau

Subscribers: plasma-devel

Tags: #plasma

Differential Revision: https://phabricator.kde.org/D11516
parent fd067407
......@@ -10,7 +10,7 @@ if("${CMAKE_SOURCE_DIR}" STREQUAL "${CMAKE_BINARY_DIR}")
endif()
set(REQUIRED_QT_VERSION 5.9.0)
set(KF5_MIN_VERSION 5.42.0)
set(KF5_MIN_VERSION 5.45.0)
include(FeatureSummary)
......
plasma_install_package(activitypager org.kde.plasma.activitypager)
plasma_install_package(kickerdash org.kde.plasma.kickerdash)
plasma_install_package(konsoleprofiles/package org.kde.plasma.konsoleprofiles)
plasma_install_package(keyboardindicator org.kde.plasma.keyboardindicator)
plasma_install_bundled_package(activitypager org.kde.plasma.activitypager)
plasma_install_bundled_package(kickerdash org.kde.plasma.kickerdash)
plasma_install_bundled_package(konsoleprofiles/package org.kde.plasma.konsoleprofiles)
plasma_install_bundled_package(keyboardindicator org.kde.plasma.keyboardindicator)
add_subdirectory(binary-clock)
add_subdirectory(calculator)
......
plasma_install_package(package org.kde.plasma.binaryclock)
plasma_install_bundled_package(package org.kde.plasma.binaryclock)
plasma_install_package(package org.kde.plasma.calculator)
plasma_install_bundled_package(package org.kde.plasma.calculator)
set(CMAKE_MODULE_PATH ${CMAKE_CURRENT_SOURCE_DIR}/cmake ${CMAKE_MODULE_PATH})
plasma_install_package(package org.kde.plasma.colorpicker)
plasma_install_bundled_package(package org.kde.plasma.colorpicker)
set(colorpickerplugin_SRCS
plugin/grabwidget.cpp
......
......@@ -38,5 +38,5 @@ install(TARGETS plasma_applet_comic DESTINATION ${KDE_INSTALL_PLUGINDIR}/plasma/
#install(FILES plasma-comic-default.desktop DESTINATION ${SERVICES_INSTALL_DIR})
install(FILES comic.knsrc DESTINATION ${KDE_INSTALL_CONFDIR})
plasma_install_package(package org.kde.plasma.comic)
plasma_install_bundled_package(package org.kde.plasma.comic)
......@@ -10,7 +10,7 @@ if (Qt5WebEngine_FOUND)
#######################################################################################
# Package (metadata.desktop and QML)
plasma_install_package(package org.kde.plasma_applet_dict)
plasma_install_bundled_package(package org.kde.plasma_applet_dict)
#######################################################################################
# Icon for the package
......
#######################################################################################
# Package
plasma_install_package(package org.kde.plasma.diskquota)
plasma_install_bundled_package(package org.kde.plasma.diskquota)
#######################################################################################
......
......@@ -3,7 +3,7 @@ ecm_install_icons(
DESTINATION ${KDE_INSTALL_ICONDIR}
)
plasma_install_package(package org.kde.plasma.fifteenpuzzle)
plasma_install_bundled_package(package org.kde.plasma.fifteenpuzzle)
set(fifteenpuzzleplugin_SRCS
plugin/fifteenimageprovider.cpp
......
......@@ -21,7 +21,7 @@ import QtQuick.Layouts 1.1
import org.kde.plasma.plasmoid 2.0
import org.kde.plasma.core 2.0 as PlasmaCore
import org.kde.plasma.private.fifteenpuzzle 0.1
import org.kde.plasma.private.fifteenpuzzle 0.1 as Private
Item {
id: root
......
......@@ -29,7 +29,7 @@ void FifteenPuzzlePlugin::registerTypes(const char* uri)
{
Q_UNUSED(uri);
Q_ASSERT(QLatin1String(uri) == QLatin1String("org.kde.plasma.private.fifteenpuzzle"));
qmlRegisterTypeNotAvailable(uri, 0, 1, "fifteenpuzzle", QStringLiteral("fifteenpuzzle"));
qmlRegisterTypeNotAvailable(uri, 0, 1, "FifteenPuzzle", QStringLiteral("fifteenpuzzle"));
}
void FifteenPuzzlePlugin::initializeEngine(QQmlEngine * engine, const char * uri)
......
plasma_install_package(package org.kde.plasma.fuzzyclock)
plasma_install_bundled_package(package org.kde.plasma.fuzzyclock)
add_definitions(-DTRANSLATION_DOMAIN=\"plasma_applet_org.kde.plasma.private.grouping\")
plasma_install_package(package org.kde.plasma.private.grouping)
plasma_install_bundled_package(package org.kde.plasma.private.grouping)
ecm_qt_declare_logging_category(groupingplasmoid_SRCS HEADER debug.h
IDENTIFIER GROUPING_DEBUG
......
plasma_install_package(package org.kde.plasma.grouping)
plasma_install_bundled_package(package org.kde.plasma.grouping)
set(groupedappletscontainer_SRCS
groupedappletscontainer.cpp
......
plasma_install_package(package org.kde.plasma.mediaframe)
plasma_install_bundled_package(package org.kde.plasma.mediaframe)
set(mediaframeplugin_SRCS
plugin/mediaframe.cpp
......
plasma_install_package(package org.kde.plasma.minimizeall)
plasma_install_bundled_package(package org.kde.plasma.minimizeall)
#######################################################################################
# Package
plasma_install_package(package org.kde.plasma.notes)
plasma_install_bundled_package(package org.kde.plasma.notes)
#######################################################################################
......
add_subdirectory(plugin)
plasma_install_package(package org.kde.plasma.quicklaunch)
plasma_install_bundled_package(package org.kde.plasma.quicklaunch)
plasma_install_package(plasmoid org.kde.plasma.quickshare)
plasma_install_bundled_package(plasmoid org.kde.plasma.quickshare)
add_subdirectory(plugin)
plasma_install_package(package org.kde.plasma.showdesktop)
plasma_install_bundled_package(package org.kde.plasma.showdesktop)
add_definitions(-DTRANSLATION_DOMAIN="plasma_applet_org.kde.plasma.showdesktop")
......
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