diff options
| author | Oswald Buddenhagen <oswald.buddenhagen@gmx.de> | 2020-01-20 14:18:51 +0100 |
|---|---|---|
| committer | Oswald Buddenhagen <oswald.buddenhagen@gmx.de> | 2020-01-20 14:18:51 +0100 |
| commit | 9d7437583d7475aa069ec5aa786fa9c5aa36253b (patch) | |
| tree | 2d3c701d6bb6b73ef672861cbba59a9c7d20d963 /translations/qt_fr.ts | |
| parent | ab5af4c676b80a69e0f1b8459d4c081a43f63313 (diff) | |
| parent | 8b7c8801f2317bef8e21e9080ce242cbb7818a98 (diff) | |
| download | qttranslations-9d7437583d7475aa069ec5aa786fa9c5aa36253b.tar.gz | |
Merge remote-tracking branch 'origin/5.14' into 5.15v5.15.0-beta1v5.15.0-alpha1
Conflicts:
.qmake.conf
Change-Id: I1e8be960904114ec17ce1c6799b1054255ce0e91
Diffstat (limited to 'translations/qt_fr.ts')
| -rw-r--r-- | translations/qt_fr.ts | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/translations/qt_fr.ts b/translations/qt_fr.ts index e051fc1..9744bad 100644 --- a/translations/qt_fr.ts +++ b/translations/qt_fr.ts @@ -4,7 +4,6 @@ <dependencies> <dependency catalog="qtbase_fr"/> <dependency catalog="qtscript_fr"/> - <dependency catalog="qtquick1_fr"/> <dependency catalog="qtmultimedia_fr"/> <dependency catalog="qtxmlpatterns_fr"/> </dependencies> |