summaryrefslogtreecommitdiffstats
path: root/tests/auto/linguist/lupdate
Commit message (Collapse)AuthorAgeFilesLines
* Update copyright headersAkseli Salovaara2015-03-3188-1139/+1139
| | | | | | | | | Qt copyrights are now in The Qt Company, so we could update the source code headers accordingly. In the same go we should also fix the links to point to qt.io. Change-Id: I7e3e96183e073877b46bc8071b2ccae19e69426b Reviewed-by: Jani Heikkinen <jani.heikkinen@theqtcompany.com>
* Updated year in copyright headerKai Koehne2014-03-2688-88/+88
| | | | | | | | | | | | | | | | | | find . -path '*/3rdparty/*' -prune -o -type f -print | xargs -L1 sed -i -E 's/Copyright(.*) 2013 Digia/Copyright\1 2014 Digia/g' Manually patched files: demos/spectrum/3rdparty/fftreal/fftreal_wrapper.h demos/spectrum/3rdparty/fftreal/fftreal_wrapper.cpp src/3rdparty/s60/eiksoftkeyimage.h tools/qdoc3/test/qt-project.qdocconf tests/auto/qsharedpointer/nontracked.h tests/auto/qsharedpointer/nontracked.cpp Change-Id: I3f9074923b4d6bd4666258ab04f01476cc6e901c Reviewed-by: Thiago Macieira <thiago.macieira@intel.com> Reviewed-by: Sergio Ahumada <sahumada@blackberry.com> Reviewed-by: Lars Knoll <lars.knoll@digia.com>
* correctly resolve INCLUDEPATH relative to current projectOswald Buddenhagen2014-02-055-0/+123
| | | | | | | | Task-number: QTBUG-24587 Change-Id: I1384403e5c5e3313649fa4abb98e7578cae4677b Reviewed-by: hjk <hjk121@nokiamail.com> Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@digia.com> (cherry picked from qttools/92020773c1739feb4dc240827271720f615431d0)
* fix strings from #included sources not being collectedOswald Buddenhagen2014-02-053-0/+52
| | | | | | | | Task-number: QTBUG-27974 Change-Id: I30edae2db5449605984a118458b1ccce7ad67eb1 Reviewed-by: hjk <hjk121@nokiamail.com> Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@digia.com> (cherry picked from qttools/bcaa8575352ad16e1f6020436e1a3f450eefd53e)
* execute some loops even in cumulative modeOswald Buddenhagen2013-08-191-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> (cherry picked from qttools/dd4d594c787a62fa8aa12695c5d115c71b59bacd)
* Update copyright year in Digia's license headersSergio Ahumada2013-01-1385-85/+85
| | | | | | Change-Id: I52bf8ef0447b701b4ebf7d7d240013a72adb9425 Reviewed-by: Akseli Salovaara <akseli.salovaara@digia.com> Reviewed-by: Sergio Ahumada <sergio.ahumada@digia.com>
* support indirect SUBDIRSLucas Wang2012-12-061-1/+2
| | | | | | | | | | that is, .file and .subdir "structs". (cherry picked from commit 3460395ebbf1e9eb05419854c0d5de28b89b9b0a) Change-Id: Ifdeedbbc0bccc9bc7a21707152750d7a2e839a5c Reviewed-by: Liang Qi <liang.qi@digia.com> Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@digia.com>
* Change copyrights from Nokia to DigiaIikka Eklund2012-09-2985-2102/+2102
| | | | | | | | Change copyrights and license headers from Nokia to Digia Change-Id: I280c0a575987d1770e354b4948f1d4d767d711ea Reviewed-by: Simo Fält <simo.falt@digia.com> Reviewed-by: Sergio Ahumada <sergio.ahumada@digia.com>
* Update contact information in license headers.Sergio Ahumada2012-08-0185-170/+170
| | | | | | | | | | | | | - Replace Nokia contact email address with Qt Project website. - Remove "All rights reserved" line from license headers. 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: Ie7ba62011752fcb149b99b26317c54f2a0cfa931 Reviewed-by: Jason McDonald <jason.mcdonald@nokia.com>
* tests: Mark unstable tests as insignificant on WindowsSergio Ahumada2012-02-141-0/+1
| | | | | | | | | | | | | | | | | Marked the following tests insignificant due to failures, these need to be fixed later and then re-enabled: tst_qdeclarativeerror tst_lupdate tst_qfile tst_qlibrary tst_qtcpserver tst_qxmlquery Task-number: QTQAINFRA-428 Change-Id: I648f86b3ec7767f83767af8981a6ce2aed65722b Reviewed-by: Miikka Heikkinen <miikka.heikkinen@digia.com> Reviewed-by: Toby Tomkins <toby.tomkins@nokia.com>
* Update year in Nokia copyright messages.Jason McDonald2012-01-1185-85/+85
| | | | | | | | | Simple search and replace. This commit doesn't touch 3rd-party files, nor translations (where the change is not so simple and will be handled in a separate commit). Change-Id: I4e48513b8078a44a8cd272326685b25338890148 Reviewed-by: Rohan McGovern <rohan.mcgovern@nokia.com>
* Update licenseheader text in source files for qt4.8Jyri Tahtela2011-05-1385-1507/+1507
| | | | | | | Updated version of LGPL and FDL licenseheaders. Apply release phase licenseheaders for all source files. Reviewed-by: Trust Me
* Merge branch 4.7 into qt-master-from-4.7Qt Continuous Integration System2011-02-022-0/+8
|\
| * Don't ignore source-text when generating qsTrId translations for QMLTor Arne Vestbø2011-02-012-0/+8
| | | | | | | | Reviewed-by: ossi
* | Merge remote branch 'origin/4.7' into qt-master-from-4.7Olivier Goffart2011-01-1785-85/+85
|\ \ | |/ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: examples/webkit/imageanalyzer/imageanalyzer.h examples/webkit/imageanalyzer/mainwindow.h mkspecs/unsupported/qws/linux-x86-openkode-g++/qplatformdefs.h src/corelib/io/qfsfileengine_iterator_unix.cpp src/corelib/io/qfsfileengine_iterator_win.cpp src/corelib/kernel/qcoreapplication.cpp src/network/access/qnetworkaccessdatabackend.cpp src/plugins/bearer/connman/qconnmanservice_linux.cpp src/plugins/platforms/openvglite/qwindowsurface_vglite.h src/s60installs/bwins/QtCoreu.def src/s60installs/eabi/QtCoreu.def src/s60installs/s60installs.pro tools/assistant/tools/assistant/helpviewer_qwv.h tools/qdoc3/test/qt-html-templates.qdocconf
| * Update copyright year to 2011.Jason McDonald2011-01-1085-85/+85
| | | | | | | | Reviewed-by: Trust Me
* | Make lupdate recognize TRANSLATOR comments in QtScript filesKent Hansen2010-11-223-0/+113
|/ | | | | | | | | | | | - Made the output translator a member of the parser, since the processComment() callback needs it now. - Made the context for tr()/TR_NOOP() a member of the parser, since it should persist for subsequent tr calls. - The comment processing logic should match that of cpp.cpp, as usual. Task-number: QTBUG-15502 Reviewed-by: Oswald Buddenhagen
* Replace all occurances of "Qt 4.7" with "QtQuick 1.0"Aaron Kennedy2010-09-291-1/+1
| | | | | Task-number: QTBUG-13799 Reviewed-by: Martin Jones
* make lupdate test less fragileOswald Buddenhagen2010-09-212-2/+8
| | | | | the sensivity to additions of new calls to unimplemented qmake functions to .prf files kinda sucks, so remove it.
* delay next token fetching when opening namespaceOswald Buddenhagen2010-09-102-0/+33
| | | | | | | | otherwise, if the next token to be fetched is a non-empty #define, it would save the context before entering the namespace, and thus the post-define context restore would just discard the namespace entry. Task-number: QTBUG-12683
* don't let operator overloads confuse usOswald Buddenhagen2010-09-102-0/+24
| | | | Task-number: QTBUG-11426
* Support for qsTrId and meta-data in comments for QML.Michael Brasser2010-09-013-0/+295
|
* Add test that exercises lupdate warnings for QtScriptKent Hansen2010-08-234-0/+118
| | | | Reviewed-by: Oswald Buddenhagen
* Make lupdate's QtScript frontend recognize qsTrId() / QT_TRID_NOOP()Kent Hansen2010-08-232-0/+35
| | | | | | | | | Extracting the translation data is only the first step; a separate commit will make the functions available in the QtScript runtime. Task-number: QTBUG-8454 Reviewed-by: Oswald Buddenhagen
* Add support for comments and meta-data in the lupdate QtScript frontendKent Hansen2010-08-233-0/+254
| | | | | | | | | | | | | | | | This brings the support more in line with the C++ frontend. No support for magic TRANSLATOR comment yet. Add a proper test for the QtScript parser. Support for qtTrId() and friends coming in a separate commit. Previously the lexer just skipped comments. Now the contents of each comment is retained and passed to a "comment processor" interface. The parser implements the interface and performs logic very similar to the C++ parser to extract data from the comment. Task-number: QTBUG-11774 Reviewed-by: Oswald Buddenhagen
* immediately set function context when entering a namespaceOswald Buddenhagen2010-07-072-0/+40
| | | | | | | | otherwise, tr() calls without absolute qualification will not be properly qualified inside the first function if it has no qualification, either. Task-number: QTBUG-11742 (not really)
* warn about stray meta dataOswald Buddenhagen2010-06-291-0/+1
|
* don't complain multiple times about same abuse of //% meta stringsOswald Buddenhagen2010-06-293-0/+27
| | | | | Reviewed-by: Kent Hansen Task-number: QTBUG-11818
* Merge branch '4.6' of scm.dev.nokia.troll.no:qt/qt into qt-4.7-from-4.6Simon Hausmann2010-06-201-1/+1
|\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | src/3rdparty/* is left untouched and not merged from 4.6. The corresponding changes in Harfbuzz and WebKit are already in the 4.6 staging areas. Conflicts: src/3rdparty/webkit/VERSION src/3rdparty/webkit/WebCore/ChangeLog src/3rdparty/webkit/WebKit/qt/ChangeLog src/3rdparty/webkit/WebKit/qt/tests/qgraphicswebview/tst_qgraphicswebview.cpp src/3rdparty/webkit/WebKit/qt/tests/qwebview/tst_qwebview.cpp src/3rdparty/webkit/WebKit/qt/tests/qwebview/tst_qwebview.qrc tests/auto/qtextlayout/tst_qtextlayout.cpp tests/auto/qwidgetaction/tst_qwidgetaction.cpp
| * Attempt to stabilize tst_lupdate::goodRohan McGovern2010-06-161-1/+1
| | | | | | | | Increase timeout when running lupdate from 5 to 30 seconds.
* | Merge remote branch 'origin/4.6' into qt-4.7-from-4.6Olivier Goffart2010-06-084-0/+107
|\ \ | |/ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: src/3rdparty/webkit/VERSION src/3rdparty/webkit/WebCore/ChangeLog src/3rdparty/webkit/WebKit/qt/Api/qwebpage.cpp src/3rdparty/webkit/WebKit/qt/ChangeLog src/gui/painting/qpainter.cpp src/gui/painting/qtextureglyphcache.cpp src/opengl/gl2paintengineex/qpaintengineex_opengl2.cpp src/opengl/gl2paintengineex/qtextureglyphcache_gl_p.h src/s60installs/bwins/QtGuiu.def src/s60installs/eabi/QtCoreu.def src/s60installs/eabi/QtGuiu.def src/s60installs/eabi/QtNetworku.def src/s60installs/eabi/QtOpenVGu.def tests/auto/qfontmetrics/tst_qfontmetrics.cpp tools/linguist/lupdate/main.cpp
| * fix translations from some header files being omittedOswald Buddenhagen2010-06-074-0/+107
| | | | | | | | | | | | | | | | | | add the containing directories of all files specified on the command line to the list of project roots. otherwise, the strings from headers which are included before being encountered on the command line will be omitted. Task-number: QTBUG-10345
* | don't use qWarning() - or even qFatal()! - gratuitously.Oswald Buddenhagen2010-06-032-8/+0
| | | | | | | | Task-number: QTBUG-8044
* | escape backslashesOswald Buddenhagen2010-05-261-2/+2
| | | | | | | | this makes windows-style path specs *ugly*. that's intentional. :-P
* | Merge remote branch 'origin/4.6' into qt-4.7-from-4.6Olivier Goffart2010-04-163-1/+41
|\ \ | |/ | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: src/3rdparty/webkit/VERSION src/3rdparty/webkit/WebCore/ChangeLog src/3rdparty/webkit/WebCore/page/FrameView.cpp src/3rdparty/webkit/WebCore/rendering/RenderWidget.cpp src/3rdparty/webkit/WebKit/qt/symbian/eabi/QtWebKitu.def src/s60installs/bwins/QtCoreu.def src/s60installs/bwins/QtGuiu.def src/s60installs/bwins/QtNetworku.def src/s60installs/eabi/QtGuiu.def tests/auto/qscriptextqobject/tst_qscriptextqobject.cpp
| * create magic comment messages in "finished" stateOswald Buddenhagen2010-04-151-1/+1
| | | | | | | | | | there is really no point in marking them "unfinished". later file rewrites would reset the state anyway.
| * make QT_TR_NOOP work in static initializersOswald Buddenhagen2010-04-152-0/+40
| | | | | | | | | | | | | | | | | | do that by ignoring all equal signs and everything between and including brackets. this makes static initializers look effectively like function definitions, thus creating proper context. Task-number: QTBUG-9276
* | Merge remote branch 'origin/4.6' into qt-4.7-from-4.6Rohan McGovern2010-03-062-0/+84
|\ \ | |/ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: configure.exe examples/multimedia/audioinput/audioinput.cpp src/corelib/io/qfsfileengine.cpp src/gui/egl/qegl_wince.cpp src/gui/egl/qeglproperties.cpp src/gui/egl/qeglproperties_p.h src/gui/embedded/directfb.pri src/gui/kernel/qapplication_win.cpp src/gui/painting/qdrawutil.cpp src/opengl/qgl_p.h src/sql/drivers/odbc/qsql_odbc.cpp src/sql/drivers/odbc/qsql_odbc.h tests/auto/auto.pro tests/auto/qgl/tst_qgl.cpp translations/assistant_adp_ru.ts
| * fix "using namespace" recursion crashOswald Buddenhagen2010-03-052-0/+84
| | | | | | | | Task-number: QTBUG-8360
* | Fix copyright year.Jason McDonald2010-02-161-1/+1
| | | | | | | | Reviewed-by: Trust Me
* | Merge remote branch 'qt/4.6' into qt-master-from-4.6Qt Continuous Integration System2010-02-0160-57/+719
|\ \ | |/ | | | | | | | | | | | | | | | | Conflicts: src/gui/kernel/qeventdispatcher_mac.mm src/gui/kernel/qt_cocoa_helpers_mac.mm src/gui/widgets/qmenu_mac.mm tests/auto/qgraphicswidget/tst_qgraphicswidget.cpp tools/assistant/tools/assistant/centralwidget.cpp tools/linguist/lupdate/main.cpp
| * don't falsely complain about mismatched codecfortrOswald Buddenhagen2010-01-2710-0/+150
| | | | | | | | normalize the user input first
| * add directories with sources to list of project rootsOswald Buddenhagen2010-01-275-0/+120
| | | | | | | | | | | | | | | | if the pro file for the translations lives in a sibling tree of the actual source tree, messages from included headers wouldn't have been collected, as they were not considered part of the project. Task-number: QTBUG-7495
| * sanitize lupdate's behavior regarding SUBDIRS projectsOswald Buddenhagen2010-01-2740-3/+423
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | previously, the semantics of nesting projects were pretty bizarre: the list of TS files grew ever as the subdirs were visited. the source files otoh were cleared for every project. this meant that some TS files were updated over and over again, each time with different data. this is obviously total nonsense, so there is no compatibilty to keep. so here come the new semantics: - each project is scanned separately. it has separate include paths and may override the inherited CODECFORSRC. - the messages from all sub-projects are merged - if a sub-project has a TRANSLATIONS entry, it is "detached" from its parent project, thus starting an own merged translator. it is also possible to name an empty set of TS files to simply exclude the sub-project. - CODECFORTR can be specified in each project with TRANSLATIONS - if TS files are specified on the command line, they override TRANSLATIONS from the top level project and stop processing of detached projects alltogether. if multiple top-level projects are specified, they are all merged. this is somewhat slower, as now includes are re-scanned per project, while previously all sources were simply accumulated and scanned as one project. this can be fixed retroactively if needed.
| * absorb cmdline tests into "good" structureOswald Buddenhagen2010-01-276-42/+4
| |
| * add ability to set working dir for testOswald Buddenhagen2010-01-271-7/+13
| |
| * support multiple output filesOswald Buddenhagen2010-01-271-10/+14
| |
| * fix printing output from failed commandOswald Buddenhagen2010-01-271-1/+1
| |
* | Merge branch '4.6'Thiago Macieira2010-01-13128-759/+350
|\ \ | |/ | | | | | | | | | | | | | | | | | | Conflicts: bin/syncqt doc/src/deployment/deployment.qdoc src/corelib/io/qfsfileengine_win.cpp src/corelib/xml/qxmlstream.cpp src/opengl/gl2paintengineex/qpaintengineex_opengl2_p.h tools/assistant/tools/assistant/centralwidget.cpp tools/linguist/lupdate/main.cpp
| * Merge remote branch 'mainline/4.6' into 4.6Oswald Buddenhagen2010-01-1371-71/+71
| |\ | | | | | | | | | | | | Conflicts: tests/auto/linguist/lupdate/testlupdate.cpp
generated by cgit v0.12 at 2024-11-22 01:19:58 (GMT)