Browse Source

refactor settings config gen out

pull/2/head
Skycoder42 7 years ago
parent
commit
8d23518f41
No known key found for this signature in database GPG Key ID: 8E01AD9EF0578D2B
  1. 0
      src/3rdparty/optional-lite/LICENSE.txt
  2. 0
      src/3rdparty/optional-lite/optional.hpp
  3. 0
      src/3rdparty/variant-lite/LICENSE.txt
  4. 0
      src/3rdparty/variant-lite/variant.hpp
  5. 2
      src/mvvmcore/mvvmcore.pro
  6. 5
      src/mvvmcore/qpmx.json
  7. 14
      src/mvvmdatasynccore/mvvmdatasynccore.pro
  8. 13
      src/settingsconfig/settingsconfig.pri
  9. 5
      src/settingsconfig/settingsconfig.qrc
  10. 0
      src/settingsconfig/settingsconfig.xsd
  11. 0
      src/settingsconfig/settingsconfigimpl.cpp
  12. 0
      src/settingsconfig/settingsconfigimpl.h
  13. 5
      tools/3rdparty/3rdparty.pri
  14. 1
      tools/settingsgenerator/qsettingsgenerator.qrc
  15. 9
      tools/settingsgenerator/settingsgenerator.pro

0
tools/3rdparty/optional-lite/LICENSE.txt → src/3rdparty/optional-lite/LICENSE.txt

0
tools/3rdparty/optional-lite/optional.hpp → src/3rdparty/optional-lite/optional.hpp

0
tools/3rdparty/variant-lite/LICENSE.txt → src/3rdparty/variant-lite/LICENSE.txt

0
tools/3rdparty/variant-lite/variant.hpp → src/3rdparty/variant-lite/variant.hpp

2
src/mvvmcore/mvvmcore.pro

@ -41,6 +41,8 @@ SOURCES += \
qsettingsaccessor.cpp \
settingsentry.cpp
include(../settingsconfig/settingsconfig.pri)
TRANSLATIONS += \
translations/qtmvvmcore_de.ts \
translations/qtmvvmcore_template.ts

5
src/mvvmcore/qpmx.json

@ -4,6 +4,11 @@
"package": "de.skycoder42.qpluginfactory",
"provider": "qpm",
"version": "1.3.0"
},
{
"package": "de.skycoder42.qxmlcodegen",
"provider": "qpm",
"version": "1.2.1"
}
],
"license": {

14
src/mvvmdatasynccore/mvvmdatasynccore.pro

@ -15,10 +15,10 @@ HEADERS += \
networkexchangeviewmodel_p.h \
exchangedevicesmodel.h \
exchangedevicesmodel_p.h \
datasyncsettingsviewmodel.h \
datasyncsettingsaccessor.h \
datasyncsettingsentry.h \
datasyncsettingsaccessor_p.h
datasyncsettingsviewmodel.h \
datasyncsettingsaccessor.h \
datasyncsettingsentry.h \
datasyncsettingsaccessor_p.h
SOURCES += \
datasyncviewmodel.cpp \
@ -28,9 +28,9 @@ SOURCES += \
identityeditviewmodel.cpp \
networkexchangeviewmodel.cpp \
exchangedevicesmodel.cpp \
datasyncsettingsviewmodel.cpp \
datasyncsettingsaccessor.cpp \
datasyncsettingsentry.cpp
datasyncsettingsviewmodel.cpp \
datasyncsettingsaccessor.cpp \
datasyncsettingsentry.cpp
TRANSLATIONS += \
translations/qtmvvmdatasynccore_de.ts \

13
src/settingsconfig/settingsconfig.pri

@ -0,0 +1,13 @@
HEADERS += \
$$PWD/../3rdparty/optional-lite/optional.hpp \
$$PWD/../3rdparty/variant-lite/variant.hpp \
$$PWD/settingsconfigimpl.h
SOURCES += $$PWD/settingsconfigimpl.cpp
XML_SCHEMA_DEFINITIONS += $$PWD/settingsconfig.xsd
INCLUDEPATH += $$PWD $$PWD/../3rdparty/optional-lite $$PWD/../3rdparty/variant-lite
contains(QT, xmlpatterns): RESOURCES += \
$$PWD/settingsconfig.qrc

5
src/settingsconfig/settingsconfig.qrc

@ -0,0 +1,5 @@
<RCC>
<qresource prefix="/schemas">
<file>settingsconfig.xsd</file>
</qresource>
</RCC>

0
tools/settingsgenerator/settingsconfig.xsd → src/settingsconfig/settingsconfig.xsd

0
tools/settingsgenerator/settingsconfigimpl.cpp → src/settingsconfig/settingsconfigimpl.cpp

0
tools/settingsgenerator/settingsconfigimpl.h → src/settingsconfig/settingsconfigimpl.h

5
tools/3rdparty/3rdparty.pri

@ -1,5 +0,0 @@
HEADERS += \
$$PWD/optional-lite/optional.hpp \
$$PWD/variant-lite/variant.hpp
INCLUDEPATH += $$PWD/optional-lite $$PWD/variant-lite

1
tools/settingsgenerator/qsettingsgenerator.qrc

@ -1,6 +1,5 @@
<RCC>
<qresource prefix="/schemas">
<file>qsettingsgenerator.xsd</file>
<file>settingsconfig.xsd</file>
</qresource>
</RCC>

9
tools/settingsgenerator/settingsgenerator.pro

@ -16,7 +16,6 @@ DEFINES += "BUNDLE_PREFIX=\\\"$$BUNDLE_PREFIX\\\""
HEADERS += \
settingstranslator.h \
settingsconfigimpl.h \
cppsettingsgenerator.h \
settingsgeneratorimpl.h \
qmlsettingsgenerator.h
@ -24,18 +23,16 @@ HEADERS += \
SOURCES += \
main.cpp \
settingstranslator.cpp \
settingsconfigimpl.cpp \
cppsettingsgenerator.cpp \
settingsgeneratorimpl.cpp \
qmlsettingsgenerator.cpp
XML_SCHEMA_DEFINITIONS += \
qsettingsgenerator.xsd \
settingsconfig.xsd
qsettingsgenerator.xsd
contains(QT, xmlpatterns):RESOURCES += qsettingsgenerator.qrc
include(../../src/settingsconfig/settingsconfig.pri)
include(../3rdparty/3rdparty.pri)
contains(QT, xmlpatterns):RESOURCES += qsettingsgenerator.qrc
load(qt_tool)

Loading…
Cancel
Save