summaryrefslogtreecommitdiff
path: root/tests/auto/linguist
Commit message (Collapse)AuthorAgeFilesLines
* lupdate: Support numeric literal separatorsJoerg Bornemann2022-01-191-0/+7
| | | | | | | | | | | | | | | | | | | Numeric literals that use apostrophes were introduced in C++14 so this adds support for cases like: int d = 10'000'00; int x = 0xAF'FE; This patch allows just any number and combination of apostrophes in numeric literals and doesn't attempt to detect ill-formed literals. We assume, lupdate runs on code that has been accepted by a C++ compiler. Task-number: QTBUG-53326 Change-Id: I23bd9b4c676694dc69199e4a17a612a011449e61 Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@gmx.de> Reviewed-by: Kai Koehne <kai.koehne@qt.io> (cherry picked from commit c2d1163004078b98abc86318f45a6796aef18811) Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
* lupdate: Default to absolute locations for message-less .ts filesLucie Gérard2021-10-051-0/+2
| | | | | | | | | | | | | | | | | | | If the .ts file that is to be handled by the CMake command qt6_add_lrelease does not exist yet, the function creates an initial file, which can be used by lupdate as base line. This file is devoid of any messages and the subsequent .ts file will have no locations. Fix that by changing the default of message-less .ts files to absolute. For new files, lupdate already defaulted to absolute locations. Doing that for .ts files without messages seems just consistent. Change-Id: I051761ad916af3affdd70e57e77cc245fd399de1 Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org> Reviewed-by: Joerg Bornemann <joerg.bornemann@qt.io> (cherry picked from commit 5cf27fb76e006a4555af48753e3dab2973af2547) Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
* lupdate/Python: Add support for extra comments and idsFriedemann Kleint2021-08-302-7/+10
| | | | | | | | | | Fixes: PYSIDE-1376 Task-number: PYSIDE-1252 Change-Id: Ie60f86a6c5a771bcdd2ba455fb86cde3cb8f75e6 Reviewed-by: Christian Tismer <tismer@stackless.com> Reviewed-by: Joerg Bornemann <joerg.bornemann@qt.io> (cherry picked from commit 5217a8553f41d43c21755667f7f05064209ee8f3) Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
* lupdate: Support PythonFriedemann Kleint2021-07-073-0/+95
| | | | | | | | | | | | | | Port over the parser from pyside2-lupdate, remove the encoding and clean it up with clang-tidy. Add a test. [ChangeLog][lupdate] lupdate now supports Python. Task-number: PYSIDE-1252 Change-Id: Id64e7a4be90e66aad154d0546e48cf1a88e5cb3a Reviewed-by: Cristian Maureira-Fredes <cristian.maureira-fredes@qt.io> Reviewed-by: Joerg Bornemann <joerg.bornemann@qt.io> (cherry picked from commit 7bd1a834e048f2ecb68411e43d2a2681604955a5) Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
* lupdate/clang: Correct testing of skipped code warningLucie Gérard2021-07-021-1/+1
| | | | | | | Change-Id: I705df3115a29d59e1ca4736ddadd0f4ec5f9bd01 Reviewed-by: Joerg Bornemann <joerg.bornemann@qt.io> (cherry picked from commit 839342579c1cbc5a7826b7bef19b7a8b7f8b6d1b) Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
* lupdate/clang: Add test for same line commentsLucie Gérard2021-07-023-0/+99
| | | | | | | Change-Id: I340f75cbf02d82a70d264e52386e10327acafee9 Reviewed-by: Joerg Bornemann <joerg.bornemann@qt.io> (cherry picked from commit 6a706c7e0c7ae32d1943a5b355649f7af0f4adae) Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
* lupdate/clang: Add test for isolated commentsLucie Gérard2021-07-024-0/+199
| | | | | | | Change-Id: I7c008cfa58cbe91f73caa34c0bd9dc9f1d3865e5 Reviewed-by: Joerg Bornemann <joerg.bornemann@qt.io> (cherry picked from commit 658b9787d71e35ebecfbb962f37c4486a8c2246c) Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
* Add test files for QT_TR_NOOP contextLucie Gerard2021-06-307-1/+486
| | | | | | | Change-Id: I7cf76aa8ff774c8eff7956739909104dd390f6a8 Reviewed-by: Joerg Bornemann <joerg.bornemann@qt.io> (cherry picked from commit 62a3420631881d0b651358de07c3a0854b1b9b1d) Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
* Fix the name of Tools module in testsAlexey Edelev2021-06-221-1/+1
| | | | | | | | | | | The name of internal Tools module remain untouched. Need to remove the 'Private' suffix where it's used. Fixes: QTBUG-94613 Change-Id: Ibd82436ec18f217f965168ac6a262032c033483d Reviewed-by: Alexandru Croitor <alexandru.croitor@qt.io> (cherry picked from commit 8e7a396db047f617c3629ef768729d98e3604dc0) Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
* Adapt and run the lupdate tests for the clang-based lupdate tooJoerg Bornemann2021-06-1797-400/+3289
| | | | | | | | | | | | | | | | | | | We now run the lupdate autotests once with the "classic" lupdate and once with the clang-based lupdate, if Qt was built with clangcpp support. Most of the source code need to be made compilable as the new parser can only run on compilable code. In some cases the results for the new parser are expected to be different. In such case a dedicated directory is created. lupdate/clang prints warning messages with native separators. Adjust our test data to accept paths with slashes or backslashes. Task-number: QTBUG-87090 Change-Id: I526137f7f918461939efed57b25378109a273615 Reviewed-by: Oliver Wolff <oliver.wolff@qt.io> (cherry picked from commit d012c2f69cffadb8d34733156eacf08a5a77d1be) Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
* Make tst_lupdate's good/backslashes test compilableJoerg Bornemann2021-06-172-5/+6
| | | | | | | | | | | This is a prerequisite for running this test with lupdate's clang parser. Change-Id: I2fdae249ab32daea9bb24dbd8a9d8f3b24e0e46f Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org> Reviewed-by: Lucie Gerard <lucie.gerard@qt.io> Reviewed-by: Karsten Heimrich <karsten.heimrich@qt.io> (cherry picked from commit d709930315efcdaae23d3800c164978b5da73742)
* Fix regression in lconvert handling empty translationsKai Köhne2021-03-102-0/+2
| | | | | | | | | | | | | | | | | Fixes a regression introduced by commit b96fe95da00aca6b, which enabled a sanity check that now failed to account for empty string. The serialized format of a QString is such that '-1' indicates a null string, otherwise it's <length><QChar>+. Since QChar is 2 bytes, length should therefore always be an even number ... except for -1. While at it, also preserve the difference between an empty string and a null string. Fixes: QTBUG-91558 Pick-to: 6.1 Change-Id: Iffbc6ee2c94b8363d2c1d91440022a77dbef4772 Reviewed-by: Joerg Bornemann <joerg.bornemann@qt.io>
* Remove QMake project filesJoerg Bornemann2021-02-125-31/+0
| | | | | | | | | | This includes removal of the corresponding .prev_CMakeLists.txt files. Pick-to: 6.1 Task-number: QTBUG-88742 Change-Id: I3f360105a8cd43ad37dec6bfc6509ce95c79ee76 Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org> Reviewed-by: Cristian Adam <cristian.adam@qt.io>
* Fix compiler warnings from deprecated QLibraryInfo::locationVolker Hilsheimer2020-10-233-3/+3
| | | | | Change-Id: I5ae779a77458ef92e1a8a134d1bf912e2d43185c Reviewed-by: Lars Knoll <lars.knoll@qt.io>
* lupdate: Make good:proparsing test compilableJoerg Bornemann2020-10-0110-18/+11
| | | | | | | | This is necessary to make this test pass with the clang-based lupdate. Task-number: QTBUG-87090 Change-Id: I1ea085c1d37375ffb161176f23fba51450986867 Reviewed-by: Karsten Heimrich <karsten.heimrich@qt.io>
* CMake: Regenerate projects to use new qt_internal_ APIAlexandru Croitor2020-10-014-4/+4
| | | | | | | | Modify special case locations to use the new API as well. Task-number: QTBUG-86815 Change-Id: I84f5fc4eb26f95d81ce5b5b8cc72706bb9185026 Reviewed-by: Joerg Bornemann <joerg.bornemann@qt.io>
* tst_lupdate: Print message where the sub-tests are runningJoerg Bornemann2020-09-301-1/+1
| | | | | | | | Removing the not particularly useful "Checking..." message, and print instead the working directory for lupdate. Change-Id: Iddd0107783152dba183908f88d4854e79bd9ec7e Reviewed-by: Karsten Heimrich <karsten.heimrich@qt.io>
* CMake: Regenerate projects before API changeAlexandru Croitor2020-09-221-0/+10
| | | | | | | Task-number: QTBUG-86815 Change-Id: I5b7f85344ebe2bf4baf36c5e29975051ce1a72ff Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org> Reviewed-by: Joerg Bornemann <joerg.bornemann@qt.io>
* CMake: Do not built qdoc/lupdate for MSVC NMC with CMake < 3.19Joerg Bornemann2020-08-171-0/+7
| | | | | | | | CMake 3.19 is required to build lupdate/qdoc with llvm support. Task-number: QTBUG-85411 Change-Id: Iabad73b753dc57bc36c826ecf318dea6498b5fb7 Reviewed-by: Alexandru Croitor <alexandru.croitor@qt.io>
* Fix the buildSona Kurazyan2020-06-292-2/+2
| | | | | | | | | Fix the build failing after d7ccd8cb4565c8643b158891c9de3187c1586dc9. Pick-to: 5.15 Change-Id: Icba7cc1fa168a99b4f543bee691925104fb2197f Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org> Reviewed-by: Liang Qi <liang.qi@qt.io>
* Get rid of the QTextCodec dependency in linguistLars Knoll2020-05-182-2/+2
| | | | | Change-Id: I9f09578b816ff24a23e17b3255ac93c5eb7c321e Reviewed-by: Liang Qi <liang.qi@qt.io>
* Port linguist from QRegExp to QRegularExpressionLars Knoll2020-05-092-4/+4
| | | | | | | | | Use the DotMatchesEverythingOption in qmakebuiltins.cpp, where we interpret .pro files, to increase compatibility with QRegExp. Change-Id: Ieb460c9647b53d6b8ca3d876e239fc8171ab7802 Reviewed-by: Alex Blasche <alexander.blasche@qt.io>
* Merge remote-tracking branch 'origin/5.15' into devAlexandru Croitor2020-04-154-0/+77
|\ | | | | | | | | | | | | | | | | | | | | Conflicts: a bunch of .pro and configure.json file adjustments and some conflicting cherry-picks from dev -> 5.15 that are merged into dev again src/assistant/assistant/main.cpp Change-Id: I174c00b6a300c6d46c4e081bdcb2f15f23ae9ef2
| * Fix some deprecation warningsFriedemann Kleint2020-04-151-13/+13
| | | | | | | | | | | | | | | | | | | | | | | | findfiledialog.cpp:188:24: warning: ‘AdjustToMinimumContentsLength’ is deprecated: Use AdjustToContents or AdjustToContentsOnFirstShow [-Wdeprecated-declarations] tst_lupdate.cpp:291:63: warning: ‘void QProcess::start(const QString&, QIODevice::OpenMode)’ is deprecated: Use QProcess::start(const QString &program, const QStringList &arguments,OpenMode mode = ReadWrite) instead [-Wdeprecated-declarations] tst_qtattributionsscanner.cpp:112:63: warning: ‘void QProcess::start(const QString&, QIODevice::OpenMode)’ is deprecated: Use QProcess::start(const QString &program, const QStringList &arguments,OpenMode mode = ReadWrite) instead [-Wdeprecated-declarations] tst_qtdiag.cpp:70:27: warning: ‘void QProcess::start(const QString&, QIODevice::OpenMode)’ is deprecated: Use QProcess::start(const QString &program, const QStringList &arguments,OpenMode mode = ReadWrite) instead [-Wdeprecated-declarations] Cherry-picked from branch: dev Change-Id: I103a28bd6ce97de311042f145d4a793be9d4b9a7 Reviewed-by: cherrypickbot
| * Add lupdate test for Objective-C++ sourcesTor Arne Vestbø2020-04-024-0/+77
| | | | | | | | | | | | | | | | Change-Id: I3728a77d44798e5ab71c6f775f95821513be00fe Reviewed-by: Friedemann Kleint <Friedemann.Kleint@qt.io> Reviewed-by: Volker Hilsheimer <volker.hilsheimer@qt.io> Reviewed-by: Simon Hausmann <simon.hausmann@qt.io> Reviewed-by: Karsten Heimrich <karsten.heimrich@qt.io>
* | Fix some deprecation warningsFriedemann Kleint2020-04-151-13/+13
| | | | | | | | | | | | | | | | | | | | | | findfiledialog.cpp:188:24: warning: ‘AdjustToMinimumContentsLength’ is deprecated: Use AdjustToContents or AdjustToContentsOnFirstShow [-Wdeprecated-declarations] tst_lupdate.cpp:291:63: warning: ‘void QProcess::start(const QString&, QIODevice::OpenMode)’ is deprecated: Use QProcess::start(const QString &program, const QStringList &arguments,OpenMode mode = ReadWrite) instead [-Wdeprecated-declarations] tst_qtattributionsscanner.cpp:112:63: warning: ‘void QProcess::start(const QString&, QIODevice::OpenMode)’ is deprecated: Use QProcess::start(const QString &program, const QStringList &arguments,OpenMode mode = ReadWrite) instead [-Wdeprecated-declarations] tst_qtdiag.cpp:70:27: warning: ‘void QProcess::start(const QString&, QIODevice::OpenMode)’ is deprecated: Use QProcess::start(const QString &program, const QStringList &arguments,OpenMode mode = ReadWrite) instead [-Wdeprecated-declarations] Change-Id: I103a28bd6ce97de311042f145d4a793be9d4b9a7 Pick-to: 5.15 Reviewed-by: Jarek Kobus <jaroslaw.kobus@qt.io>
* | Convert QtTools testsLeander Beernaert2019-12-134-0/+35
|/ | | | | | Change-Id: I1666999af341f9dbc6dbb63d75a81c3b07adc316 Reviewed-by: Qt CMake Build Bot Reviewed-by: Alexandru Croitor <alexandru.croitor@qt.io>
* Merge remote-tracking branch 'origin/5.13' into devQt Forward Merge Bot2019-07-162-0/+13
|\ | | | | | | Change-Id: I51fa8c90923e9730d7787e763fad996db51d350e
| * lrelease: Fix crash on projects without TRANSLATIONS assignmentJoerg Bornemann2019-07-102-0/+13
| | | | | | | | | | | | | | | | Add missing nullptr check. Fixes: QTBUG-76930 Change-Id: I2dc99db43b12cebc6fbe9024057ba963e0ae470f Reviewed-by: Kai Koehne <kai.koehne@qt.io>
* | Merge remote-tracking branch 'origin/5.13' into devQt Forward Merge Bot2019-06-031-0/+2
|\ \ | |/ | | | | Change-Id: If3e9d398478be4b2dda863061454e75842d349bf
| * Merge remote-tracking branch 'origin/5.12' into 5.13Qt Forward Merge Bot2019-06-021-0/+2
| |\ | | | | | | | | | Change-Id: I5eb7c358e80cbd25b5bbab1ef03f781c16367b63
| | * Test that extraction of translations works from .qrc files with QtQuickCompilerSimon Hausmann2019-05-091-0/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | After commit f01e72a82b59c214ce4b0a6ecefb604bc66ddd3e in qtdeclarative, we can test this scenario now. Task-number: QTBUG-75501 Change-Id: I64baa98da6b17c24b1e309c4dc93525a4fa8d057 Reviewed-by: Ulf Hermann <ulf.hermann@qt.io>
* | | tests: remove uses of Q_FOREACHMarc Mutz2019-05-232-5/+6
|/ / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | All pretty straight-forward, except two: - in tst_QHelpPrjectData::filterSections(), use QCOMPARE() on two lists instead of running it by hand. To allow for variation in order, sort the list under test, and make sure the reference list is sorted, too. - in tst_QHelpEngineCore::files(), the trailing printing of 'lst' was dead code: either the QCOMPARE succeeded, then 'lst' was empty, or it failed, in which case QCOMPARE exits the function. The loop was obviously meant to show the remaining items in case the test fails, so stuff the loop (w/o Q_FOREACH) into a scope guard. QtC tricked me into believing that these were the only occurrences in this module. Alas, it just failed to parse large parts of the module's pro-files. The module continues to be one of the worst offenders w.r.t. Q_FOREACH with qdoc and linguist each containing ~150 instances, as well as macdeploy with a another dozen or two. The rest is clean now. Change-Id: I89f37ef07ab284da7881d624d9111e89cd2b2cbc Reviewed-by: Jörg Bornemann <joerg.bornemann@qt.io>
* | Merge remote-tracking branch 'origin/5.12' into 5.13Liang Qi2019-04-2420-16/+128
|\ \ | |/ | | | | | | | | | | | | | | | | | | Conflicts: .qmake.conf src/qdoc/qmlmarkupvisitor.h src/qdoc/qmlvisitor.h tests/auto/qtattributionsscanner/testdata/good/expected.json Done-With: Kai Koehne <kai.koehne@qt.io> Change-Id: I180ee214d1e5999fc1279b092bd9214b6bf8f858
| * Convert \r into a numerical entityLucie Gerard2019-04-021-2/+2
| | | | | | | | | | | | Task-number: QTBUG-41562 Change-Id: If03df28095212f2ee9f74eeaf03c50a6f1203415 Reviewed-by: Kai Koehne <kai.koehne@qt.io>
| * lupdate: Do not touch a translated file without target languageLucie Gerard2019-04-0218-14/+89
| | | | | | | | | | | | | | | | | | | | [ChangeLog][lupdate] lupdate will now generate an error if it is asked to update a .ts file with translations, but without a target language. This is to ensure that plural translations are not destroyed. Fixes: QTBUG-53775 Change-Id: I646c1f2ec42a32dbc1a4676ad784887613607b78 Reviewed-by: Kai Koehne <kai.koehne@qt.io>
| * Add forward looking after ColonLucie Gerard2019-04-012-0/+37
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Colons seen are remembered in order to identify a member or base class identifier. In case of declaration of a bit field, the colon should be ignored. If it is not, unexpected behaviors compromise the resolution of the context, when the context is not explicit in the tr() function. To differentiate between colons in a member or base class identifier, and colons in a bit field, this patch implements a heuristic: We parse forward to either a '{', or a ';'. If it is a semicolon we assume it's a bit field, if it is a curved open bracket we assume the colon is for a member or base class identifier. Related auto test in case of bitfields declaration added. Task-number: QTBUG-55479 Change-Id: I2ca1124c192e4ab16fd449afc634a5de5023f481 Reviewed-by: Kai Koehne <kai.koehne@qt.io>
* | QtTools: replace deprecated QLayout::margin() with contentsMargins()Christian Ehrlicher2019-02-113-3/+3
|/ | | | | | | | QLayout::margin()/setMargin() is deprecated - replace it with it's successors contentsMargins()/setContentsMargins() Change-Id: I8b6a36f3e0d0e00186a7d9cdf4827cf06f302235 Reviewed-by: Friedemann Kleint <Friedemann.Kleint@qt.io>
* lupdate: Add support for parsing C++11 raw string literalsPalo Kisa2019-01-092-0/+57
| | | | | | | | | | | [ChangeLog][lupdate] Added support for parsing C++11 raw string literals Task-number: QTBUG-42736 Change-Id: Ia246c7e7208580182a1e0413bb38bc2c8ff3f61e Reviewed-by: Andy Shaw <andy.shaw@qt.io> Reviewed-by: Kai Koehne <kai.koehne@qt.io> Reviewed-by: Friedemann Kleint <Friedemann.Kleint@qt.io>
* lupdate: don't abort on prf execution errorsv5.12.0-beta4Oswald Buddenhagen2018-10-291-0/+2
| | | | | | | | | we report all messages with a "WARNING:" prefix specifically to indicate that the errors aren't supposed to be actually fatal in this context. Fixes: QTBUG-62478 Change-Id: I010abf34a216993af0d33d614345f6f562f0a10e Reviewed-by: Andy Shaw <andy.shaw@qt.io>
* lconvert test: Try to avoid QProcess::waitForFinished() timeoutsFriedemann Kleint2018-10-271-0/+4
| | | | | | | | | | | Add a test for QProcess::waitForStarted() to separate out the startup time and catch startup errors, trying to avoid errors like: FAIL! : tst_lconvert::readverifies(kde context) 'cvt->waitForFinished(3000)' returned FALSE. (Process 1 hung) tst_lconvert.cpp(81) : failure location Change-Id: I8c23eae7255b39b6a7a7dc77b520fcb6c7d5e642 Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@qt.io>
* Add support for the new QT_TR*_N_NOOP() macro familyMateusz Starzycki2018-06-252-0/+42
| | | | | | Task-number: QTBUG-3945 Change-Id: Ia29d97adaaf47539a19bd544729663dc893c5c14 Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@qt.io>
* lupdate: add support for c++17 nested namespacesOswald Buddenhagen2018-04-202-0/+24
| | | | | | | | Task-number: QTBUG-63364 Started-by: Mateusz Starzycki <mstarzycki@gmail.com> Change-Id: I492eecdc11a97d3cd8adc4caf6f20e536fc83bf7 Reviewed-by: Mateusz Starzycki <mstarzycki@gmail.com> Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@qt.io>
* Add support for translation function aliases that are member expressionsSimon Hausmann2018-03-293-1/+13
| | | | | | | | | | | | | When traversing the AST for call expressions, it may happen that the base of the call expression is a field member expression instead of a plain identifier. For example with CustomTranslator.myTr() the base is a field member, with an identifier as base and myTr as name. We can construct a qualified name from that quite easily and this way support qualified tr aliases in qml files. Task-number: QTBUG-67278 Change-Id: I106243d8eed6d8cec75819a44942cf750de2829a Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@qt.io>
* lupdate: Read id attributes of .ui filesFriedemann Kleint2018-01-183-0/+79
| | | | | | Task-number: QTBUG-34610 Change-Id: I807752fc573b9e6965462f0cf4728673fe3f3c70 Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@qt.io>
* Ensure that Nbsp characters are preserved by escaping themAndy Shaw2018-01-122-0/+13
| | | | | | | | | | | | Characters that are considered spaces, but aren't just ' ' should always be escaped so that the exact type of space that they are is preserved. Since QTextDocument::toPlainText() will convert QChar::Nbsp to ' ', we need to get the plain text from the handler directly and do our own conversion where applicable to stop it from replacing the Nbsp characters. Task-number: QTBUG-35652 Change-Id: I373edca92253ca5f978ba656c8ebbcaf77965e61 Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@qt.io>
* lconvert: Add a -no-untranslated command line optionRobert Loehning2017-08-063-4/+48
| | | | | | | | [ChangeLog] Added option "-no-untranslated" to lconvert Started-by: hjk <hjk@qt.io> Change-Id: I79e5a67ec721c9bcd8ea25bb9ec8ad80f55a229d Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@qt.io>
* Fix licensingJani Heikkinen2017-05-035-54/+39
| | | | | | | | | | | | - Remove unused license files - Switch old LGPLv21 license headers with GPL-EXCEPT one - Switch old LGPL3 license headers with LGPL one Task-number: QTBUG-57147 Change-Id: I36a5b5b823cede544f43ac8349b5db27f8df6abc Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org> Reviewed-by: Friedemann Kleint <Friedemann.Kleint@qt.io> Reviewed-by: Kai Koehne <kai.koehne@qt.io>
* Fix lupdate to handle \u escapesEdward Welbourne2017-03-092-0/+14
| | | | | | | | | | It treated \u as u, which isn't correct. Instead, read the number following and convert, via QChar, to UTF-8 encoding in the byte array (that'll later be .fromUtf8()ed). Added a simple test-case. Task-number: QTBUG-35164 Change-Id: Ib23cc5e5fb98e6cb8715b4018545e40a40e271d0 Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@qt.io>
* Merge remote-tracking branch 'origin/5.6' into 5.7Liang Qi2016-11-0414-14/+201
|\ | | | | | | Change-Id: I4ee208f69bed72c480c636cb18f22fd88c02d1e5
View Lorry Controller Status