Move relevant models to devtools
This commit is contained in:
@@ -12,6 +12,7 @@ add_subdirectory(login)
|
|||||||
add_subdirectory(rooms)
|
add_subdirectory(rooms)
|
||||||
add_subdirectory(timeline)
|
add_subdirectory(timeline)
|
||||||
add_subdirectory(spaces)
|
add_subdirectory(spaces)
|
||||||
|
add_subdirectory(devtools)
|
||||||
|
|
||||||
add_library(neochat STATIC
|
add_library(neochat STATIC
|
||||||
controller.cpp
|
controller.cpp
|
||||||
@@ -34,10 +35,6 @@ add_library(neochat STATIC
|
|||||||
windowcontroller.h
|
windowcontroller.h
|
||||||
models/serverlistmodel.cpp
|
models/serverlistmodel.cpp
|
||||||
models/serverlistmodel.h
|
models/serverlistmodel.h
|
||||||
models/statemodel.cpp
|
|
||||||
models/statemodel.h
|
|
||||||
models/statefiltermodel.cpp
|
|
||||||
models/statefiltermodel.h
|
|
||||||
logger.cpp
|
logger.cpp
|
||||||
logger.h
|
logger.h
|
||||||
jobs/neochatgetcommonroomsjob.cpp
|
jobs/neochatgetcommonroomsjob.cpp
|
||||||
@@ -48,8 +45,6 @@ add_library(neochat STATIC
|
|||||||
proxycontroller.h
|
proxycontroller.h
|
||||||
mediamanager.cpp
|
mediamanager.cpp
|
||||||
mediamanager.h
|
mediamanager.h
|
||||||
models/statekeysmodel.cpp
|
|
||||||
models/statekeysmodel.h
|
|
||||||
sharehandler.cpp
|
sharehandler.cpp
|
||||||
sharehandler.h
|
sharehandler.h
|
||||||
foreigntypes.h
|
foreigntypes.h
|
||||||
@@ -168,7 +163,6 @@ ecm_add_qml_module(neochat URI org.kde.neochat GENERATE_PLUGIN_SOURCE
|
|||||||
)
|
)
|
||||||
|
|
||||||
add_subdirectory(settings)
|
add_subdirectory(settings)
|
||||||
add_subdirectory(devtools)
|
|
||||||
add_subdirectory(chatbar)
|
add_subdirectory(chatbar)
|
||||||
|
|
||||||
if(NOT ANDROID AND NOT WIN32)
|
if(NOT ANDROID AND NOT WIN32)
|
||||||
@@ -228,7 +222,7 @@ else()
|
|||||||
endif()
|
endif()
|
||||||
|
|
||||||
target_include_directories(neochat PRIVATE ${CMAKE_BINARY_DIR} ${CMAKE_CURRENT_SOURCE_DIR}/models)
|
target_include_directories(neochat PRIVATE ${CMAKE_BINARY_DIR} ${CMAKE_CURRENT_SOURCE_DIR}/models)
|
||||||
target_link_libraries(neochat PRIVATE Settingsplugin Roomsplugin Timelineplugin Spacesplugin devtoolsplugin Loginplugin chatbarplugin)
|
target_link_libraries(neochat PRIVATE Settingsplugin Roomsplugin Timelineplugin Spacesplugin Devtoolsplugin Loginplugin chatbarplugin)
|
||||||
target_link_libraries(neochat PUBLIC
|
target_link_libraries(neochat PUBLIC
|
||||||
LibNeoChat
|
LibNeoChat
|
||||||
Timeline
|
Timeline
|
||||||
|
|||||||
@@ -1,8 +1,8 @@
|
|||||||
# SPDX-FileCopyrightText: 2024 James Graham <james.h.graham@protonmail.com>
|
# SPDX-FileCopyrightText: 2024 James Graham <james.h.graham@protonmail.com>
|
||||||
# SPDX-License-Identifier: BSD-2-Clause
|
# SPDX-License-Identifier: BSD-2-Clause
|
||||||
|
|
||||||
qt_add_library(devtools STATIC)
|
qt_add_library(Devtools STATIC)
|
||||||
ecm_add_qml_module(devtools GENERATE_PLUGIN_SOURCE
|
ecm_add_qml_module(Devtools GENERATE_PLUGIN_SOURCE
|
||||||
URI org.kde.neochat.devtools
|
URI org.kde.neochat.devtools
|
||||||
OUTPUT_DIRECTORY ${CMAKE_BINARY_DIR}/src/org/kde/neochat/devtools
|
OUTPUT_DIRECTORY ${CMAKE_BINARY_DIR}/src/org/kde/neochat/devtools
|
||||||
QML_FILES
|
QML_FILES
|
||||||
@@ -13,4 +13,14 @@ ecm_add_qml_module(devtools GENERATE_PLUGIN_SOURCE
|
|||||||
RoomData.qml
|
RoomData.qml
|
||||||
ServerData.qml
|
ServerData.qml
|
||||||
StateKeys.qml
|
StateKeys.qml
|
||||||
|
SOURCES
|
||||||
|
models/statefiltermodel.cpp
|
||||||
|
models/statekeysmodel.cpp
|
||||||
|
models/statemodel.cpp
|
||||||
|
)
|
||||||
|
|
||||||
|
target_include_directories(Devtools PRIVATE ${CMAKE_BINARY_DIR} ${CMAKE_CURRENT_SOURCE_DIR}/models)
|
||||||
|
target_link_libraries(Devtools PRIVATE
|
||||||
|
Qt::Core
|
||||||
|
LibNeoChat
|
||||||
)
|
)
|
||||||
|
|||||||
Reference in New Issue
Block a user