diff options
| author | Oswald Buddenhagen <oswald.buddenhagen@qt.io> | 2018-03-19 15:35:45 +0100 |
|---|---|---|
| committer | Oswald Buddenhagen <oswald.buddenhagen@qt.io> | 2018-03-19 15:35:45 +0100 |
| commit | 20f821fc8b8d5b4091e19ef070b4979632835628 (patch) | |
| tree | c14622fd2dc41d7acbf58232859c19ec41215b63 /translations/translations.pro | |
| parent | 6ccd65767806d0b03763e0a0ae5efc341fd32486 (diff) | |
| parent | 1c22aa4029920619404c3162656b5749189ea6f8 (diff) | |
Merge branch '5.6' into 5.9v5.9.5
Conflicts:
.qmake.conf
translations/qtconfig_pl.ts
translations/qtconfig_ru.ts
Change-Id: I79eb321dac96c67e1abf7af78238ec415a3236fb
Diffstat (limited to 'translations/translations.pro')
| -rw-r--r-- | translations/translations.pro | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/translations/translations.pro b/translations/translations.pro index f4b38a8..694544c 100644 --- a/translations/translations.pro +++ b/translations/translations.pro @@ -72,7 +72,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(qtconfig, qttools/src/qtconfig/qtconfig.pro) # dead tool addTsTargets(qmlviewer, qtquick1/tools/qml/qml.pro) #addTsTargets(qmlscene, qtdeclarative/tools/qmlscene/qmlscene.pro) # almost empty due to missing tr() |