diff options
Diffstat (limited to 'src')
| -rw-r--r-- | src/qml/doc/qtqml.qdocconf | 1 | ||||
| -rw-r--r-- | src/qml/doc/snippets/cmake/qt_add_translations.cmake | 7 | ||||
| -rw-r--r-- | src/qml/qml/qqmlapplicationengine.cpp | 2 | ||||
| -rw-r--r-- | src/qmlcompiler/doc/qtqmlcompiler.qdocconf | 1 | ||||
| -rw-r--r-- | src/quick/doc/qtquick.qdocconf | 1 |
5 files changed, 8 insertions, 4 deletions
diff --git a/src/qml/doc/qtqml.qdocconf b/src/qml/doc/qtqml.qdocconf index f5b66743e4..1a235e4771 100644 --- a/src/qml/doc/qtqml.qdocconf +++ b/src/qml/doc/qtqml.qdocconf @@ -40,7 +40,6 @@ depends += \ qtgui \ qtquick \ qtdoc \ - qtlinguist \ qtwidgets \ qtquickcontrols \ qmake \ diff --git a/src/qml/doc/snippets/cmake/qt_add_translations.cmake b/src/qml/doc/snippets/cmake/qt_add_translations.cmake new file mode 100644 index 0000000000..4820a2ec6b --- /dev/null +++ b/src/qml/doc/snippets/cmake/qt_add_translations.cmake @@ -0,0 +1,7 @@ +#![0] +qt_add_translations(App + RESOURCE_PREFIX /qt/qml/Translated/i18n + TS_FILE_BASE qml + TS_FILE_DIR i18n +) +#![0] diff --git a/src/qml/qml/qqmlapplicationengine.cpp b/src/qml/qml/qqmlapplicationengine.cpp index 108312a859..c6e6716af6 100644 --- a/src/qml/qml/qqmlapplicationengine.cpp +++ b/src/qml/qml/qqmlapplicationengine.cpp @@ -249,7 +249,7 @@ void QQmlApplicationEnginePrivate::updateTranslationDirectory(const QUrl &url) needs to include the resource prefix of the main file's QML module (\e{/qt/qml} by default) and the module URI. For example, to provide translation files for a module called "Translated": - \snippet qml-i18n/CMakeLists.txt 0 + \snippet cmake/qt_add_translations.cmake 0 */ /*! diff --git a/src/qmlcompiler/doc/qtqmlcompiler.qdocconf b/src/qmlcompiler/doc/qtqmlcompiler.qdocconf index b21cdee9f5..fa1a7d1458 100644 --- a/src/qmlcompiler/doc/qtqmlcompiler.qdocconf +++ b/src/qmlcompiler/doc/qtqmlcompiler.qdocconf @@ -33,7 +33,6 @@ depends += \ qtgui \ qtquick \ qtdoc \ - qtlinguist \ qtwidgets \ qtquickcontrols \ qmake \ diff --git a/src/quick/doc/qtquick.qdocconf b/src/quick/doc/qtquick.qdocconf index 807b44ec6e..872428ed8f 100644 --- a/src/quick/doc/qtquick.qdocconf +++ b/src/quick/doc/qtquick.qdocconf @@ -51,7 +51,6 @@ depends += \ qtqmltest \ qtqmlcore \ qtgui \ - qtlinguist \ qtlottie \ qtquickcontrols \ qtquick3d \ |