Skip to content
This repository was archived by the owner on Mar 4, 2023. It is now read-only.

Commit 8d23518

Browse files
committed
refactor settings config gen out
1 parent a19a445 commit 8d23518

File tree

15 files changed

+35
-19
lines changed

15 files changed

+35
-19
lines changed

src/mvvmcore/mvvmcore.pro

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -41,6 +41,8 @@ SOURCES += \
4141
qsettingsaccessor.cpp \
4242
settingsentry.cpp
4343

44+
include(../settingsconfig/settingsconfig.pri)
45+
4446
TRANSLATIONS += \
4547
translations/qtmvvmcore_de.ts \
4648
translations/qtmvvmcore_template.ts

src/mvvmcore/qpmx.json

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,11 @@
44
"package": "de.skycoder42.qpluginfactory",
55
"provider": "qpm",
66
"version": "1.3.0"
7+
},
8+
{
9+
"package": "de.skycoder42.qxmlcodegen",
10+
"provider": "qpm",
11+
"version": "1.2.1"
712
}
813
],
914
"license": {

src/mvvmdatasynccore/mvvmdatasynccore.pro

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -15,10 +15,10 @@ HEADERS += \
1515
networkexchangeviewmodel_p.h \
1616
exchangedevicesmodel.h \
1717
exchangedevicesmodel_p.h \
18-
datasyncsettingsviewmodel.h \
19-
datasyncsettingsaccessor.h \
20-
datasyncsettingsentry.h \
21-
datasyncsettingsaccessor_p.h
18+
datasyncsettingsviewmodel.h \
19+
datasyncsettingsaccessor.h \
20+
datasyncsettingsentry.h \
21+
datasyncsettingsaccessor_p.h
2222

2323
SOURCES += \
2424
datasyncviewmodel.cpp \
@@ -28,9 +28,9 @@ SOURCES += \
2828
identityeditviewmodel.cpp \
2929
networkexchangeviewmodel.cpp \
3030
exchangedevicesmodel.cpp \
31-
datasyncsettingsviewmodel.cpp \
32-
datasyncsettingsaccessor.cpp \
33-
datasyncsettingsentry.cpp
31+
datasyncsettingsviewmodel.cpp \
32+
datasyncsettingsaccessor.cpp \
33+
datasyncsettingsentry.cpp
3434

3535
TRANSLATIONS += \
3636
translations/qtmvvmdatasynccore_de.ts \

src/settingsconfig/settingsconfig.pri

Lines changed: 13 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,13 @@
1+
HEADERS += \
2+
$$PWD/../3rdparty/optional-lite/optional.hpp \
3+
$$PWD/../3rdparty/variant-lite/variant.hpp \
4+
$$PWD/settingsconfigimpl.h
5+
6+
SOURCES += $$PWD/settingsconfigimpl.cpp
7+
8+
XML_SCHEMA_DEFINITIONS += $$PWD/settingsconfig.xsd
9+
10+
INCLUDEPATH += $$PWD $$PWD/../3rdparty/optional-lite $$PWD/../3rdparty/variant-lite
11+
12+
contains(QT, xmlpatterns): RESOURCES += \
13+
$$PWD/settingsconfig.qrc

src/settingsconfig/settingsconfig.qrc

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,5 @@
1+
<RCC>
2+
<qresource prefix="/schemas">
3+
<file>settingsconfig.xsd</file>
4+
</qresource>
5+
</RCC>

tools/3rdparty/3rdparty.pri

Lines changed: 0 additions & 5 deletions
This file was deleted.
Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,5 @@
11
<RCC>
22
<qresource prefix="/schemas">
33
<file>qsettingsgenerator.xsd</file>
4-
<file>settingsconfig.xsd</file>
54
</qresource>
65
</RCC>

tools/settingsgenerator/settingsgenerator.pro

Lines changed: 3 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -16,26 +16,23 @@ DEFINES += "BUNDLE_PREFIX=\\\"$$BUNDLE_PREFIX\\\""
1616

1717
HEADERS += \
1818
settingstranslator.h \
19-
settingsconfigimpl.h \
2019
cppsettingsgenerator.h \
2120
settingsgeneratorimpl.h \
2221
qmlsettingsgenerator.h
2322

2423
SOURCES += \
2524
main.cpp \
2625
settingstranslator.cpp \
27-
settingsconfigimpl.cpp \
2826
cppsettingsgenerator.cpp \
2927
settingsgeneratorimpl.cpp \
3028
qmlsettingsgenerator.cpp
3129

3230
XML_SCHEMA_DEFINITIONS += \
33-
qsettingsgenerator.xsd \
34-
settingsconfig.xsd
31+
qsettingsgenerator.xsd
3532

36-
contains(QT, xmlpatterns):RESOURCES += qsettingsgenerator.qrc
33+
include(../../src/settingsconfig/settingsconfig.pri)
3734

38-
include(../3rdparty/3rdparty.pri)
35+
contains(QT, xmlpatterns):RESOURCES += qsettingsgenerator.qrc
3936

4037
load(qt_tool)
4138

0 commit comments

Comments
 (0)