Move design system to designer/libs

Change-Id: I966603f66c3fafba9892e6f0915694e9019b80ef
Reviewed-by: Marco Bubke <marco.bubke@qt.io>
This commit is contained in:
Vikas Pachdha
2024-09-18 13:44:00 +02:00
parent 856608a511
commit 72fb8971f7
9 changed files with 37 additions and 13 deletions

View File

@@ -52,7 +52,7 @@ add_qtc_plugin(QmlDesigner
QmlJS LanguageUtils QmlEditorWidgets AdvancedDockingSystem QmlJS LanguageUtils QmlEditorWidgets AdvancedDockingSystem
Qt::QuickWidgets Qt::CorePrivate Qt::Xml Qt::Svg Sqlite Zip Qt::GuiPrivate Qt::QuickWidgets Qt::CorePrivate Qt::Xml Qt::Svg Sqlite Zip Qt::GuiPrivate
PUBLIC_DEPENDS PUBLIC_DEPENDS
QmlDesignerUtils QmlPuppetCommunication QmlDesignerCore QmlDesignerUtils QmlPuppetCommunication QmlDesignerCore DesignSystem
DEFINES DEFINES
IDE_LIBRARY_BASENAME=\"${IDE_LIBRARY_BASE_PATH}\" IDE_LIBRARY_BASENAME=\"${IDE_LIBRARY_BASE_PATH}\"
SHARE_QML_PATH="${CMAKE_CURRENT_SOURCE_DIR}/../../../share/qtcreator/qmldesigner" SHARE_QML_PATH="${CMAKE_CURRENT_SOURCE_DIR}/../../../share/qtcreator/qmldesigner"
@@ -727,14 +727,6 @@ extend_qtc_plugin(QmlDesigner
messagemodel.h messagemodel.h
) )
extend_qtc_plugin(QmlDesigner
SOURCES_PREFIX components/designsystem
SOURCES
dsconstants.h
dsthememanager.h dsthememanager.cpp
dsthemegroup.cpp dsthemegroup.h
)
add_qtc_plugin(assetexporterplugin add_qtc_plugin(assetexporterplugin
PLUGIN_CLASS AssetExporterPlugin PLUGIN_CLASS AssetExporterPlugin
CONDITION TARGET QmlDesigner CONDITION TARGET QmlDesigner

View File

@@ -1,2 +1,3 @@
add_subdirectory(designercore) add_subdirectory(designercore)
add_subdirectory(qmldesignerutils) add_subdirectory(qmldesignerutils)
add_subdirectory(designsystem)

View File

@@ -0,0 +1,16 @@
add_qtc_library(DesignSystem STATIC
PUBLIC_INCLUDES ${CMAKE_CURRENT_LIST_DIR}
DEPENDS
Qt::Core QmlDesignerCore
SOURCES
dsconstants.h
dsthemegroup.h dsthemegroup.cpp
dsthememanager.h dsthememanager.cpp
)
extend_qtc_library(DesignSystem
CONDITION ENABLE_COMPILE_WARNING_AS_ERROR
PROPERTIES COMPILE_WARNING_AS_ERROR ON
PUBLIC_COMPILE_OPTIONS
$<$<COMPILE_LANG_AND_ID:CXX,Clang,GNU>:-Wno-error=maybe-uninitialized>
)

View File

@@ -0,0 +1,14 @@
// Copyright (C) 2024 The Qt Company Ltd.
// SPDX-License-Identifier: LicenseRef-Qt-Commercial OR GPL-3.0-only WITH Qt-GPL-exception-1.0
#pragma once
#include <QtGlobal>
#if defined(DESIGNSYSTEM_LIBRARY)
# define DESIGNSYSTEM_EXPORT Q_DECL_EXPORT
#elif defined(DESIGNSYSTEM_STATIC_LIBRARY)
# define DESIGNSYSTEM_EXPORT
#else
# define DESIGNSYSTEM_EXPORT Q_DECL_IMPORT
#endif

View File

@@ -2,7 +2,7 @@
// SPDX-License-Identifier: LicenseRef-Qt-Commercial OR GPL-3.0-only WITH Qt-GPL-exception-1.0 // SPDX-License-Identifier: LicenseRef-Qt-Commercial OR GPL-3.0-only WITH Qt-GPL-exception-1.0
#pragma once #pragma once
#include "qmldesignercomponents_global.h" #include "designsystem_global.h"
#include "dsconstants.h" #include "dsconstants.h"
#include "nodeinstanceglobal.h" #include "nodeinstanceglobal.h"
@@ -18,7 +18,7 @@ enum class DECORATION_CONTEXT {
COMPONENT_THEME, COMPONENT_THEME,
}; };
class QMLDESIGNERCOMPONENTS_EXPORT DSThemeGroup class DESIGNSYSTEM_EXPORT DSThemeGroup
{ {
struct PropertyData struct PropertyData
{ {

View File

@@ -3,7 +3,7 @@
#pragma once #pragma once
#include "qmldesignercomponents_global.h" #include "designsystem_global.h"
#include "dsconstants.h" #include "dsconstants.h"
#include "dsthemegroup.h" #include "dsthemegroup.h"
@@ -15,7 +15,8 @@ namespace QmlDesigner {
using ThemeName = PropertyName; using ThemeName = PropertyName;
class DSTheme; class DSTheme;
class QMLDESIGNERCOMPONENTS_EXPORT DSThemeManager
class DESIGNSYSTEM_EXPORT DSThemeManager
{ {
public: public: