hatam
/
QtMvvm
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity
Browse Source

ported to qdep

master
Skycoder42 7 years ago
parent
b4a735201e
commit
7f86674506
No known key found for this signature in database GPG Key ID: 8E01AD9EF0578D2B
17 changed files with 81 additions and 229 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Unified View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 2
      examples/mvvmcore/SampleCore/samplecore_de.ts
  2. 25
      src/mvvmcore/mvvmcore.pro
  3. 26
      src/mvvmcore/qpmx.json
  4. 20
      src/mvvmdatasynccore/mvvmdatasynccore.pro
  5. 20
      src/mvvmdatasynccore/qpmx.json
  6. 21
      src/mvvmdatasyncquick/mvvmdatasyncquick.pro
  7. 14
      src/mvvmdatasyncquick/qpmx.json
  8. 17
      src/mvvmdatasyncwidgets/mvvmdatasyncwidgets.pro
  9. 14
      src/mvvmdatasyncwidgets/qpmx.json
  10. 24
      src/mvvmquick/mvvmquick.pro
  11. 20
      src/mvvmquick/qpmx.json
  12. 19
      src/mvvmwidgets/mvvmwidgets.pro
  13. 25
      src/mvvmwidgets/qpmx.json
  14. 3
      src/settingsconfig/settingsconfig.pri
  15. 8
      tests/auto/mvvmcore/settingsgenerator/test_de.ts
  16. 21
      tools/settingsgenerator/qpmx.json
  17. 3
      tools/settingsgenerator/settingsgenerator.pro

2
examples/mvvmcore/SampleCore/samplecore_de.ts
View File

@ -106,7 +106,7 @@
<context> <context>
<name>settings.xml</name> <name>settings.xml</name>
<message> <message>
<location filename="../../../../build-qtmvvm-Desktop_Qt_5_11_2_GCC_64bit-Debug/examples/mvvmcore/SampleCore/.tr-dummies/settings.tsdummy.cpp" line="+7"/> <location filename="../../../../build-qtmvvm-Desktop_Qt_5_12_1_GCC_64bit-Debug/examples/mvvmcore/SampleCore/.tr-dummies/settings.tsdummy.cpp" line="+7"/>
<source>&amp;Check me</source> <source>&amp;Check me</source>
<translation type="unfinished"></translation> <translation type="unfinished"></translation>
</message> </message>

25
src/mvvmcore/mvvmcore.pro
View File

@ -60,16 +60,9 @@ TRANSLATIONS += \
translations/qtmvvmcore_de.ts \ translations/qtmvvmcore_de.ts \
translations/qtmvvmcore_template.ts translations/qtmvvmcore_template.ts
DISTFILES += $$TRANSLATIONS
load(qt_module) load(qt_module)
lib_bundle: FRAMEWORK_HEADERS.files += $$absolute_path(ViewModel, $$INC_PATH/include/$$MODULE_INCNAME) lib_bundle: FRAMEWORK_HEADERS.files += $$absolute_path(ViewModel, $$INC_PATH/include/$$MODULE_INCNAME)
else: gen_headers.files += $$absolute_path(ViewModel, $$INC_PATH/include/$$MODULE_INCNAME) else: gen_headers.files += $$absolute_path(ViewModel, $$INC_PATH/include/$$MODULE_INCNAME)
lib_bundle: message($$FRAMEWORK_HEADERS.files)
else: message($$gen_headers.files)
qpmx_ts_target.path = $$[QT_INSTALL_TRANSLATIONS]
qpmx_ts_target.depends += lrelease
FEATURES += \ FEATURES += \
../../mkspecs/features/qsettingsgenerator.prf \ ../../mkspecs/features/qsettingsgenerator.prf \
@ -78,7 +71,10 @@ FEATURES += \
features.files = $$FEATURES features.files = $$FEATURES
features.path = $$[QT_HOST_DATA]/mkspecs/features/ features.path = $$[QT_HOST_DATA]/mkspecs/features/
INSTALLS += qpmx_ts_target features INSTALLS += features
CONFIG += lrelease
QM_FILES_INSTALL_PATH = $$[QT_INSTALL_TRANSLATIONS]
win32 { win32 {
QMAKE_TARGET_PRODUCT = "$$TARGET" QMAKE_TARGET_PRODUCT = "$$TARGET"
@ -88,11 +84,8 @@ win32 {
QMAKE_TARGET_BUNDLE_PREFIX = "com.skycoder42." QMAKE_TARGET_BUNDLE_PREFIX = "com.skycoder42."
} }
!ReleaseBuild:!DebugBuild:!system(qpmx -d $$shell_quote($$_PRO_FILE_PWD_) --qmake-run init $$QPMX_EXTRA_OPTIONS $$shell_quote($$QMAKE_QMAKE) $$shell_quote($$OUT_PWD)): error(qpmx initialization failed. Check the compilation log for details.) QDEP_DEPENDS += \
else: include($$OUT_PWD/qpmx_generated.pri) Skycoder42/QPluginFactory@1.5.0
qpmx_ts_target.files -= $$OUT_PWD/$$QPMX_WORKINGDIR/qtmvvmcore_template.qm
qpmx_ts_target.files += translations/qtmvvmcore_template.ts
# source include for lupdate # source include for lupdate
never_true_for_lupdate { never_true_for_lupdate {
@ -100,4 +93,8 @@ never_true_for_lupdate {
$$files(../imports/mvvmcore/*.qml) $$files(../imports/mvvmcore/*.qml)
} }
mingw: LIBS_PRIVATE += -lQt5Gui -lQt5Core !load(qdep):error("Failed to load qdep feature! Run 'qdep prfgen --qmake $$QMAKE_QMAKE' to create it.")
#replace template qm by ts
QM_FILES -= $$__qdep_lrelease_real_dir/qtmvvmcore_template.qm
QM_FILES += translations/qtmvvmcore_template.ts

26
src/mvvmcore/qpmx.json
View File

@ -1,26 +0,0 @@
{
"dependencies": [
{
"package": "de.skycoder42.qpluginfactory",
"provider": "qpm",
"version": "1.3.1"
},
{
"package": "de.skycoder42.qxmlcodegen",
"provider": "qpm",
"version": "1.3.0"
}
],
"license": {
"file": "",
"name": ""
},
"prcFile": "",
"priFile": "",
"priIncludes": [
],
"publishers": {
},
"qbsFile": "",
"source": false
}

20
src/mvvmdatasynccore/mvvmdatasynccore.pro
View File

@ -36,12 +36,11 @@ TRANSLATIONS += \
translations/qtmvvmdatasynccore_de.ts \ translations/qtmvvmdatasynccore_de.ts \
translations/qtmvvmdatasynccore_template.ts translations/qtmvvmdatasynccore_template.ts
DISTFILES += $$TRANSLATIONS \ DISTFILES += \
application-x-datasync-account-data.xml application-x-datasync-account-data.xml
qpmx_ts_target.path = $$[QT_INSTALL_TRANSLATIONS] CONFIG += lrelease
qpmx_ts_target.depends += lrelease QM_FILES_INSTALL_PATH = $$[QT_INSTALL_TRANSLATIONS]
INSTALLS += qpmx_ts_target
load(qt_module) load(qt_module)
@ -53,11 +52,7 @@ win32 {
QMAKE_TARGET_BUNDLE_PREFIX = "com.skycoder42." QMAKE_TARGET_BUNDLE_PREFIX = "com.skycoder42."
} }
!ReleaseBuild:!DebugBuild:!system(qpmx -d $$shell_quote($$_PRO_FILE_PWD_) --qmake-run init $$QPMX_EXTRA_OPTIONS $$shell_quote($$QMAKE_QMAKE) $$shell_quote($$OUT_PWD)): error(qpmx initialization failed. Check the compilation log for details.) android: QDEP_DEPENDS += Skycoder42/AndroidContentDevice@1.0.0
else: include($$OUT_PWD/qpmx_generated.pri)
qpmx_ts_target.files -= $$OUT_PWD/$$QPMX_WORKINGDIR/qtmvvmdatasynccore_template.qm
qpmx_ts_target.files += translations/qtmvvmdatasynccore_template.ts
# source include for lupdate # source include for lupdate
never_true_for_lupdate { never_true_for_lupdate {
@ -65,4 +60,11 @@ never_true_for_lupdate {
$$files(../imports/mvvmdatasynccore/*.qml) $$files(../imports/mvvmdatasynccore/*.qml)
} }
!load(qdep):error("Failed to load qdep feature! Run 'qdep prfgen --qmake $$QMAKE_QMAKE' to create it.")
#replace template qm by ts
QM_FILES -= $$__qdep_lrelease_real_dir/qtmvvmdatasynccore_template.qm
QM_FILES += translations/qtmvvmdatasynccore_template.ts

20
src/mvvmdatasynccore/qpmx.json
View File

@ -1,20 +0,0 @@
{
"dependencies": [
{
"package": "de.skycoder42.android-contentdevice",
"provider": "qpm",
"version": "1.0.1"
}
],
"license": {
"file": "",
"name": ""
},
"prcFile": "",
"priFile": "",
"priIncludes": [
],
"publishers": {
},
"source": false
}

21
src/mvvmdatasyncquick/mvvmdatasyncquick.pro
View File

@ -15,14 +15,11 @@ TRANSLATIONS += \
translations/qtmvvmdatasyncquick_de.ts \ translations/qtmvvmdatasyncquick_de.ts \
translations/qtmvvmdatasyncquick_template.ts translations/qtmvvmdatasyncquick_template.ts
DISTFILES += $$TRANSLATIONS
qpmx_ts_target.path = $$[QT_INSTALL_TRANSLATIONS]
qpmx_ts_target.depends += lrelease
INSTALLS += qpmx_ts_target
load(qt_module) load(qt_module)
CONFIG += lrelease
QM_FILES_INSTALL_PATH = $$[QT_INSTALL_TRANSLATIONS]
win32 { win32 {
QMAKE_TARGET_PRODUCT = "$$TARGET" QMAKE_TARGET_PRODUCT = "$$TARGET"
QMAKE_TARGET_COMPANY = "Skycoder42" QMAKE_TARGET_COMPANY = "Skycoder42"
@ -31,15 +28,15 @@ win32 {
QMAKE_TARGET_BUNDLE_PREFIX = "com.skycoder42." QMAKE_TARGET_BUNDLE_PREFIX = "com.skycoder42."
} }
!ReleaseBuild:!DebugBuild:!system(qpmx -d $$shell_quote($$_PRO_FILE_PWD_) --qmake-run init $$QPMX_EXTRA_OPTIONS $$shell_quote($$QMAKE_QMAKE) $$shell_quote($$OUT_PWD)): error(qpmx initialization failed. Check the compilation log for details.)
else: include($$OUT_PWD/qpmx_generated.pri)
qpmx_ts_target.files -= $$OUT_PWD/$$QPMX_WORKINGDIR/qtmvvmdatasyncquick_template.qm
qpmx_ts_target.files += translations/qtmvvmdatasyncquick_template.ts
# source include for lupdate # source include for lupdate
never_true_for_lupdate { never_true_for_lupdate {
SOURCES += $$files(../imports/mvvmdatasyncquick/*.cpp) \ SOURCES += $$files(../imports/mvvmdatasyncquick/*.cpp) \
$$files(../imports/mvvmdatasyncquick/*.qml) $$files(../imports/mvvmdatasyncquick/*.qml)
} }
!load(qdep):error("Failed to load qdep feature! Run 'qdep prfgen --qmake $$QMAKE_QMAKE' to create it.")
#replace template qm by ts
QM_FILES -= $$__qdep_lrelease_real_dir/qtmvvmdatasyncquick_template.qm
QM_FILES += translations/qtmvvmdatasyncquick_template.ts

14
src/mvvmdatasyncquick/qpmx.json
View File

@ -1,14 +0,0 @@
{
"dependencies": [],
"license": {
"file": "",
"name": ""
},
"prcFile": "",
"priFile": "",
"priIncludes": [
],
"publishers": {
},
"source": false
}

17
src/mvvmdatasyncwidgets/mvvmdatasyncwidgets.pro
View File

@ -34,14 +34,11 @@ TRANSLATIONS += \
translations/qtmvvmdatasyncwidgets_de.ts \ translations/qtmvvmdatasyncwidgets_de.ts \
translations/qtmvvmdatasyncwidgets_template.ts translations/qtmvvmdatasyncwidgets_template.ts
DISTFILES += $$TRANSLATIONS
qpmx_ts_target.path = $$[QT_INSTALL_TRANSLATIONS]
qpmx_ts_target.depends += lrelease
INSTALLS += qpmx_ts_target
load(qt_module) load(qt_module)
CONFIG += lrelease
QM_FILES_INSTALL_PATH = $$[QT_INSTALL_TRANSLATIONS]
win32 { win32 {
QMAKE_TARGET_PRODUCT = "$$TARGET" QMAKE_TARGET_PRODUCT = "$$TARGET"
QMAKE_TARGET_COMPANY = "Skycoder42" QMAKE_TARGET_COMPANY = "Skycoder42"
@ -50,8 +47,8 @@ win32 {
QMAKE_TARGET_BUNDLE_PREFIX = "com.skycoder42." QMAKE_TARGET_BUNDLE_PREFIX = "com.skycoder42."
} }
!ReleaseBuild:!DebugBuild:!system(qpmx -d $$shell_quote($$_PRO_FILE_PWD_) --qmake-run init $$QPMX_EXTRA_OPTIONS $$shell_quote($$QMAKE_QMAKE) $$shell_quote($$OUT_PWD)): error(qpmx initialization failed. Check the compilation log for details.) !load(qdep):error("Failed to load qdep feature! Run 'qdep prfgen --qmake $$QMAKE_QMAKE' to create it.")
else: include($$OUT_PWD/qpmx_generated.pri)
qpmx_ts_target.files -= $$OUT_PWD/$$QPMX_WORKINGDIR/qtmvvmdatasyncwidgets_template.qm #replace template qm by ts
qpmx_ts_target.files += translations/qtmvvmdatasyncwidgets_template.ts QM_FILES -= $$__qdep_lrelease_real_dir/qtmvvmdatasyncwidgets_template.qm
QM_FILES += translations/qtmvvmdatasyncwidgets_template.ts

14
src/mvvmdatasyncwidgets/qpmx.json
View File

@ -1,14 +0,0 @@
{
"dependencies": [],
"license": {
"file": "",
"name": ""
},
"prcFile": "",
"priFile": "",
"priIncludes": [
],
"publishers": {
},
"source": false
}

24
src/mvvmquick/mvvmquick.pro
View File

@ -21,14 +21,11 @@ TRANSLATIONS += \
translations/qtmvvmquick_de.ts \ translations/qtmvvmquick_de.ts \
translations/qtmvvmquick_template.ts translations/qtmvvmquick_template.ts
DISTFILES += $$TRANSLATIONS
qpmx_ts_target.path = $$[QT_INSTALL_TRANSLATIONS]
qpmx_ts_target.depends += lrelease
INSTALLS += qpmx_ts_target
load(qt_module) load(qt_module)
CONFIG += lrelease
QM_FILES_INSTALL_PATH = $$[QT_INSTALL_TRANSLATIONS]
win32 { win32 {
QMAKE_TARGET_PRODUCT = "$$TARGET" QMAKE_TARGET_PRODUCT = "$$TARGET"
QMAKE_TARGET_COMPANY = "Skycoder42" QMAKE_TARGET_COMPANY = "Skycoder42"
@ -37,16 +34,17 @@ win32 {
QMAKE_TARGET_BUNDLE_PREFIX = "com.skycoder42." QMAKE_TARGET_BUNDLE_PREFIX = "com.skycoder42."
} }
!ReleaseBuild:!DebugBuild:!system(qpmx -d $$shell_quote($$_PRO_FILE_PWD_) --qmake-run init $$QPMX_EXTRA_OPTIONS $$shell_quote($$QMAKE_QMAKE) $$shell_quote($$OUT_PWD)): error(qpmx initialization failed. Check the compilation log for details.) QDEP_DEPENDS += \
else: include($$OUT_PWD/qpmx_generated.pri) Skycoder42/QUrlValidator@1.2.0
qpmx_ts_target.files -= $$OUT_PWD/$$QPMX_WORKINGDIR/qtmvvmquick_template.qm
qpmx_ts_target.files += translations/qtmvvmquick_template.ts
mingw: LIBS_PRIVATE += -lQt5Gui -lQt5Core
# source include for lupdate # source include for lupdate
never_true_for_lupdate { never_true_for_lupdate {
SOURCES += $$files(../imports/mvvmquick/*.cpp) \ SOURCES += $$files(../imports/mvvmquick/*.cpp) \
$$files(../imports/mvvmquick/*.qml) $$files(../imports/mvvmquick/*.qml)
} }
!load(qdep):error("Failed to load qdep feature! Run 'qdep prfgen --qmake $$QMAKE_QMAKE' to create it.")
#replace template qm by ts
QM_FILES -= $$__qdep_lrelease_real_dir/qtmvvmquick_template.qm
QM_FILES += translations/qtmvvmquick_template.ts

20
src/mvvmquick/qpmx.json
View File

@ -1,20 +0,0 @@
{
"dependencies": [
{
"package": "de.skycoder42.qurlvalidator",
"provider": "qpm",
"version": "1.1.0"
}
],
"license": {
"file": "",
"name": ""
},
"prcFile": "",
"priFile": "",
"priIncludes": [
],
"publishers": {
},
"source": false
}

19
src/mvvmwidgets/mvvmwidgets.pro
View File

@ -37,11 +37,8 @@ TRANSLATIONS += \
translations/qtmvvmwidgets_de.ts \ translations/qtmvvmwidgets_de.ts \
translations/qtmvvmwidgets_template.ts translations/qtmvvmwidgets_template.ts
DISTFILES += $$TRANSLATIONS CONFIG += lrelease
QM_FILES_INSTALL_PATH = $$[QT_INSTALL_TRANSLATIONS]
qpmx_ts_target.path = $$[QT_INSTALL_TRANSLATIONS]
qpmx_ts_target.depends += lrelease
INSTALLS += qpmx_ts_target
load(qt_module) load(qt_module)
@ -53,10 +50,12 @@ win32 {
QMAKE_TARGET_BUNDLE_PREFIX = "com.skycoder42." QMAKE_TARGET_BUNDLE_PREFIX = "com.skycoder42."
} }
!ReleaseBuild:!DebugBuild:!system(qpmx -d $$shell_quote($$_PRO_FILE_PWD_) --qmake-run init $$QPMX_EXTRA_OPTIONS $$shell_quote($$QMAKE_QMAKE) $$shell_quote($$OUT_PWD)): error(qpmx initialization failed. Check the compilation log for details.) QDEP_DEPENDS += \
else: include($$OUT_PWD/qpmx_generated.pri) Skycoder42/DialogMaster@1.4.0 \
Skycoder42/QUrlValidator@1.2.0
qpmx_ts_target.files -= $$OUT_PWD/$$QPMX_WORKINGDIR/qtmvvmwidgets_template.qm !load(qdep):error("Failed to load qdep feature! Run 'qdep prfgen --qmake $$QMAKE_QMAKE' to create it.")
qpmx_ts_target.files += translations/qtmvvmwidgets_template.ts
mingw: LIBS_PRIVATE += -lQt5Widgets -lQt5Gui -lQt5Core #replace template qm by ts
QM_FILES -= $$__qdep_lrelease_real_dir/qtmvvmwidgets_template.qm
QM_FILES += translations/qtmvvmwidgets_template.ts

25
src/mvvmwidgets/qpmx.json
View File

@ -1,25 +0,0 @@
{
"dependencies": [
{
"package": "de.skycoder42.dialog-master",
"provider": "qpm",
"version": "1.3.2"
},
{
"package": "de.skycoder42.qurlvalidator",
"provider": "qpm",
"version": "1.1.0"
}
],
"license": {
"file": "",
"name": ""
},
"prcFile": "",
"priFile": "",
"priIncludes": [
],
"publishers": {
},
"source": false
}

3
src/settingsconfig/settingsconfig.pri
View File

@ -12,3 +12,6 @@ INCLUDEPATH += $$PWD $$PWD/../3rdparty/optional-lite $$PWD/../3rdparty/variant-l
contains(QT, xmlpatterns): RESOURCES += \ contains(QT, xmlpatterns): RESOURCES += \
$$PWD/settingsconfig.qrc $$PWD/settingsconfig.qrc
QDEP_DEPENDS += \
Skycoder42/QXmlCodeGen@1.4.1

8
tests/auto/mvvmcore/settingsgenerator/test_de.ts
View File

@ -12,7 +12,7 @@
<context> <context>
<name>generatortest.xml</name> <name>generatortest.xml</name>
<message> <message>
<location filename="../../../../../build-qtmvvm-Desktop_Qt_5_11_2_GCC_64bit-Debug/tests/auto/mvvmcore/settingsgenerator/generatortest.cpp" line="+34"/> <location filename="../../../../../build-qtmvvm-Desktop_Qt_5_12_1_GCC_64bit-Debug/tests/auto/mvvmcore/settingsgenerator/generatortest.cpp" line="+34"/>
<source>translate me</source> <source>translate me</source>
<translation type="unfinished"></translation> <translation type="unfinished"></translation>
</message> </message>
@ -20,7 +20,7 @@
<context> <context>
<name>import_config.xml</name> <name>import_config.xml</name>
<message> <message>
<location filename="../../../../../build-qtmvvm-Desktop_Qt_5_11_2_GCC_64bit-Debug/tests/auto/mvvmcore/settingsgenerator/importtest.cpp" line="+29"/> <location filename="../../../../../build-qtmvvm-Desktop_Qt_5_12_1_GCC_64bit-Debug/tests/auto/mvvmcore/settingsgenerator/importtest.cpp" line="+29"/>
<source>42</source> <source>42</source>
<translation type="unfinished"></translation> <translation type="unfinished"></translation>
</message> </message>
@ -36,7 +36,7 @@
<context> <context>
<name>some_context</name> <name>some_context</name>
<message> <message>
<location filename="../../../../../build-qtmvvm-Desktop_Qt_5_11_2_GCC_64bit-Debug/tests/auto/mvvmcore/settingsgenerator/generatortest.cpp" line="-5"/> <location filename="../../../../../build-qtmvvm-Desktop_Qt_5_12_1_GCC_64bit-Debug/tests/auto/mvvmcore/settingsgenerator/generatortest.cpp" line="-5"/>
<source>Hello World</source> <source>Hello World</source>
<translation type="unfinished"></translation> <translation type="unfinished"></translation>
</message> </message>
@ -44,7 +44,7 @@
<context> <context>
<name>translatortest.xml</name> <name>translatortest.xml</name>
<message> <message>
<location filename="../../../../../build-qtmvvm-Desktop_Qt_5_11_2_GCC_64bit-Debug/tests/auto/mvvmcore/settingsgenerator/.tr-dummies/translatortest.tsdummy.cpp" line="+7"/> <location filename="../../../../../build-qtmvvm-Desktop_Qt_5_12_1_GCC_64bit-Debug/tests/auto/mvvmcore/settingsgenerator/.tr-dummies/translatortest.tsdummy.cpp" line="+7"/>
<source>dummy</source> <source>dummy</source>
<translation type="unfinished"></translation> <translation type="unfinished"></translation>
</message> </message>

21
tools/settingsgenerator/qpmx.json
View File

@ -1,21 +0,0 @@
{
"dependencies": [
{
"package": "de.skycoder42.qxmlcodegen",
"provider": "qpm",
"version": "1.3.0"
}
],
"license": {
"file": "",
"name": ""
},
"prcFile": "",
"priFile": "",
"priIncludes": [
],
"publishers": {
},
"qbsFile": "",
"source": false
}

3
tools/settingsgenerator/settingsgenerator.pro
View File

@ -44,5 +44,4 @@ win32 {
QMAKE_TARGET_BUNDLE_PREFIX = $${BUNDLE_PREFIX}. QMAKE_TARGET_BUNDLE_PREFIX = $${BUNDLE_PREFIX}.
} }
!ReleaseBuild:!DebugBuild:!system(qpmx -d $$shell_quote($$_PRO_FILE_PWD_) --qmake-run init $$QPMX_EXTRA_OPTIONS $$shell_quote($$QMAKE_QMAKE) $$shell_quote($$OUT_PWD)): error(qpmx initialization failed. Check the compilation log for details.) !load(qdep):error("Failed to load qdep feature! Run 'qdep prfgen --qmake $$QMAKE_QMAKE' to create it.")
else: include($$OUT_PWD/qpmx_generated.pri)

Write Preview
Loading…
Cancel
Save