summaryrefslogtreecommitdiffstats
path: root/tools/linguist
Commit message (Collapse)AuthorAgeFilesLines
* More copyright changes to Digia Plc in translations and toolsjutaipal2012-10-144-13/+13
| | | | | | | | Change-Id: Idb88b4e72548dfa641c6b8ce78a661fa61757ad0 Reviewed-by: Sergio Ahumada <sergio.ahumada@digia.com> Reviewed-by: Simo Fält <simo.falt@digia.com> Reviewed-by: Akseli Salovaara <akseli.salovaara@digia.com> Reviewed-by: Lars Knoll <lars.knoll@digia.com>
* Change copyrights from Nokia to DigiaIikka Eklund2012-09-2987-2072/+2072
| | | | | | | | 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>
* Properly handle include cyclesKevin Ottens2012-08-081-28/+75
| | | | | | | | | | | | | | | | | | | | | | | Currently lupdate is just issuing a warning when it detects an include cycle. Since it's not a full preprocessor, most of those warnings are false positives, but they need special handling, this patch provides that. Now every result is stored as part of a cycle (so in the general case a cycle of one file). When detecting a cycle, instead instead of issuing a warning, we record the presence of the newly detected cycle for later use and merge the other relevant cycles with it. When retrieving results now it's not for a single file anymore but for a complete cycle at once (which can turn out to be a cycle of one file). This is a backport of the commit done in qttools with revision 3b99677b3376924e347ec4aeb0c363438146bfde Task-number: QTBUG-6587 Change-Id: Idc79fbac4f69478ccff1464c1f4278d4afbf9d61 Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com>
* Update contact information in license headers.Sergio Ahumada2012-08-0186-172/+172
| | | | | | | | | | | | | - 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>
* Update year in Nokia copyright messages.Jason McDonald2012-01-1187-88/+88
| | | | | | | | | 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>
* Qt Linguist: Fix crashesTakumi ASAKI2011-11-304-9/+19
| | | | | | | | Fix crash when select translation after close and open file. This patches includes refactoring of b68b59f252930538cc124b31decc990ab57bea20 Merge-request: 1480 Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com>
* Merge remote-tracking branch 'qt-qa-review/master'Sergio Ahumada2011-11-261-1/+1
|\
| * Merge branch 'master' of git://scm.dev.nokia.troll.no/qt/qt-qa-teamQt Continuous Integration System2011-08-221-1/+1
| |\ | | | | | | | | | | | | * 'master' of git://scm.dev.nokia.troll.no/qt/qt-qa-team: Doc: Fixing typo
| | * Doc: Fixing typoSergio Ahumada2011-08-171-1/+1
| | | | | | | | | | | | | | | | | | | | | Reducing the amount of spelling errors from NBN. Change-Id: I9b228bb95b4a757cff57595125009e70b0097d86 Reviewed-by: Rohan McGovern
* | | Qt Linguist: Fix crash after select 2nd translation in lengthvariantTakumi ASAKI2011-11-174-1/+12
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * MessageEditor keeps deleted editor as m_selectionHolder. QOjbect::destroyed() SIGNAL doesn't fit to fix this problem due to destruction order problem. Merge-request: 1466 Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com>
* | | add -list-languages option to lupdateOswald Buddenhagen2011-10-063-0/+28
| | |
* | | remove dead codeOswald Buddenhagen2011-10-041-7/+0
|/ /
* | Document support for Linguist on Mac.Eike Ziller2011-07-272-0/+118
|/ | | | | | | | Fixes dragging documents on Linguist dock icon, double clicking document in Finder, and the "open" terminal command. Task-number: QTBUG-20194 Reviewed-by: Oswald Buddenhagen
* Doc: Fixing typoSergio Ahumada2011-06-301-1/+1
|
* QTBUG-19500 lupdate fails to run from the Mac binary package on Mac OS X 10.5Simo Fält2011-06-171-2/+4
| | | | | | Replaced std::cout with QTextStream Reviewed-by: Eckhart Köppen
* Merge branch 'master' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into ↵Qt Continuous Integration System2011-06-101-1/+0
|\ | | | | | | | | | | | | master-integration * 'master' of scm.dev.nokia.troll.no:qt/oslo-staging-1: fix build on windows 7
| * fix build on windows 7Oswald Buddenhagen2011-06-101-1/+0
| | | | | | | | remove pointless epocroot.pri inclusion
* | Merge branch 'master' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into ↵Qt Continuous Integration System2011-06-0822-2610/+4817
|\ \ | |/ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | master-integration * 'master' of scm.dev.nokia.troll.no:qt/oslo-staging-1: (32 commits) Fix autotest on Windows Compile on Mac OS X Ammend last commit Implemented QAccessibleTextEdit::attributes() Changing cursor position in all boundaries code clean-up for QSystemSemaphore simplify QSharedMemoryPrivate::cleanHandle() minor improvements for QSharedMemory fix potential keyfile leaking refactoring of the QWSSharedMemory class allow the user to averride QT_QWS_TEMP_DIR in qplatformdefs.h minor typo fix minor code simplification minor code simplification avoid the QT_NO_ASCII warning remove an unused headers nano optimization don't reallocate memory if the old buffer has sufficient capacity fix potential memory leaking don't delete the lock if it was not created by this surface ...
| * "fix" license headersOswald Buddenhagen2011-06-029-126/+207
| | | | | | | | our policy and even more its implementation is mildly braindead ...
| * need no qlibraryinfo any moreOswald Buddenhagen2011-06-012-21/+0
| | | | | | | | we call qmake now
| * remove dead variablesOswald Buddenhagen2011-06-011-17/+3
| |
| * optimization: avoid creating unnecessary temporariesOswald Buddenhagen2011-06-011-35/+29
| | | | | | | | | | erase messages instead of building a new list of non-dropped ones. modify messages instead of replacing them with modified copies.
| * add hash-based indexing to Translator for fast find()Oswald Buddenhagen2011-06-012-26/+92
| |
| * remove Translator::translatedMessages()Oswald Buddenhagen2011-06-013-13/+1
| | | | | | | | | | it's inefficient to construct a new list. on top of that, the only user actually checks the message state again.
| * remove Translator::contains()Oswald Buddenhagen2011-06-013-10/+1
| | | | | | | | it's redundant with find() now, as the latter is cheap now
| * optimization: make the Translator::find() api index-basedOswald Buddenhagen2011-06-013-35/+38
| |
| * fix misnomer: MainWindow::closePhraseBooks() => maybeSavePhraseBooks()Oswald Buddenhagen2011-06-012-3/+3
| |
| * nuke Translator::release(), make saveQM() non-static insteadOswald Buddenhagen2011-06-015-14/+5
| | | | | | | | this "factory" served only to obfuscate the code
| * synchronize qmake project parser with qt creatorOswald Buddenhagen2011-06-0114-2580/+4708
| | | | | | | | | | qt creator as of ddb918f. not feeling like replaying the whole history ...
* | Merge branch 4.7 into qt-4.8-from-4.7Qt Continuous Integration System2011-06-061-1/+14
|\ \ | |/ |/|
| * Update Japanese translations.Takumi ASAKI2011-06-061-1/+14
| | | | | | | | | | | | | | | | | | * Fix some inconsistent translations. * Translate some missing messages. * Update Japanese phrasebook. Merge-request: 1249 Reviewed-by: ossi
| * Update licenseheader text in source filesJyri Tahtela2011-05-1383-1415/+1415
| | | | | | | | | | | | | | Updated version of LGPL and FDL licenseheaders. Apply release phase licenseheaders for all source files. Reviewed-by: Trust Me
* | Merge remote-tracking branch 'mainline/4.8'Oswald Buddenhagen2011-06-0183-1415/+1415
|\ \
| * | Update licenseheader text in source files for qt4.8Jyri Tahtela2011-05-1383-1415/+1415
| | | | | | | | | | | | | | | | | | | | | Updated version of LGPL and FDL licenseheaders. Apply release phase licenseheaders for all source files. Reviewed-by: Trust Me
* | | use a printErr() function instead of std::cerr like in lupdateOswald Buddenhagen2011-06-011-8/+12
|/ /
* | Merge remote-tracking branch 'origin/4.7' into qt-master-from-4.7Olivier Goffart2011-04-181-5/+7
|\ \ | |/ | | | | | | | | | | | | | | Conflicts: qmake/generators/makefile.cpp qmake/generators/win32/msbuild_objectmodel.cpp qmake/generators/win32/msvc_vcxproj.cpp src/corelib/global/qnamespace.h src/gui/text/qtextcontrol.cpp
| * fix detection of relative location informationOswald Buddenhagen2011-04-111-5/+7
| | | | | | | | | | | | | | | | | | an empty line number does not indicate relative loc info - it may be the result of -no-ui-lines. instead, an empty file name does indicate it - no file name at all makes no sense, so this means a previous messages has set it already. and we need this additional detection, as the entire ts file may have no line number info to base the decision on at all.
* | Merge earth-team into origin/master'Olivier Goffart2011-04-121-1/+1
|\ \
| * \ Merge branch 4.7 into qt-master-from-4.7Qt Continuous Integration System2011-04-091-1/+1
| |\ \ | | |/
| | * make -markuntranslated work without -idbasedOswald Buddenhagen2011-04-081-1/+1
| | | | | | | | | | | | Task-number: QTBUG-18625
* | | Fix errors when compiling Qt with STLportCédric OCHS2011-03-281-0/+1
|/ / | | | | | | | | | | Task-number: QTBUG-18374 Reviewed-by: Olivier Goffart Merge-request: 1157
* | Merge remote-tracking branch 'origin/4.7' into qt-master-from-4.7Thiago Macieira2011-03-242-34/+39
|\ \ | |/ | | | | | | Conflicts: src/opengl/qwindowsurface_gl.cpp
| * sort out stdout vs. stderr usageOswald Buddenhagen2011-03-222-34/+39
| | | | | | | | Task-number: QTBUG-14728
* | Merge branch 4.7 into qt-master-from-4.7Qt Continuous Integration System2011-02-021-1/+1
|\ \ | |/
| * Don't ignore source-text when generating qsTrId translations for QMLTor Arne Vestbø2011-02-011-1/+1
| | | | | | | | Reviewed-by: ossi
* | Merge branch 'qt-master-from-4.7' of ↵Qt Continuous Integration System2011-01-262-2/+2
|\ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | scm.dev.nokia.troll.no:qt/qt-integration into master-integration * 'qt-master-from-4.7' of scm.dev.nokia.troll.no:qt/qt-integration: (67 commits) Avoid possible font name collisions on fbserv Update of Czech translation for Qt 4.7-stable Fix crash in QtScript/JSC stack allocator on Symbian HTTP: fix digest authentication Fix loop count in animanted gifs sometimes being incorrect Fixed UTF-8 application names in device application menu in Symbian Validate arguments to QDBusConnection::connect make the test a bit stricter ignore the warning from auto-detach in destructor get rid of extra calls to handle() simplify QSharedMemory::detach() avoid extra calculations fix error reporting on detach() fix error reporting Make QMAKE_EXTENSION_SHLIB and friends work in all Symbian mkspecs. Fix to pen state handling in OpenVG paint engine. BorderImage fails for .sci source containing a URL positionViewAtIndex can fail when positioned near end of list. Revert "Fix loaded() signal to be emitted only once" Revert "don't include harfbuzz where we don't use it" ...
| * \ Merge remote branch 'origin/4.7' into qt-master-from-4.7Olivier Goffart2011-01-252-2/+2
| |\ \ | | |/ | | | | | | | | | | | | Conflicts: configure src/network/bearer/bearer.pri
| | * fix typo in error messagesOswald Buddenhagen2011-01-172-2/+2
| | | | | | | | | | | | Task-number: QTBUG-16369
* | | Added scrollbars support to the Linguist form preview.Sergey Belyashov2011-01-251-0/+2
|/ / | | | | | | | | Merge-request: 1030 Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com>
* | Merge remote branch 'origin/4.7' into qt-master-from-4.7Olivier Goffart2011-01-1784-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