summaryrefslogtreecommitdiffstats
path: root/tools/linguist
Commit message (Collapse)AuthorAgeFilesLines
* Update copyright headersAkseli Salovaara2015-03-3188-1112/+1112
| | | | | | | | | 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>
* Bump year to 2015Kai Koehne2015-01-154-5/+5
| | | | | | | Bump year to 2015 in all but source code comments. Change-Id: I1dd7972dee65a86a9bd560ead32bbd0cbe82f439 Reviewed-by: Martin Smith <martin.smith@digia.com>
* Updated year in copyright headerKai Koehne2014-03-2687-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>
* Ensure correct codec is used for Sources and Forms view.Mitch Curtis2014-02-191-1/+1
| | | | | | | | | | 6626e5f41712723405c110a4f11ad650116f7523 did it on the wrong line. This problem does not exist in Qt 5. Change-Id: Ia39bc69b3f5ad58d28994ef3cae00242a8d0adbb Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@digia.com> Reviewed-by: Titta Heikkala <titta.heikkala@digia.com>
* correctly resolve INCLUDEPATH relative to current projectOswald Buddenhagen2014-02-051-1/+1
| | | | | | | | 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-051-0/+1
| | | | | | | | 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-7/+10
| | | | | | | | | | | | | | | | 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)
* lupdate: Fixing decoding of QML filesEl Mehdi Fekari2013-08-121-1/+4
| | | | | | | | | | Decode text stream from QML files as UTF-8 even when the latter is not the default system encoding (QML supports UTF-8 only). Cherry picked from qttools/441f3d964301942e417b238b6e71 Change-Id: I9cc75854ffb610deccba6c7d3c8ddaf61f6da120 Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@digia.com>
* Make linguist's source viewer respect the encoding of files.Mitch Curtis2013-04-184-1/+13
| | | | | | | | | | | | It currently loads source files as latin1, which means other encodings are not supported. Qt 5 change: c4f1ac0fbcd452f440aee4a3304574cb7fbca0ce Task-number: QTBUG-27238 Change-Id: Ieb4de351d93bd5ac2939692c5c53bd681fea4386 Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@digia.com>
* Use path() as we need the path without the filenameAndy Shaw2013-01-281-1/+1
| | | | | | | | | | | On Windows, filePath() was used for a function that was supposed to get the bin directory for Qt. However path() should be used instead as this will remove the filename from the originally obtained string. Change-Id: I16f8bda91fe9666c935318f8d73c715d2ea908f5 Reviewed-by: Laszlo Papp <lpapp@kde.org> Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@digia.com> (cherry picked from commit 05dab891649b76fe7351d51950edf3caba2bfece)
* Update copyright year in Digia's license headersSergio Ahumada2013-01-1387-88/+88
| | | | | | 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/+6
| | | | | | | | | | 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>
* 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
|\ \
generated by cgit v0.12 at 2024-11-26 05:11:09 (GMT)