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

Commit 7f86674

Browse files
Skycoder42Skycoder42
committed
ported to qdep
1 parent b4a7352 commit 7f86674

File tree

17 files changed

+81
-229
lines changed

17 files changed

+81
-229
lines changed

‎examples/mvvmcore/SampleCore/samplecore_de.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -106,7 +106,7 @@
106106
<context>
107107
<name>settings.xml</name>
108108
<message>
109-
<location filename="../../../../build-qtmvvm-Desktop_Qt_5_11_2_GCC_64bit-Debug/examples/mvvmcore/SampleCore/.tr-dummies/settings.tsdummy.cpp" line="+7"/>
109+
<location filename="../../../../build-qtmvvm-Desktop_Qt_5_12_1_GCC_64bit-Debug/examples/mvvmcore/SampleCore/.tr-dummies/settings.tsdummy.cpp" line="+7"/>
110110
<source>&amp;Check me</source>
111111
<translation type="unfinished"></translation>
112112
</message>

‎src/mvvmcore/mvvmcore.pro

Lines changed: 11 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -60,16 +60,9 @@ TRANSLATIONS += \
6060
translations/qtmvvmcore_de.ts \
6161
translations/qtmvvmcore_template.ts
6262

63-
DISTFILES += $$TRANSLATIONS
64-
6563
load(qt_module)
6664
lib_bundle: FRAMEWORK_HEADERS.files += $$absolute_path(ViewModel, $$INC_PATH/include/$$MODULE_INCNAME)
6765
else: gen_headers.files += $$absolute_path(ViewModel, $$INC_PATH/include/$$MODULE_INCNAME)
68-
lib_bundle: message($$FRAMEWORK_HEADERS.files)
69-
else: message($$gen_headers.files)
70-
71-
qpmx_ts_target.path = $$[QT_INSTALL_TRANSLATIONS]
72-
qpmx_ts_target.depends += lrelease
7366

7467
FEATURES += \
7568
../../mkspecs/features/qsettingsgenerator.prf \
@@ -78,7 +71,10 @@ FEATURES += \
7871
features.files = $$FEATURES
7972
features.path = $$[QT_HOST_DATA]/mkspecs/features/
8073

81-
INSTALLS += qpmx_ts_target features
74+
INSTALLS += features
75+
76+
CONFIG += lrelease
77+
QM_FILES_INSTALL_PATH = $$[QT_INSTALL_TRANSLATIONS]
8278

8379
win32 {
8480
QMAKE_TARGET_PRODUCT = "$$TARGET"
@@ -88,16 +84,17 @@ win32 {
8884
QMAKE_TARGET_BUNDLE_PREFIX = "com.skycoder42."
8985
}
9086

91-
!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.)
92-
else: include($$OUT_PWD/qpmx_generated.pri)
93-
94-
qpmx_ts_target.files -= $$OUT_PWD/$$QPMX_WORKINGDIR/qtmvvmcore_template.qm
95-
qpmx_ts_target.files += translations/qtmvvmcore_template.ts
87+
QDEP_DEPENDS += \
88+
Skycoder42/QPluginFactory@1.5.0
9689

