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/translations.pro | |
| parent | 350e19a33858960f513c9e6f2cd57839e9ed04a5 (diff) | |
| parent | c49e22e0b3a48b67f481f7362b74d90e6596b60f (diff) | |
Merge remote-tracking branch 'origin/5.11' into 5.12
Conflicts:
.qmake.conf
Change-Id: I041ad0f06248a398bf67e36de46d88200f0eb784
Diffstat (limited to 'translations/translations.pro')
| -rw-r--r-- | translations/translations.pro | 2 |
1 files changed, 0 insertions, 2 deletions
diff --git a/translations/translations.pro b/translations/translations.pro index 694544c..d403626 100644 --- a/translations/translations.pro +++ b/translations/translations.pro @@ -49,7 +49,6 @@ addTsTargets(qtdeclarative, qtdeclarative/src/src.pro) addTsTargets(qtquickcontrols, qtquickcontrols/src/src.pro) addTsTargets(qtquickcontrols2, qtquickcontrols2/src/src.pro) addTsTargets(qtmultimedia, qtmultimedia/src/src.pro) -addTsTargets(qtquick1, qtquick1/src/src.pro) addTsTargets(qtscript, qtscript/src/src.pro) #addTsTargets(qtsvg, qtsvg/src/src.pro) # empty addTsTargets(qtxmlpatterns, qtxmlpatterns/src/src.pro) @@ -72,7 +71,6 @@ addTsTargets(designer, qttools/src/designer/designer.pro) addTsTargets(linguist, qttools/src/linguist/linguist/linguist.pro) addTsTargets(assistant, qttools/src/assistant/assistant/assistant.pro) # add qcollectiongenerator here as well? addTsTargets(qt_help, qttools/src/assistant/help/help.pro) -addTsTargets(qmlviewer, qtquick1/tools/qml/qml.pro) #addTsTargets(qmlscene, qtdeclarative/tools/qmlscene/qmlscene.pro) # almost empty due to missing tr() check-ts.commands = (cd $$PWD && perl check-ts.pl) |