|
[-]
[+]
|
Changed |
_service:tar_git:qttools.spec
|
|
|
|
[-]
[+]
|
Changed |
_service
^
|
| @@ -2,6 +2,6 @@
<service name="tar_git">
<param name="url">https://github.com/sailfishos-chum/qttools.git</param>
<param name="branch"></param>
- <param name="revision">5.15.9+kde1</param>
+ <param name="revision">5.15.10+kde3</param>
</service>
</services>
|
|
[-]
[+]
|
Changed |
_service:tar_git:opt-qt5-qttools-5.15.10+kde3.tar.bz2/upstream/.qmake.conf
^
|
| @@ -2,4 +2,4 @@
DEFINES += QT_NO_JAVA_STYLE_ITERATORS QT_NO_LINKED_LIST
-MODULE_VERSION = 5.15.9
+MODULE_VERSION = 5.15.10
|
|
[-]
[+]
|
Changed |
_service:tar_git:opt-qt5-qttools-5.15.10+kde3.tar.bz2/upstream/src/assistant/help/help.pro
^
|
| @@ -1,7 +1,6 @@
TARGET = QtHelp
QT = core-private gui widgets sql
-QT_PRIVATE = network
DEFINES += QHELP_LIB
|
|
[-]
[+]
|
Changed |
_service:tar_git:opt-qt5-qttools-5.15.10+kde3.tar.bz2/upstream/src/assistant/qhelpgenerator/qhelpgenerator.pro
^
|
| @@ -1,4 +1,4 @@
-QT += network help-private
+QT += help-private
QTPLUGIN.platforms = qminimal
QTPLUGIN.sqldrivers = qsqlite
|
|
[-]
[+]
|
Changed |
_service:tar_git:opt-qt5-qttools-5.15.10+kde3.tar.bz2/upstream/src/linguist/Qt5LinguistToolsMacros.cmake
^
|
| @@ -68,6 +68,7 @@
if(NOT EXISTS "${stamp_file_dir}")
file(MAKE_DIRECTORY "${stamp_file_dir}")
endif()
+ set(stamp_files "")
foreach(_ts_file ${_my_tsfiles})
get_filename_component(_ts_name ${_ts_file} NAME)
if(_my_sources)
@@ -95,7 +96,14 @@
file(WRITE ${_ts_lst_file} "${_lst_file_srcs}")
endif()
- set(stamp_file "${stamp_file_dir}/${_ts_name}.stamp")
+ file(RELATIVE_PATH _ts_relative_path ${CMAKE_CURRENT_SOURCE_DIR} ${_ts_file})
+ string(REPLACE "../" "__/" _ts_relative_path "${_ts_relative_path}")
+ set(stamp_file "${stamp_file_dir}/${_ts_relative_path}.stamp")
+ list(APPEND stamp_files ${stamp_file})
+ get_filename_component(full_stamp_file_dir "${stamp_file}" DIRECTORY)
+ if(NOT EXISTS "${full_stamp_file_dir}")
+ file(MAKE_DIRECTORY "${full_stamp_file_dir}")
+ endif()
add_custom_command(OUTPUT ${stamp_file}
COMMAND ${Qt5_LUPDATE_EXECUTABLE}
ARGS ${_lupdate_options} "@${_ts_lst_file}" -ts ${_ts_file}
@@ -103,7 +111,7 @@
DEPENDS ${_dependencies}
VERBATIM)
endforeach()
- qt5_add_translation(${_qm_files} __QT_INTERNAL_DEPEND_ON_TIMESTAMP_FILE ${_my_tsfiles})
+ qt5_add_translation(${_qm_files} ${_my_tsfiles} __QT_INTERNAL_TIMESTAMP_FILES ${stamp_files})
set(${_qm_files} ${${_qm_files}} PARENT_SCOPE)
endfunction()
@@ -120,17 +128,17 @@
function(QT5_ADD_TRANSLATION _qm_files)
- set(options __QT_INTERNAL_DEPEND_ON_TIMESTAMP_FILE)
+ set(options)
set(oneValueArgs)
- set(multiValueArgs OPTIONS)
+ set(multiValueArgs OPTIONS __QT_INTERNAL_TIMESTAMP_FILES)
cmake_parse_arguments(_LRELEASE "${options}" "${oneValueArgs}" "${multiValueArgs}" ${ARGN})
set(_lrelease_files ${_LRELEASE_UNPARSED_ARGUMENTS})
+ set(idx 0)
foreach(_current_FILE ${_lrelease_files})
get_filename_component(_abs_FILE ${_current_FILE} ABSOLUTE)
get_filename_component(qm ${_abs_FILE} NAME)
- set(ts_stamp_file "${CMAKE_CURRENT_BINARY_DIR}/.lupdate/${qm}.stamp")
# everything before the last dot has to be considered the file name (including other dots)
string(REGEX REPLACE "\\.[^.]*$" "" FILE_NAME ${qm})
get_source_file_property(output_location ${_abs_FILE} OUTPUT_LOCATION)
@@ -141,7 +149,9 @@
set(qm "${CMAKE_CURRENT_BINARY_DIR}/${FILE_NAME}.qm")
endif()
- if(_LRELEASE___QT_INTERNAL_DEPEND_ON_TIMESTAMP_FILE)
+ if(_LRELEASE___QT_INTERNAL_TIMESTAMP_FILES)
+ list(GET _LRELEASE___QT_INTERNAL_TIMESTAMP_FILES ${idx} ts_stamp_file)
+ math(EXPR idx "${idx} + 1")
set(qm_dep "${ts_stamp_file}")
else()
set(qm_dep "${_abs_FILE}")
|
|
[-]
[+]
|
Changed |
_service:tar_git:opt-qt5-qttools-5.15.10+kde3.tar.bz2/upstream/src/linguist/linguist/translationsettingsdialog.cpp
^
|
| @@ -1,6 +1,6 @@
/****************************************************************************
**
-** Copyright (C) 2016 The Qt Company Ltd.
+** Copyright (C) 2022 The Qt Company Ltd.
** Contact: https://www.qt.io/licensing/
**
** This file is part of the Qt Linguist of the Qt Toolkit.
@@ -41,14 +41,16 @@
m_ui.setupUi(this);
for (int i = QLocale::C + 1; i < QLocale::LastLanguage; ++i) {
- QString lang = QLocale::languageToString(QLocale::Language(i));
- auto loc = QLocale(QLocale::Language(i));
- if (loc.language() != QLocale::English) {
- QString nln = loc.nativeLanguageName();
- if (!nln.isEmpty()) {
- //: <english> (<endonym>) (language and country names)
- lang = tr("%1 (%2)").arg(lang, nln);
- }
+ const auto language = QLocale::Language(i);
+ QString lang = QLocale::languageToString(language);
+ const auto loc = QLocale(language);
+ // Languages for which we have no data get mapped to the default locale;
+ // its endonym is unrelated to the language requested. For English, the
+ // endonym is the name we already have; don't repeat it.
+ if (loc.language() == language && language != QLocale::English) {
+ const QString native = loc.nativeLanguageName();
+ if (!native.isEmpty()) //: <english> (<endonym>) (language names)
+ lang = tr("%1 (%2)").arg(lang, native);
}
m_ui.srcCbLanguageList->addItem(lang, QVariant(i));
}
|
|
[-]
[+]
|
Changed |
_service:tar_git:opt-qt5-qttools-5.15.10+kde3.tar.bz2/upstream/src/linguist/lprodump/main.cpp
^
|
| @@ -104,6 +104,8 @@
" Trace processing .pro files. Specify twice for more verbosity.\n"
" -out <filename>\n"
" Name of the output file.\n"
+ " -translations-variables <variable_1>[,<variable_2>,...]\n"
+ " Comma-separated list of QMake variables containing .ts files.\n"
" -version\n"
" Display the version of lprodump and exit.\n"
));
@@ -272,11 +274,13 @@
}
static QJsonArray processProjects(bool topLevel, const QStringList &proFiles,
+ const QStringList &translationsVariables,
const QHash<QString, QString> &outDirMap,
ProFileGlobals *option, QMakeVfs *vfs, QMakeParser *parser,
bool *fail);
-static QJsonObject processProject(const QString &proFile, ProFileGlobals *option, QMakeVfs *vfs,
+static QJsonObject processProject(const QString &proFile, const QStringList &translationsVariables,
+ ProFileGlobals *option, QMakeVfs *vfs,
QMakeParser *parser, ProFileEvaluator &visitor)
{
QJsonObject result;
@@ -304,7 +308,7 @@
subProFiles << subPro;
}
}
- QJsonArray subResults = processProjects(false, subProFiles,
+ QJsonArray subResults = processProjects(false, subProFiles, translationsVariables,
QHash<QString, QString>(), option, vfs, parser,
nullptr);
if (!subResults.isEmpty())
@@ -321,6 +325,7 @@
}
static QJsonArray processProjects(bool topLevel, const QStringList &proFiles,
+ const QStringList &translationsVariables,
const QHash<QString, QString> &outDirMap,
ProFileGlobals *option, QMakeVfs *vfs, QMakeParser *parser, bool *fail)
{
@@ -346,16 +351,20 @@
continue;
}
- QJsonObject prj = processProject(proFile, option, vfs, parser, visitor);
+ QJsonObject prj = processProject(proFile, translationsVariables, option, vfs, parser,
+ visitor);
setValue(prj, "projectFile", proFile);
- if (visitor.contains(QLatin1String("TRANSLATIONS"))) {
- QStringList tsFiles;
+ QStringList tsFiles;
+ for (const QString &varName : translationsVariables) {
+ if (!visitor.contains(varName))
+ continue;
QDir proDir(QFileInfo(proFile).path());
- const QStringList translations = visitor.values(QLatin1String("TRANSLATIONS"));
+ const QStringList translations = visitor.values(varName);
for (const QString &tsFile : translations)
tsFiles << proDir.filePath(tsFile);
- setValue(prj, "translations", tsFiles);
}
+ if (!tsFiles.isEmpty())
+ setValue(prj, "translations", tsFiles);
result.append(prj);
pro->deref();
}
@@ -367,6 +376,7 @@
QCoreApplication app(argc, argv);
QStringList args = app.arguments();
QStringList proFiles;
+ QStringList translationsVariables = { QStringLiteral("TRANSLATIONS") };
QString outDir = QDir::currentPath();
QHash<QString, QString> outDirMap;
QString outputFilePath;
@@ -409,6 +419,14 @@
return 1;
}
outDir = QDir::cleanPath(QFileInfo(args[i]).absoluteFilePath());
+ } else if (arg == QLatin1String("-translations-variables")) {
+ ++i;
+ if (i == argc) {
+ printErr(LD::tr("The -translations-variables option must be followed by a "
+ "comma-separated list of variable names.\n"));
+ return 1;
+ }
+ translationsVariables = args.at(i).split(QLatin1Char(','));
} else if (arg.startsWith(QLatin1String("-")) && arg != QLatin1String("-")) {
printErr(LD::tr("Unrecognized option '%1'.\n").arg(arg));
return 1;
@@ -446,8 +464,8 @@
QMakeVfs vfs;
QMakeParser parser(0, &vfs, &evalHandler);
- QJsonArray results = processProjects(true, proFiles, outDirMap, &option, &vfs,
- &parser, &fail);
+ QJsonArray results = processProjects(true, proFiles, translationsVariables, outDirMap, &option,
+ &vfs, &parser, &fail);
if (fail)
return 1;
|
|
[-]
[+]
|
Changed |
_service:tar_git:opt-qt5-qttools-5.15.10+kde3.tar.bz2/upstream/src/linguist/lrelease-pro/main.cpp
^
|
| @@ -127,6 +127,9 @@
return 1;
}
+ lprodumpOptions << QStringLiteral("-translations-variables")
+ << QStringLiteral("TRANSLATIONS,EXTRA_TRANSLATIONS");
+
const QStringList proFiles = extractProFiles(&inputFiles);
if (proFiles.isEmpty()) {
printErr(LR::tr("lrelease-pro: No .pro/.pri files given.\n"));
|
|
[-]
[+]
|
Changed |
_service:tar_git:opt-qt5-qttools-5.15.10+kde3.tar.bz2/upstream/src/qdoc/htmlgenerator.cpp
^
|
| @@ -3973,15 +3973,11 @@
writer.writeCDATA(QString("No description available"));
writer.writeEndElement(); // description
- // Add words from module name as tags
- // QtQuickControls -> qt,quick,controls
- // QtOpenGL -> qt,opengl
- QRegExp re("([A-Z]+[a-z0-9]*(3D|GL)?)");
- int pos = 0;
- while ((pos = re.indexIn(project, pos)) != -1) {
- tags << re.cap(1).toLower();
- pos += re.matchedLength();
- }
+ // Add module name as tag
+ QString moduleName = project;
+ if (moduleName.startsWith("Qt"))
+ moduleName = moduleName.mid(2);
+ tags << moduleName.toLower();
// Include tags added via \meta {tag} {tag1[,tag2,...]}
// within \example topic
@@ -3990,31 +3986,6 @@
tags += QSet<QString>(tagList.cbegin(), tagList.cend());
}
- const auto &titleWords = en->title().toLower().split(QLatin1Char(' '));
- tags += QSet<QString>(titleWords.cbegin(), titleWords.cend());
-
- // Clean up tags, exclude invalid and common words
- QSet<QString>::iterator tag_it = tags.begin();
- QSet<QString> modified;
- while (tag_it != tags.end()) {
- QString s = *tag_it;
- if (s.at(0) == '(')
- s.remove(0, 1).chop(1);
- if (s.endsWith(QLatin1Char(':')))
- s.chop(1);
-
- if (s.length() < 2 || s.at(0).isDigit() || s.at(0) == '-' || s == QLatin1String("qt")
- || s == QLatin1String("the") || s == QLatin1String("and")
- || s.startsWith(QLatin1String("example")) || s.startsWith(QLatin1String("chapter")))
- tag_it = tags.erase(tag_it);
- else if (s != *tag_it) {
- modified << s;
- tag_it = tags.erase(tag_it);
- } else
- ++tag_it;
- }
- tags += modified;
-
if (!tags.isEmpty()) {
writer.writeStartElement("tags");
bool wrote_one = false;
|
|
[-]
[+]
|
Changed |
_service:tar_git:opt-qt5-qttools-5.15.10+kde3.tar.bz2/upstream/tests/auto/qdoc/generatedoutput/expected_output/demos-manifest.xml
^
|
| @@ -3,7 +3,7 @@
<demos>
<demo name="Demo" docUrl="qthelp://org.qt-project.test.001/test/test-demos-demo-example.html" projectPath="test/demos/demo/demo.pro" isTest="true">
<description><![CDATA[No description available]]></description>
- <tags>demo,test</tags>
+ <tags>test</tags>
</demo>
</demos>
</instructionals>
|
|
[-]
[+]
|
Changed |
_service:tar_git:opt-qt5-qttools-5.15.10+kde3.tar.bz2/upstream/tests/auto/qdoc/generatedoutput/expected_output/examples-manifest.xml
^
|
| @@ -3,12 +3,12 @@
<examples>
<example name="CMake Example Project" docUrl="qthelp://org.qt-project.test.001/test/test-cmaketest-example.html" projectPath="test/cmaketest/CMakeLists.txt" isTest="true">
<description><![CDATA[No description available]]></description>
- <tags>cmake,project,test</tags>
+ <tags>test</tags>
<fileToOpen mainFile="true">test/cmaketest/main.cpp</fileToOpen>
</example>
<example name="QML Documentation Example" docUrl="qthelp://org.qt-project.test.001/test/test-componentset-example.html" projectPath="tutorials/componentset/componentset.pro" isTest="true">
<description><![CDATA[Example for documenting QML types.]]></description>
- <tags>documentation,qml,sample,test</tags>
+ <tags>sample,test</tags>
</example>
</examples>
</instructionals>
|
