Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Merge branch '4.6' of git://scm.dev.nokia.troll.no/qt/qt into ↵ | Warwick Allison | 2009-11-04 | 3 | -5/+28 |
|\ | | | | | | | | | | | | | | | kinetic-declarativeui Conflicts: configure.exe src/gui/graphicsview/qgraphicsitem_p.h | ||||
| * | Merge remote branch 'mainline/4.6' into 4.6 | Oswald Buddenhagen | 2009-11-02 | 1 | -0/+20 |
| |\ | |||||
| | * | Add a French translation to Assistant. Update the phrase book. | Benjamin Poulain | 2009-10-30 | 1 | -0/+20 |
| | | | | | | | | | | | | Reviewed-by: Pierre Rossi | ||||
| * | | Make Linguist on Mac use the unified toolbar, like Assistant. | Daniel Molkentin | 2009-10-30 | 1 | -0/+1 |
| |/ | | | | | | | Reviewed-By: Oswald Buddenhagen | ||||
| * | do not crash | Oswald Buddenhagen | 2009-10-29 | 1 | -5/+7 |
| | | |||||
* | | Merge branch 'kinetic-declarativeui' of ↵ | Warwick Allison | 2009-10-30 | 1 | -9/+9 |
|\ \ | | | | | | | | | | | | | | | | | | | | | | | | | git@scm.dev.nokia.troll.no:qt/kinetic into kinetic-declarativeui Conflicts: src/declarative/qml/qmlcomponentjs.cpp src/declarative/qml/qmlcomponentjs_p.h src/declarative/qml/qmlcomponentjs_p_p.h | ||||
| * \ | Merge branch '4.6' of ../qt into kinetic-declarativeui | Aaron Kennedy | 2009-10-29 | 1 | -9/+9 |
| |\ \ | | |/ | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: src/script/api/qscriptengine.cpp src/script/api/qscriptprogram.cpp src/script/api/qscriptprogram.h src/script/api/qscriptprogram_p.h tests/auto/qscriptengine/tst_qscriptengine.cpp tests/auto/qscriptengineagent/tst_qscriptengineagent.cpp tools/qdoc3/test/qt-inc.qdocconf | ||||
| | * | make magic comment parsing stricter | Oswald Buddenhagen | 2009-10-28 | 1 | -9/+9 |
| | | | | | | | | | | | | | | | | | | there must be a space after the //: and similar comments, otherwise harmless comments of the sort of //====== foo here ===== will be parsed as message ids, etc. | ||||
* | | | fix headers | Warwick Allison | 2009-10-29 | 1 | -16/+16 |
|/ / | |||||
* | | Merge branch '4.6' of git@scm.dev.nokia.troll.no:qt/qt into ↵ | Michael Brasser | 2009-10-25 | 3 | -6/+13 |
|\ \ | |/ | | | | | | | | | | | kinetic-declarativeui Conflicts: tools/qdoc3/cppcodemarker.cpp | ||||
| * | consider message id when comparing messages | Oswald Buddenhagen | 2009-10-22 | 1 | -2/+6 |
| | | |||||
| * | id-based: do not drop unfinished untranslated messages | Oswald Buddenhagen | 2009-10-22 | 1 | -1/+1 |
| | | | | | | | | otherwise the fallback to use the source string is rather pointless | ||||
| * | id-based: use source strings instead of empty translations only for ↵ | Oswald Buddenhagen | 2009-10-22 | 1 | -3/+4 |
| | | | | | | | | unfinished messages | ||||
| * | actually guess the target language from the file name | Oswald Buddenhagen | 2009-10-22 | 1 | -0/+2 |
| | | | | | | | | --help says it does, but it didn't really. | ||||
* | | Merge commit 'qt-mainline/4.6' into kinetic-declarativeui | Andreas Aardal Hanssen | 2009-10-02 | 5 | -22/+33 |
|\ \ | |/ | | | | | | | Conflicts: configure.exe | ||||
| * | Merge branch '4.5' of scm.dev.nokia.troll.no:qt/qt into 4.6 | Simon Hausmann | 2009-10-01 | 2 | -9/+8 |
| |\ | |||||
| | * | make -{source,target}-language actually override values from files | Oswald Buddenhagen | 2009-10-01 | 1 | -4/+4 |
| | | | | | | | | | | | | -help says it does, and it kinda makes sense | ||||
| | * | make -help reflect reality | Oswald Buddenhagen | 2009-10-01 | 1 | -5/+4 |
| | | | |||||
| * | | fix ts and qm targets for shadow builds and builds with -prefix | Oswald Buddenhagen | 2009-10-01 | 1 | -7/+9 |
| | | | |||||
| * | | remove *_untranslated.ts | Oswald Buddenhagen | 2009-10-01 | 1 | -1/+0 |
| | | | | | | | | | | | | | | | | | | | | | with the current scheme of running "make ts" only when doing a particular translation and checking in only the relevant file, these files are never updated. lconvert can generate an empty template from any translation anyway. | ||||
| * | | Merge branch '4.5' into 4.6 | Thiago Macieira | 2009-09-30 | 1 | -4/+11 |
| |\ \ | | |/ | |||||
| | * | Fix locale encoding in XLIFF files | Andy Shaw | 2009-09-30 | 1 | -4/+11 |
| | | | | | | | | | | | | | | | | | | xlf uses xx-YY notation instead of xx_YY Reviewed-by: ossi | ||||
| * | | fix solaris build | Oswald Buddenhagen | 2009-09-29 | 1 | -1/+5 |
| | | | | | | | | | | | | "A class with a reference member must have a user-defined constructor." | ||||
* | | | Merge branch '4.6' of git@scm.dev.nokia.troll.no:qt/qt into ↵ | Michael Brasser | 2009-09-29 | 5 | -369/+593 |
|\ \ \ | |/ / | | | | | | | | | | | | | | | | | | | kinetic-declarativeui Conflicts: configure.exe mkspecs/features/qt.prf | ||||
| * | | Merge branch 'origin/4.5' into 4.6 | Oswald Buddenhagen | 2009-09-25 | 1 | -10/+82 |
| |\ \ | | |/ | | | | | | | | | | Conflicts: translations/qt_ru.ts | ||||
| | * | Update Russian phrasebook | Ritt Konstantin | 2009-09-25 | 1 | -10/+82 |
| | | | | | | | | | | | | | | | Merge-request: 1611 Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com> | ||||
| | * | Update license headers again. | Jason McDonald | 2009-09-08 | 83 | -332/+332 |
| | | | | | | | | | | | | Reviewed-by: Trust Me | ||||
| * | | remove completely useless .qm install sub-target | Oswald Buddenhagen | 2009-09-25 | 1 | -3/+0 |
| | | | | | | | | | | | | qms are installed centrally from the top-level install target | ||||
| * | | detect and eliminate forwarding headers | Oswald Buddenhagen | 2009-09-23 | 1 | -7/+20 |
| | | | | | | | | | | | | | | | this will save quite some hash lookups (even if in empty hashes) and make the VisitRecorder bitmap smaller. | ||||
| * | | reduce peak memory consumption | Oswald Buddenhagen | 2009-09-23 | 1 | -30/+70 |
| | | | | | | | | | | | | | | | drop the parse results of files which are unlikely to be included (i.e., which are not headers). | ||||
| * | | actually use the argument of Q_DECLARE_TR_FUNCTIONS | Oswald Buddenhagen | 2009-09-23 | 1 | -9/+59 |
| | | | | | | | | | | | | | | | | | | which means that one can set an arbitrary context. as a side effect, this caches the stringified context of Q_OBJECT-derived classes. | ||||
| * | | namespaces *can* have tr() functions, after all | Oswald Buddenhagen | 2009-09-23 | 1 | -11/+8 |
| | | | | | | | | | | | | | | | | | | ... by virtue of the Q_DECLARE_TR_FUNCTIONS macro. so remove the artificial limitation to classes (which was mostly an optimization anyway). | ||||
| * | | drastically improve lupdate's scalability | Oswald Buddenhagen | 2009-09-23 | 1 | -197/+280 |
| | | | | | | | | | | | | | | | | | | | | | do not import all data from included files into the current file (which turned out to be extremely expensive for 3rdparty/webkit), but do hierarchical lookups on demand. this makes the lookups as such much slower, of course, but it still pays off. | ||||
| * | | optimize/clarify function context stringification | Oswald Buddenhagen | 2009-09-23 | 1 | -5/+6 |
| | | | |||||
| * | | do not record class forward declarations | Oswald Buddenhagen | 2009-09-23 | 1 | -28/+27 |
| | | | | | | | | | | | | | | | they don't create useful namespaces and don't hold flags, so it is pointless to clutter the namespace maps with them. | ||||
| * | | remove more dead code | Oswald Buddenhagen | 2009-09-23 | 1 | -2/+1 |
| | | | | | | | | | | | | no need for parameter "unresolved" | ||||
| * | | remove dead code | Oswald Buddenhagen | 2009-09-23 | 1 | -13/+2 |
| | | | | | | | | | | | | needsTrFunctions was never set any more | ||||
| * | | move static objects out of function scope | Oswald Buddenhagen | 2009-09-23 | 1 | -6/+6 |
| | | | | | | | | | | | | | | | cuts away a few thousand instructions. need to revisit this in case of making the parser a dynamic library. | ||||
| * | | use a source char pointer instead of a string + index | Oswald Buddenhagen | 2009-09-23 | 1 | -13/+18 |
| | | | |||||
| * | | take advantage of knowing that qstrings are zero-terminated internally | Oswald Buddenhagen | 2009-09-23 | 1 | -6/+5 |
| | | | |||||
| * | | no need to actually compute number values. only 0 is special | Oswald Buddenhagen | 2009-09-23 | 1 | -37/+18 |
| | | | |||||
| * | | when matching strings, skip also leading comments | Oswald Buddenhagen | 2009-09-23 | 1 | -6/+8 |
| | | | |||||
| * | | avoid isalpha() & isalnum() | Oswald Buddenhagen | 2009-09-23 | 1 | -2/+3 |
| | | | | | | | | | | | | they are surprisingly expensive | ||||
| * | | cut down use of qstring::simplified() | Oswald Buddenhagen | 2009-09-23 | 1 | -6/+10 |
| | | | |||||
| * | | optimize directory scanning | Oswald Buddenhagen | 2009-09-23 | 1 | -21/+12 |
| | | | | | | | | | | | | | | | qdiroperator uses qregexp for filtering, which is sloooow. so use a hash lookup on extensions instead. | ||||
| * | | simplify | Oswald Buddenhagen | 2009-09-23 | 1 | -4/+1 |
| | | | |||||
| * | | missing & in foreach | Oswald Buddenhagen | 2009-09-23 | 1 | -1/+1 |
| | | | |||||
| * | | add --sort-contexts option | Oswald Buddenhagen | 2009-09-22 | 1 | -0/+4 |
| | | | | | | | | | | | | ok, so this is a feature ... a 4-line-one ... | ||||
* | | | Merge commit 'qt-mainline/4.6' into kinetic-declarativeui | Andreas Aardal Hanssen | 2009-09-15 | 1 | -1/+0 |
|\ \ \ | |/ / | |||||
| * | | When parsing a java file do not simply ignore the first character. | Jan-Arve Sæther | 2009-09-15 | 1 | -1/+0 |
| | | | | | | | | | | | | | | | | | | | | | | | | If the file started with a comment (/* .. */) the parser would not see the first '/' character, thus it would not treat it as a comment. This was because we called getChar() just before we called parse(), and just after we had entered parse(). |