summaryrefslogtreecommitdiffstats
path: root/tests/auto/linguist
Commit message (Collapse)AuthorAgeFilesLines
* Merge branch '4.6' of scm.dev.nokia.troll.no:qt/qt into qt-4.7-from-4.6Simon Hausmann2010-06-202-2/+2
|\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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_lconvertRohan McGovern2010-06-161-1/+1
| | | | | | | | Increase timeout running lconvert from 1 to 10 seconds.
| * 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
* | write PO files without duplicated message idsOswald Buddenhagen2010-06-021-0/+12
| | | | | | | | | | | | | | | | encoding the qt context as a magic comment was no particularly good idea, as it provided no disambiguation as far as gettext is concerned. so instead encode the context into msgctxt. Task-number: QTBUG-10307
* | 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
* | handle encoding of PO filesOswald Buddenhagen2010-03-316-1/+16
| |
* | add Plural-Forms header in PO writerOswald Buddenhagen2010-03-315-8/+9
| |
* | don't mark untranslated messages as fuzzy in PO filesOswald Buddenhagen2010-03-314-10/+6
| | | | | | | | ... as this is what gettext processors expect.
* | interpret source language "en" as "POSIX" (more precisely: "none specified")Oswald Buddenhagen2010-03-311-1/+1
| | | | | | | | | | | | | | we set it to that value when writing xliff, as the header is mandatory and no better value is possible. it seems unlikely that an unqualified "english" would be used if somebody meant to actually specify a source language, so this hack should be ok.
* | 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-13131-762/+353
|\ \ | |/ | | | | | | | | | | | | | | | | | | 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-1374-74/+74
| |\ | | | | | | | | | | | | Conflicts: tests/auto/linguist/lupdate/testlupdate.cpp
| | * Update copyright year to 2010Jason McDonald2010-01-0675-75/+75
| | | | | | | | | | | | Reviewed-by: Trust Me
| * | really, *really* fix the test :}Oswald Buddenhagen2010-01-121-1/+1
| | | | | | | | | | | | stupid testr ... and me.
| * | remove trimming of (expected) outputOswald Buddenhagen2010-01-122-3/+4
| | | | | | | | | | | | it's needless and potentially detrimental
| * | really fix the autotestOswald Buddenhagen2010-01-122-1/+1
| | |
| * | support regexp-like quantifiers of expected output linesOswald Buddenhagen2010-01-121-26/+100
| | | | | | | | | | | | makes platform-specific optional output possible
| * | remove superfluous \r filteringOswald Buddenhagen2010-01-121-8/+4
| | | | | | | | | | | | we are opening the files/processes in text mode already
| * | print actual rather than expected output for matching textOswald Buddenhagen2010-01-121-3/+3
| | | | | | | | | | | | the expected may contain regular expressions.
| * | fix test under windowsOswald Buddenhagen2010-01-071-0/+1
| | | | | | | | | | | | | | | the windows mkspecs auto-add debug_and_release to CONFIG and thus trigger warnings from the profile parser.
| * | make the lupdate tests more verbose in case of failureOswald Buddenhagen2010-01-064-251/+37
| | | | | | | | | | | | | | | on the way, replace the convoluted TestLUpdate class with a few QProcess calls.
| * | don't use qmake for test setupOswald Buddenhagen2010-01-0634-215/+5
| | | | | | | | | | | | this makes the tests rather significantly faster
| * | move equivalent of output_ts test to good/Oswald Buddenhagen2010-01-068-53/+3
| | |
| * | look for the .result file in the dir where the output is expected to goOswald Buddenhagen2010-01-063-7/+1
| | | | | | | | | | | | | | | that makes manual diffing simpler and makes more complex dir structures less confusing.
| * | fix sametext and number heuristicsOswald Buddenhagen2010-01-066-0/+132
| | | | | | | | | | | | | | | | | | | | | 92e9a48 ("eliminate Translator::replace()") eliminated the correctness as well. whoops. this code should be more efficient as well ...
| * | no point in specifying -ts when a .pro file is specifiedOswald Buddenhagen2010-01-063-4/+3
| | | | | | | | | | | | | | | | | | ... unless of course one hits this weird lupdate behavior regarding SUBDIRS in conjunction with -ts. just use the flag for this one test for now.
| * | clean up the lupdatecmd filesOswald Buddenhagen2010-01-064-16/+3
| | |
| * | tidy up the test .pro filesOswald Buddenhagen2010-01-0635-154/+35
| |/
* | Merge branch '4.6'Thiago Macieira2009-12-022-0/+22
|\ \ | |/ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: src/corelib/global/qglobal.h src/gui/dialogs/qfiledialog_win.cpp src/plugins/qpluginbase.pri src/qbase.pri tests/auto/selftests/expected_cmptest.txt tests/auto/selftests/expected_crashes_3.txt tests/auto/selftests/expected_longstring.txt tests/auto/selftests/expected_maxwarnings.txt tests/auto/selftests/expected_skip.txt tools/assistant/tools/assistant/doc/assistant.qdocconf tools/qdoc3/test/assistant.qdocconf tools/qdoc3/test/designer.qdocconf tools/qdoc3/test/linguist.qdocconf tools/qdoc3/test/qmake.qdocconf tools/qdoc3/test/qt-build-docs.qdocconf tools/qdoc3/test/qt.qdocconf
| * add qph autotestOswald Buddenhagen2009-11-252-0/+22
| |
* | support @-style list files on the command lineOswald Buddenhagen2009-11-266-0/+120
|/ | | | Task-number: QTBUG-4099
* fix encodings, take NOswald Buddenhagen2009-11-207-15/+60
| | | | | Task-number: QTBUG-4499 Task-number: QTBUG-5276
* Merge branch '4.5' into 4.6Thiago Macieira2009-11-134-15/+17
|\
| * remove dependency on git line end conversionsOswald Buddenhagen2009-11-124-15/+17
| | | | | | | | consistently use QIODevice::Text
generated by cgit v0.12 at 2024-11-13 15:53:24 (GMT)