9790
# source include for lupdate
9891
never_true_for_lupdate {
9992
SOURCES += $$files(../imports/mvvmcore/*.cpp) \
10093
$$files(../imports/mvvmcore/*.qml)
10194
}
10295

103-
mingw: LIBS_PRIVATE += -lQt5Gui -lQt5Core
96+
!load(qdep):error("Failed to load qdep feature! Run 'qdep prfgen --qmake $$QMAKE_QMAKE' to create it.")
97+
98+
#replace template qm by ts
99+
QM_FILES -= $$__qdep_lrelease_real_dir/qtmvvmcore_template.qm
100+
QM_FILES += translations/qtmvvmcore_template.ts

‎src/mvvmcore/qpmx.json

Lines changed: 0 additions & 26 deletions
This file was deleted.

‎src/mvvmdatasynccore/mvvmdatasynccore.pro

Lines changed: 11 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -36,12 +36,11 @@ TRANSLATIONS += \
3636
translations/qtmvvmdatasynccore_de.ts \
3737
translations/qtmvvmdatasynccore_template.ts
3838

39-
DISTFILES += $$TRANSLATIONS \
39+
DISTFILES += \
4040
application-x-datasync-account-data.xml
4141

42-
qpmx_ts_target.path = $$[QT_INSTALL_TRANSLATIONS]
43-
qpmx_ts_target.depends += lrelease
44-
INSTALLS += qpmx_ts_target
42+
CONFIG += lrelease
43+
QM_FILES_INSTALL_PATH = $$[QT_INSTALL_TRANSLATIONS]
4544

4645
load(qt_module)
4746

@@ -53,16 +52,19 @@ win32 {
5352
QMAKE_TARGET_BUNDLE_PREFIX = "com.skycoder42."
5453
}
5554

56-
!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.)
57-
else: include($$OUT_PWD/qpmx_generated.pri)
58-
59-
qpmx_ts_target.files -= $$OUT_PWD/$$QPMX_WORKINGDIR/qtmvvmdatasynccore_template.qm
60-
qpmx_ts_target.files += translations/qtmvvmdatasynccore_template.ts
55+
android: QDEP_DEPENDS += Skycoder42/AndroidContentDevice@1.0.0
6156

6257
# source include for lupdate
6358
never_true_for_lupdate {
6459
SOURCES += $$files(../imports/mvvmdatasynccore/*.cpp) \
6560
$$files(../imports/mvvmdatasynccore/*.qml)
6661
}
6762

63+
!load(qdep):error("Failed to load qdep feature! Run 'qdep prfgen --qmake $$QMAKE_QMAKE' to create it.")
64+
65+
#replace template qm by ts
66+
QM_FILES -= $$__qdep_lrelease_real_dir/qtmvvmdatasynccore_template.qm
67+
QM_FILES += translations/qtmvvmdatasynccore_template.ts
68+
69+
6870

‎src/mvvmdatasynccore/qpmx.json

Lines changed: 0 additions & 20 deletions
This file was deleted.

‎src/mvvmdatasyncquick/mvvmdatasyncquick.pro

Lines changed: 9 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -15,14 +15,11 @@ TRANSLATIONS += \
1515
translations/qtmvvmdatasyncquick_de.ts \
1616
translations/qtmvvmdatasyncquick_template.ts
1717

18-
DISTFILES += $$TRANSLATIONS
19-
20-
qpmx_ts_target.path = $$[QT_INSTALL_TRANSLATIONS]
21-
qpmx_ts_target.depends += lrelease
22-
INSTALLS += qpmx_ts_target
23-
2418
load(qt_module)
2519

20+
CONFIG += lrelease
21+
QM_FILES_INSTALL_PATH = $$[QT_INSTALL_TRANSLATIONS]
22+
2623
win32 {
2724
QMAKE_TARGET_PRODUCT = "$$TARGET"
2825
QMAKE_TARGET_COMPANY = "Skycoder42"
@@ -31,15 +28,15 @@ win32 {
3128
QMAKE_TARGET_BUNDLE_PREFIX = "com.skycoder42."
3229
}
3330

34-
!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.)
35-
else: include($$OUT_PWD/qpmx_generated.pri)
36-
37-
qpmx_ts_target.files -= $$OUT_PWD/$$QPMX_WORKINGDIR/qtmvvmdatasyncquick_template.qm
38-
qpmx_ts_target.files += translations/qtmvvmdatasyncquick_template.ts
39-
4031
# source include for lupdate
4132
never_true_for_lupdate {
4233
SOURCES += $$files(../imports/mvvmdatasyncquick/*.cpp) \
4334
$$files(../imports/mvvmdatasyncquick/*.qml)
4435
}
4536

37+
!load(qdep):error("Failed to load qdep feature! Run 'qdep prfgen --qmake $$QMAKE_QMAKE' to create it.")
38+
39+
#replace template qm by ts
40+
QM_FILES -= $$__qdep_lrelease_real_dir/qtmvvmdatasyncquick_template.qm
41+
QM_FILES += translations/qtmvvmdatasyncquick_template.ts
42+

‎src/mvvmdatasyncquick/qpmx.json

Lines changed: 0 additions & 14 deletions
This file was deleted.

‎src/mvvmdatasyncwidgets/mvvmdatasyncwidgets.pro

Lines changed: 7 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -34,14 +34,11 @@ TRANSLATIONS += \
3434
translations/qtmvvmdatasyncwidgets_de.ts \
3535
translations/qtmvvmdatasyncwidgets_template.ts
3636

37-
DISTFILES += $$TRANSLATIONS
38-
39-
qpmx_ts_target.path = $$[QT_INSTALL_TRANSLATIONS]
40-
qpmx_ts_target.depends += lrelease
41-
INSTALLS += qpmx_ts_target
42-
4337
load(qt_module)
4438

39+
CONFIG += lrelease
40+
QM_FILES_INSTALL_PATH = $$[QT_INSTALL_TRANSLATIONS]
41+
4542
win32 {
4643
QMAKE_TARGET_PRODUCT = "$$TARGET"
4744
QMAKE_TARGET_COMPANY = "Skycoder42"
@@ -50,8 +47,8 @@ win32 {
5047
QMAKE_TARGET_BUNDLE_PREFIX = "com.skycoder42."
5148
}
5249

53-
!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.)
54-
else: include($$OUT_PWD/qpmx_generated.pri)
50+
!load(qdep):error("Failed to load qdep feature! Run 'qdep prfgen --qmake $$QMAKE_QMAKE' to create it.")
5551

56-
qpmx_ts_target.files -= $$OUT_PWD/$$QPMX_WORKINGDIR/qtmvvmdatasyncwidgets_template.qm
57-
qpmx_ts_target.files += translations/qtmvvmdatasyncwidgets_template.ts
52+
#replace template qm by ts
53+
QM_FILES -= $$__qdep_lrelease_real_dir/qtmvvmdatasyncwidgets_template.qm
54+
QM_FILES += translations/qtmvvmdatasyncwidgets_template.ts

‎src/mvvmdatasyncwidgets/qpmx.json

Lines changed: 0 additions & 14 deletions
This file was deleted.

‎src/mvvmquick/mvvmquick.pro

Lines changed: 11 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -21,14 +21,11 @@ TRANSLATIONS += \
2121
translations/qtmvvmquick_de.ts \
2222
translations/qtmvvmquick_template.ts
2323

24-
DISTFILES += $$TRANSLATIONS
25-
26-
qpmx_ts_target.path = $$[QT_INSTALL_TRANSLATIONS]
27-
qpmx_ts_target.depends += lrelease
28-
INSTALLS += qpmx_ts_target
29-
3024
load(qt_module)
3125

26+
CONFIG += lrelease
27+
QM_FILES_INSTALL_PATH = $$[QT_INSTALL_TRANSLATIONS]
28+
3229
win32 {
3330
QMAKE_TARGET_PRODUCT = "$$TARGET"
3431
QMAKE_TARGET_COMPANY = "Skycoder42"
@@ -37,16 +34,17 @@ win32 {
3734
QMAKE_TARGET_BUNDLE_PREFIX = "com.skycoder42."
3835
}
3936

40-
!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.)
41-
else: include($$OUT_PWD/qpmx_generated.pri)
42-
43-
qpmx_ts_target.files -= $$OUT_PWD/$$QPMX_WORKINGDIR/qtmvvmquick_template.qm
44-
qpmx_ts_target.files += translations/qtmvvmquick_template.ts
45-
46-
mingw: LIBS_PRIVATE += -lQt5Gui -lQt5Core
37+
QDEP_DEPENDS += \
38+
Skycoder42/QUrlValidator@1.2.0
4739

4840
# source include for lupdate
4941
never_true_for_lupdate {
5042
SOURCES += $$files(../imports/mvvmquick/*.cpp) \
5143
$$files(../imports/mvvmquick/*.qml)
5244
}
45+
46+
!load(qdep):error("Failed to load qdep feature! Run 'qdep prfgen --qmake $$QMAKE_QMAKE' to create it.")
47+
48+
#replace template qm by ts
49+
QM_FILES -= $$__qdep_lrelease_real_dir/qtmvvmquick_template.qm
50+
QM_FILES += translations/qtmvvmquick_template.ts

‎src/mvvmquick/qpmx.json

Lines changed: 0 additions & 20 deletions
This file was deleted.

‎src/mvvmwidgets/mvvmwidgets.pro

Lines changed: 15 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -13,19 +13,19 @@ HEADERS += \
1313
inputwidgetfactory_p.h \
1414
settingsdialog_p.h \
1515
settingsdialog.h \
16-
tooltipslider_p.h \
17-
coloredit_p.h \
18-
progressdialog_p.h
16+
tooltipslider_p.h \
17+
coloredit_p.h \
18+
progressdialog_p.h
1919

2020
SOURCES += \
2121
widgetspresenter.cpp \
2222
fontcombobox.cpp \
2323
selectcombobox.cpp \
2424
inputwidgetfactory.cpp \
2525
settingsdialog.cpp \
26-
tooltipslider.cpp \
27-
coloredit.cpp \
28-
progressdialog.cpp
26+
tooltipslider.cpp \
27+
coloredit.cpp \
28+
progressdialog.cpp
2929

3030
FORMS += \
3131
settingsdialog.ui
@@ -37,11 +37,8 @@ TRANSLATIONS += \
3737
translations/qtmvvmwidgets_de.ts \
3838
translations/qtmvvmwidgets_template.ts
3939

40-
DISTFILES += $$TRANSLATIONS
41-
42-
qpmx_ts_target.path = $$[QT_INSTALL_TRANSLATIONS]
43-
qpmx_ts_target.depends += lrelease
44-
INSTALLS += qpmx_ts_target
40+
CONFIG += lrelease
41+
QM_FILES_INSTALL_PATH = $$[QT_INSTALL_TRANSLATIONS]
4542

4643
load(qt_module)
4744

@@ -53,10 +50,12 @@ win32 {
5350
QMAKE_TARGET_BUNDLE_PREFIX = "com.skycoder42."
5451
}
5552

56-
!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.)
57-
else: include($$OUT_PWD/qpmx_generated.pri)
53+
QDEP_DEPENDS += \
54+
Skycoder42/DialogMaster@1.4.0 \
55+
Skycoder42/QUrlValidator@1.2.0
5856

59-
qpmx_ts_target.files -= $$OUT_PWD/$$QPMX_WORKINGDIR/qtmvvmwidgets_template.qm
60-
qpmx_ts_target.files += translations/qtmvvmwidgets_template.ts
57+
!load(qdep):error("Failed to load qdep feature! Run 'qdep prfgen --qmake $$QMAKE_QMAKE' to create it.")
6158

62-
mingw: LIBS_PRIVATE += -lQt5Widgets -lQt5Gui -lQt5Core
59+
#replace template qm by ts
60+
QM_FILES -= $$__qdep_lrelease_real_dir/qtmvvmwidgets_template.qm
61+
QM_FILES += translations/qtmvvmwidgets_template.ts

‎src/mvvmwidgets/qpmx.json

Lines changed: 0 additions & 25 deletions
This file was deleted.

0 commit comments

Comments
 (0)