diff options
| author | Qt Forward Merge Bot <qt_forward_merge_bot@qt-project.org> | 2018-12-10 13:21:20 +0100 |
|---|---|---|
| committer | Qt Forward Merge Bot <qt_forward_merge_bot@qt-project.org> | 2018-12-10 13:21:20 +0100 |
| commit | 074b73089a4d8e4966ddcab5cdd5e9ec0ac6181a (patch) | |
| tree | e250549b5f77781bdf8e4fcf3e830e179dde472c /translations/qt_ca.ts | |
| parent | 350e19a33858960f513c9e6f2cd57839e9ed04a5 (diff) | |
| parent | c49e22e0b3a48b67f481f7362b74d90e6596b60f (diff) | |
| download | qttranslations-074b73089a4d8e4966ddcab5cdd5e9ec0ac6181a.tar.gz | |
Merge remote-tracking branch 'origin/5.11' into 5.12
Conflicts:
.qmake.conf
Change-Id: I041ad0f06248a398bf67e36de46d88200f0eb784
Diffstat (limited to 'translations/qt_ca.ts')
| -rw-r--r-- | translations/qt_ca.ts | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/translations/qt_ca.ts b/translations/qt_ca.ts index 81dc4ab..ec628ba 100644 --- a/translations/qt_ca.ts +++ b/translations/qt_ca.ts @@ -4,7 +4,6 @@ <dependencies> <dependency catalog="qtbase_ca"/> <dependency catalog="qtscript_ca"/> -<dependency catalog="qtquick1_ca"/> <dependency catalog="qtmultimedia_ca"/> <dependency catalog="qtxmlpatterns_ca"/> </dependencies> |