Castopod/kasts
1
0
Fork 0
mirror of https://github.com/KDE/kasts.git synced 2024-12-25 16:02:54 +01:00
Code Issues Packages Projects Releases Wiki Activity

Rename solidextras plugin to prevent name clashes when also using

Browse Source 
itinerary
This commit is contained in:
Tobias Fella 2021-10-23 22:50:58 +02:00
parent dd5b79faea
commit 3d5a00d2d7
6 changed files with 12 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/qml/ConnectionCheckAction.qml
View File

@ -9,7 +9,7 @@ import QtQuick.Controls 2.14 as Controls
import QtQuick.Layouts 1.14
import org.kde.kirigami 2.14 as Kirigami
import org.kde.solidextras 1.0
import org.kde.kasts.solidextras 1.0
import org.kde.kasts 1.0

2
src/qml/main.qml
View File

@ -10,7 +10,7 @@ import QtQuick.Controls 2.14 as Controls
import QtQuick.Layouts 1.14
import org.kde.kirigami 2.14 as Kirigami
import org.kde.solidextras 1.0
import org.kde.kasts.solidextras 1.0
import org.kde.kasts 1.0

4
src/solidextras/CMakeLists.txt
View File

@ -19,7 +19,7 @@ else()
qt_add_dbus_interface(solidextras_srcs org.freedesktop.portal.NetworkMonitor.xml portalnetworkmonitor)
endif()
add_library(SolidExtras ${solidextras_srcs})
add_library(SolidExtras STATIC ${solidextras_srcs})
generate_export_header(SolidExtras BASE_NAME SolidExtras)
if (TARGET KF5::NetworkManagerQt)
@ -38,5 +38,3 @@ else ()
target_link_libraries(SolidExtras PRIVATE KF5::NetworkManagerQt)
endif()
endif()
install(TARGETS SolidExtras ${KF5_INSTALL_TARGETS_DEFAULT_ARGS})

12
src/solidextras/qml/CMakeLists.txt
View File

@ -1,19 +1,19 @@
# SPDX-FileCopyrightText: 2020 Volker Krause <vkrause@kde.org>
# SPDX-License-Identifier: BSD-3-Clause
add_library(solidextrasqmlplugin solidextrasqmlplugin.cpp)
target_link_libraries(solidextrasqmlplugin
add_library(kasts-solidextrasqmlplugin solidextrasqmlplugin.cpp)
target_link_libraries(kasts-solidextrasqmlplugin
Qt::Qml
SolidExtras
)
# make examples work without installation
if (NOT CMAKE_VERSION VERSION_LESS 3.14)
set_property(TARGET solidextrasqmlplugin PROPERTY LIBRARY_OUTPUT_DIRECTORY ${CMAKE_LIBRARY_OUTPUT_DIRECTORY}/org/kde/solidextras)
file(CREATE_LINK ${CMAKE_CURRENT_SOURCE_DIR}/qmldir ${CMAKE_LIBRARY_OUTPUT_DIRECTORY}/org/kde/solidextras/qmldir COPY_ON_ERROR SYMBOLIC)
set_property(TARGET kasts-solidextrasqmlplugin PROPERTY LIBRARY_OUTPUT_DIRECTORY ${CMAKE_LIBRARY_OUTPUT_DIRECTORY}/org/kde/kasts/solidextras)
file(CREATE_LINK ${CMAKE_CURRENT_SOURCE_DIR}/qmldir ${CMAKE_LIBRARY_OUTPUT_DIRECTORY}/org/kde/kasts/solidextras/qmldir COPY_ON_ERROR SYMBOLIC)
else()
message(WARNING "CMake is too old, cannot setup QML plugins to work without installation")
endif()
install(TARGETS solidextrasqmlplugin DESTINATION ${QML_INSTALL_DIR}/org/kde/solidextras)
install(FILES qmldir DESTINATION ${QML_INSTALL_DIR}/org/kde/solidextras)
install(TARGETS kasts-solidextrasqmlplugin DESTINATION ${QML_INSTALL_DIR}/org/kde/kasts/solidextras)
install(FILES qmldir DESTINATION ${QML_INSTALL_DIR}/org/kde/kasts/solidextras)

4
src/solidextras/qml/qmldir
View File

@ -1,3 +1,3 @@
module org.kde.solidextras
plugin solidextrasqmlplugin
module org.kde.kasts.solidextras
plugin kasts-solidextrasqmlplugin
classname SolidExtrasQmlPlugin

2
src/solidextras/qml/solidextrasqmlplugin.cpp
View File

@ -21,7 +21,7 @@ using namespace SolidExtras;
void SolidExtrasQmlPlugin::registerTypes(const char*)
{
qmlRegisterSingletonType<NetworkStatus>("org.kde.solidextras", 1, 0, "NetworkStatus", [](QQmlEngine*, QJSEngine*) -> QObject* {
qmlRegisterSingletonType<NetworkStatus>("org.kde.kasts.solidextras", 1, 0, "NetworkStatus", [](QQmlEngine *, QJSEngine *) -> QObject * {
return new NetworkStatus;
});
}