summaryrefslogtreecommitdiff
path: root/tests/auto/linguist/lupdate
Commit message (Collapse)AuthorAgeFilesLines
* Update license headers and add new license filesAntti Kokko2014-09-25136-2095/+1375
| | | | | | | | | - Renamed LICENSE.LGPL to LICENSE.LGPLv21 - Added LICENSE.LGPLv3 - Removed LICENSE.GPL Change-Id: I23ef9591f4d9054e0b6a252ba7767baf4189aeab Reviewed-by: Jani Heikkinen <jani.heikkinen@digia.com>
* correctly resolve INCLUDEPATH relative to current projectOswald Buddenhagen2013-10-105-0/+123
| | | | | | | Task-number: QTBUG-24587 Change-Id: I1384403e5c5e3313649fa4abb98e7578cae4677b Reviewed-by: hjk <hjk121@nokiamail.com> Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@digia.com>
* don't unnecessarily claim that gui is neededOswald Buddenhagen2013-10-101-1/+1
| | | | | Change-Id: Ie5d2c0d74f3b47e7f5cf0a3d34b84b382f01f7bd Reviewed-by: Sergio Ahumada <sergio.ahumada@digia.com>
* add missing fileOswald Buddenhagen2013-10-011-0/+42
| | | | | | | | amends 35139d45 Change-Id: I53a65e9410a7c6bcd3d28c3b4b416d275679436f Reviewed-by: hjk <hjk121@nokiamail.com> Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@digia.com>
* Merge remote-tracking branch 'origin/stable' into devFrederik Gladhorn2013-08-273-3/+7
|\ | | | | | | Change-Id: I5db3f62185e7e99ce2c701debd00a44f40a9f5e5
| * make TR_EXCLUDE work for #include statements as wellOswald Buddenhagen2013-08-192-1/+4
| | | | | | | | | | | | Change-Id: I299043c63c6e8b2f24eeee7d3f03a514b96bca5f Reviewed-by: hjk <hjk121@nokiamail.com> Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@digia.com>
| * execute some loops even in cumulative modeOswald Buddenhagen2013-08-121-2/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | we execute foreach loops now. this is (mostly) safe nowadays, because a previous change added precautions against exponential value list growth, so it's unlikely that two nested loops would keep the cpu busy for a day as before. we continue to exclude forever loops and loops with excessive integer counts. Task-number: QTBUG-8550 Change-Id: Iaa116086986cc7fd5023834753f791dd205102e5 Reviewed-by: Daniel Teske <daniel.teske@digia.com> Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@digia.com>
* | collect messages from INSTALL and DEPLOYMENT file listsOswald Buddenhagen2013-08-275-0/+160
| | | | | | | | | | | | | | Task-number: QTBUG-14056 Change-Id: I1e014885f92b8587462d926e552834915fc1be60 Reviewed-by: hjk <hjk121@nokiamail.com> Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@digia.com>
* | fix arguments of main() in test dataOswald Buddenhagen2013-08-273-3/+3
| | | | | | | | | | | | | | not that it would matter, but ... Change-Id: I798eb118e623cf22c7288cda7b5d806eba8a6065 Reviewed-by: hjk <hjk121@nokiamail.com>
* | Merge remote-tracking branch 'origin/stable' into devFrederik Gladhorn2013-08-1260-126/+157
|\ \ | |/ | | | | | | | | | | | | Conflicts: .qmake.conf src/linguist/lupdate/cpp.cpp Change-Id: Id27ac2ea8438e60a940d4ae3719ad393d7ad88ea
| * fix strings from #included sources not being collectedOswald Buddenhagen2013-08-073-0/+52
| | | | | | | | | | | | | | Task-number: QTBUG-27974 Change-Id: I30edae2db5449605984a118458b1ccce7ad67eb1 Reviewed-by: hjk <hjk121@nokiamail.com> Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@digia.com>
| * make TR_EXCLUDE work for SUBDIRSOswald Buddenhagen2013-08-073-0/+54
| | | | | | | | | | | | | | | | | | | | | | | | | | this is needed for excluding subprojects we have no direct control over, e.g., git submodules. note that unlike TR_EXCLUDE for files, this matches SUBDIRS entries, not actual project file names. wildcards also work, though. Change-Id: I1d0a0410a28af4a60f045ee5bbac34540c14f0bd Reviewed-by: Friedemann Kleint <Friedemann.Kleint@digia.com> Reviewed-by: hjk <hjk121@nokiamail.com> Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@digia.com>
| * purge pointless QT_DISABLE_DEPRECATED_BEFORE=0Oswald Buddenhagen2013-08-0748-50/+0
| | | | | | | | | | | | | | neither the tool test code nor the lupdate test data need any of it. Change-Id: I7604596f17308f7d49850f683b8ab84a0bc88131 Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@digia.com>
| * remove dead filesOswald Buddenhagen2013-08-062-152/+0
| | | | | | | | | | | | Change-Id: I3735795bc51ad42ff7ad242221ef1dd174d882f1 Reviewed-by: hjk <hjk121@nokiamail.com> Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@digia.com>
| * don't ignore changes to meta data when updating translation unitsOswald Buddenhagen2013-08-063-1/+3
| | | | | | | | | | | | | | Task-number: QTBUG-18890 Change-Id: Iceb466105d5fae56da0e2d26cb245fa610fed865 Reviewed-by: hjk <hjk121@nokiamail.com> Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@digia.com>
| * de-duplicate extra comments when adding a message multiple timesOswald Buddenhagen2013-08-062-0/+6
| | | | | | | | | | | | Change-Id: I1ed80166be3cb53f865c083b0a693148b6000731 Reviewed-by: hjk <hjk121@nokiamail.com> Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@digia.com>
| * update all data of existing messages in extend()Oswald Buddenhagen2013-08-062-0/+40
| | | | | | | | | | | | | | | | | | | | | | | | | | when the message identifier (msgid or context/source/disambiguation) appears in multiple places, the remaining meta data may be inconsistent between the occurrences. we need to handle partial data on one hand, and contradicting data on the other. Task-number: QTBUG-29131 Task-number: QTBUG-32725 Change-Id: I1ed08e42e266b0b5f014400c137abbcec9ffb93d Reviewed-by: hjk <hjk121@nokiamail.com> Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@digia.com>
| * avoid false positives when looking for magic commentsOswald Buddenhagen2013-08-064-7/+19
| | | | | | | | | | | | | | | | | | | | | | expect meta data only at the beginning of statements. this required syntax fixes in some unrelated autotests. Task-number: QTBUG-11866 Change-Id: Ic0c0c150ac8648df6953a510b8eb0c199c8d3ae2 Reviewed-by: hjk <hjk121@nokiamail.com> Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@digia.com>
| * cancel complex constructs at end of #defineOswald Buddenhagen2013-08-061-1/+1
| | | | | | | | | | | | | | | | | | | | it's possible that we encounter the end of a #define statement while in the middle of a complex construct (which is part of a macro, obviously). we should discard those, as otherwise Weird Things may happen. Change-Id: Ie9608ad0215e105ab5e5bac110e4118029fa6c15 Reviewed-by: hjk <hjk121@nokiamail.com> Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@digia.com>
| * fix handling of c'tors with namespaced parent classesOswald Buddenhagen2013-08-012-0/+35
| | | | | | | | | | | | | | | | | | | | | | | | | | this is achieved by setting yyTokColonSeen under much narrower conditions (when we are pretty sure that we are seeing the start of a c'tor's initializer list), which allows us to unset it under much narrower conditions (when we are pretty sure we are seeing the start of the c'tor's body), so we now actually *do* skip over qualifications which would confuse us. Change-Id: Ic04bad57a08cc66d41094775570d25e7288e6324 Reviewed-by: hjk <hjk121@nokiamail.com> Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@digia.com>
| * make QT_TR_NOOP work in static initializers, take 2Oswald Buddenhagen2013-08-012-0/+18
| | | | | | | | | | | | | | | | | | | | | | simply ignoring equal signs turns out to be not so smart: there are static initializers without braces, which consequently do not look like function definitions with a weird additional char. Task-number: QTBUG-9276 Change-Id: I7d200aee7b81f17b42866eca4830be388c8edb64 Reviewed-by: hjk <hjk121@nokiamail.com> Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@digia.com>
| * ignore bracketed expressions only outside function scopeOswald Buddenhagen2013-08-012-0/+14
| | | | | | | | | | | | | | | | | | | | static initializers obviously cannot appear in scopes, so there is no reason to suppress parsing tr() statements used for indexing inside functions. Task-number: QTBUG-29998 Change-Id: I3a0330e1382cd5a74106328ae6722a02af282f7f Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@digia.com>
* | introduce new message type "vanished"Oswald Buddenhagen2013-08-0751-54/+54
| | | | | | | | | | | | | | | | | | | | | | | | this state is equivalent to "previously finished, but now obsolete", or in gettext terms "not fuzzy and obsolete". this bumps the ts format version to 2.1. Task-number: QTBUG-12948 Change-Id: I6c89bbfb9b16053b4e1219ec7611cb7a34189d95 Reviewed-by: hjk <hjk121@nokiamail.com> Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@digia.com>
* | complain about missing sources in id-based messagesOswald Buddenhagen2013-08-073-0/+14
| | | | | | | | | | | | | | | | | | | | | | i considered making this optional on the basis that the source strings may be assigned externally, but in that scenario lupdate wouldn't be used to start with. Task-number: QTBUG-11843 Change-Id: I3f09db902462b8e94f7a134f6fe950562b300307 Reviewed-by: hjk <hjk121@nokiamail.com> Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@digia.com>
* | Merge remote-tracking branch 'origin/stable' into devFrederik Gladhorn2013-05-232-8/+6
|\ \ | |/ | | | | Change-Id: I4556ce5965020154a563cef9613305cafae3c674
| * create a .qmake.cache for the lupdate testsOswald Buddenhagen2013-05-212-0/+5
| | | | | | | | | | | | | | | | mac mkspecs are really noisy without it now, which makes the tests fail. Change-Id: I6b4900c51d0b8aedd9309482a30055e48c3b9f69 Reviewed-by: Tor Arne Vestbø <tor.arne.vestbo@digia.com> Reviewed-by: Friedemann Kleint <Friedemann.Kleint@digia.com>
| * make stubs for dangerous/useless qmake functions in limited modeOswald Buddenhagen2013-05-211-8/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | instead of having them "not implemented" (and consequently getting errors), just let requires(), system(), mkpath(), write_file(), touch() and cache() do nothing. this is likely to cause followup failures which are harder to detect, but the amount of scary noise we are producing now is not really acceptable. furthermore, in qtcreator these failures actually terminate the "precise" evaluation, which breaks Run Configurations. Task-number: QTBUG-28159 Task-number: QTCREATORBUG-8550 (in different repo) Change-Id: I1bdeb759e895e4200f09332dadf8a6cef348182f Reviewed-by: Daniel Teske <daniel.teske@digia.com> Reviewed-by: Joerg Bornemann <joerg.bornemann@digia.com>
* | lupdate: allow to configure names of tr()-like functionsMarc Mutz2013-04-093-0/+282
|/ | | | | | | | | | | | This makes it possible to use lupdate in projects that would like to wrap the tr()-like functions with their own versions, e.g. to add error checking or other instrumentation code. While we're at it, also simplify the c++ parsing with partly table-driven code. Change-Id: I72af68afa851a46342e75dcdd3dd58f4c14276b8 Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@digia.com>
* purge CODECFORTR & -codecfortr supportOswald Buddenhagen2013-03-1229-459/+5
| | | | | | | | qt-based code is expected to be utf8-encoded nowadays. the respective c++ interfaces have been purged in 5.0 already. Change-Id: I592b49f198aae05212afbf8d3aa2b01b1e9369dd Reviewed-by: Robin Burchell <robin+qt@viroteck.net>
* Update copyright year in Digia's license headersSergio Ahumada2013-01-1088-88/+88
| | | | | | | Change-Id: I9b11dc8309c9739955e3acea12b564d6ad608f59 Reviewed-by: Akseli Salovaara <akseli.salovaara@digia.com> Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@digia.com> Reviewed-by: Sergio Ahumada <sergio.ahumada@digia.com>
* remove obsolete DEPENDPATH assignmentsOswald Buddenhagen2012-12-161-1/+1
| | | | | | | | qmake now adds CONFIG+=depend_includepath by default, making manual DEPENDPATH setup unnecessary. Change-Id: I705c8e11b8787bb4f848f4aad19d860f88b04577 Reviewed-by: Joerg Bornemann <joerg.bornemann@digia.com>
* add support for TR_EXCLUDEOswald Buddenhagen2012-11-202-0/+48
| | | | | | | | this is necessary for excluding 3rd party code, etc. Change-Id: I2d32b6014741178bb8a62d29185241c90488754d Reviewed-by: hjk <qthjk@ovi.com> Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@digia.com>
* don't add DEPENDSPATH to VPATHOswald Buddenhagen2012-11-203-4/+4
| | | | | | | | follow suit with qmake ... Change-Id: Ie1748d2056c7218b76d75cddd0bc7fb3f66cf8f7 Reviewed-by: hjk <qthjk@ovi.com> Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@digia.com>
* Change copyrights from Nokia to DigiaIikka Eklund2012-09-2587-2150/+2150
| | | | | | | | | Change copyrights and license headers from Nokia to Digia Change-Id: If89e41b25a242ff376eacdf8790957bcf499cc66 Reviewed-by: Janne Anttila <janne.anttila@digia.com> Reviewed-by: Sergio Ahumada <sergio.ahumada@digia.com> Reviewed-by: Lars Knoll <lars.knoll@digia.com>
* make lupdate test significant againOswald Buddenhagen2012-09-201-4/+0
| | | | | | | | everything seems to be passing Task-number: QTBUG-25483 Change-Id: I342c68477793b2445c065a53e3d4cced56c0d97c Reviewed-by: Daniel Teske <daniel.teske@digia.com>
* make linguist test work with shadow buildsOswald Buddenhagen2012-09-201-1/+1
| | | | | | Change-Id: I8aefcd88f95f6527f62029cc8afc88d42b02ec33 Reviewed-by: Daniel Teske <daniel.teske@digia.com> Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@digia.com>
* support indirect SUBDIRSOswald Buddenhagen2012-09-201-1/+2
| | | | | | | that is, .file and .subdir "structs". Change-Id: I6c7ea5971642802a97461d821cb1544fcc986013 Reviewed-by: Daniel Teske <daniel.teske@digia.com>
* less esoteric parameter passing to processProject()Oswald Buddenhagen2012-09-202-2/+2
| | | | | | | | | | just pass around fully qualified file names instead of QFileInfos. a side effect of this is that error messages use full paths as well - this can be considered good or not. Change-Id: I55a7545064d32ac717ce9c57205ef59b76afc3f0 Reviewed-by: Daniel Teske <daniel.teske@digia.com> Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@digia.com>
* sort <extra-*> tagsOswald Buddenhagen2012-09-203-3/+3
| | | | | | | relying on hash sort order is no good idea Change-Id: I314222bbfd94d29bad1cb7e8b6823b320a88ea75 Reviewed-by: Daniel Teske <daniel.teske@digia.com>
* Set the Qt API level to compatibility mode in all tests.Thiago Macieira2012-08-0253-0/+53
| | | | | | | | | | Qt 5.0 beta requires changing the default to the 5.0 API, disabling the deprecated code. However, tests should test (and often do) the compatibility API too, so turn it back on. Task-number: QTBUG-25053 Change-Id: I73b99cd8e948dbebcdac30c4e5f2772eacb958ab Reviewed-by: Jason McDonald <jason.mcdonald@nokia.com>
* Add bug number for unstable test.Jason McDonald2012-04-251-1/+1
| | | | | | Task-number: QTBUG-25483 Change-Id: Ic2778a5b23950a698eb678938a38afe7317421d1 Reviewed-by: Friedemann Kleint <Friedemann.Kleint@nokia.com>
* Remove "All rights reserved" line from license headers.Jason McDonald2012-01-3087-87/+87
| | | | | | | | | | | As in the past, to avoid rewriting various autotests that contain line-number information, an extra blank line has been inserted at the end of the license text to ensure that this commit does not change the total number of lines in the license header. Change-Id: Ib4b7580dda53886247ad6eb10d17d8e67c51980d Sanity-Review: Qt Sanity Bot <qt_sanity_bot@ovi.com> Reviewed-by: Rohan McGovern <rohan.mcgovern@nokia.com>
* Update obsolete contact address.Jason McDonald2012-01-2387-87/+87
| | | | | | | | Replace Nokia contact email address with Qt Project website. Change-Id: I3841a7c154b90b73fe8f498fda035c8b3545c692 Sanity-Review: Qt Sanity Bot <qt_sanity_bot@ovi.com> Reviewed-by: Rohan McGovern <rohan.mcgovern@nokia.com>
* Update copyright year in license headers.Jason McDonald2012-01-0687-87/+87
| | | | | | Change-Id: I89fb3609f49f9a4f1e7d658b05e212febcb14c94 Sanity-Review: Jason McDonald <jason.mcdonald@nokia.com> Reviewed-by: Rohan McGovern <rohan.mcgovern@nokia.com>
* Improve lupdateRoberto Raggi2011-12-138-0/+323
| | | | | | | | | | | | | | | | | Merge the QML and the Javascript front-ends. Also, change the way we process directives in QML/JS comments. The old code was processing all the directives before visiting the AST nodes. Unfortunately, this doesn't play nice with TRANSLATOR-like directives. Added support for translating extended Javascript files. That is, QML/JS extends Javascript with pragma directives (e.g. .pragma). We emulate the `real' QML engine and we simply remove the pragmas from the original source code. Change-Id: Ie2536b10199a587b97f41c5e0560acabae981807 Sanity-Review: Qt Sanity Bot <qt_sanity_bot@ovi.com> Reviewed-by: Roberto Raggi <roberto.raggi@nokia.com>
* lupdate: Allow trailing commas in QtScript/JS object literalsKent Hansen2011-12-063-0/+133
| | | | | | | | | | | | | | | As per ECMA-262 5th edition, section 11.1.5, trailing commas should be allowed in object literals. E.g. { foo: 10, } shouldn't cause a syntax error; the comma should simply be ignored. Task-number: QTBUG-22970 Change-Id: I3e730ad3001760475e5e40bb4a28a05b0baf5c7e Sanity-Review: Qt Sanity Bot <qt_sanity_bot@ovi.com> Reviewed-by: Roberto Raggi <roberto.raggi@nokia.com> Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com>
* tests: eliminated usage of qttest_p4.prfRohan McGovern2011-10-071-1/+3
| | | | | | | | | | | qttest_p4.prf was added as a convenience for Qt's own autotests in Qt4. It enables various crufty undocumented magic, of dubious value. Stop using it, and explicitly enable the things from it which we want. Change-Id: Ie775d011e6f63d4d174c2be78cda138d7bbe85ff Reviewed-on: http://codereview.qt-project.org/6186 Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com> Reviewed-by: Jason McDonald <jason.mcdonald@nokia.com>
* Mark lupdate test as unstable.Friedemann Kleint2011-07-011-0/+3
| | | | | tst_lupdate::good(heuristics) fails due to due to changes in qtbase/mkspecs/features/qt_config.prf.
* Update licenseheader text in source files for qttools Qt moduleJyri Tahtela2011-05-2485-1507/+1507
| | | | | | | Updated version of LGPL and FDL licenseheaders. Apply release phase licenseheaders for all source files. Reviewed-by: Trust Me
* Fixed lupdate test.axis2011-04-271-1/+1
|
View Lorry Controller Status