summaryrefslogtreecommitdiffstats
path: root/tools/linguist
Commit message (Collapse)AuthorAgeFilesLines
* Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-multimedia-staging into ↵Qt Continuous Integration System2010-06-091-1/+1
|\ | | | | | | | | | | | | 4.7-integration * '4.7' of scm.dev.nokia.troll.no:qt/qt-multimedia-staging: Fixed compilation for solaris based compilers, macro doesn't require trailing semicolon.
| * Fixed compilation for solaris based compilers, macro doesn't require ↵Toby Tomkins2010-06-091-1/+1
| | | | | | | | | | | | trailing semicolon. Reviewed-by: Rohan McGovern
* | Merge remote branch 'origin/4.6' into qt-4.7-from-4.6Olivier Goffart2010-06-082-1/+2
|\ \ | |/ |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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-071-0/+1
| | | | | | | | | | | | | | | | | | 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
| * propagate code change back to .g sourceOswald Buddenhagen2010-06-031-1/+1
| | | | | | | | missed that in 60acaf5e
* | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into ↵Qt Continuous Integration System2010-06-041-0/+752
|\ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 4.7-integration * '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-2: Synchronizing to latest tree Adding correct hungarian translation Search local directory if no qconfig file found in src/corelib/global/ Fix QT_NO_CLIPBOARD Fix QT_NO_ACTION
| * | Synchronizing to latest treeGarami Gábor2010-06-041-0/+8
| | | | | | | | | | | | | | | Merge-request: 659 Reviewed-by: Andreas Aardal Hanssen <andreas.aardal.hanssen@nokia.com>
| * | Adding correct hungarian translationGarami Gábor2010-06-041-0/+744
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | translations/assistant_hu.ts: Translated: 231 of 231 (100%) translations/designer_hu.ts: Translated: 85 of 1248 (6%) translations/linguist_hu.ts: Translated: 393 of 393 (100%) translations/qtconfig_hu.ts: Translated: 73 of 168 (43%) translations/qt_help_hu.ts: Translated: 80 of 81 (98%) translations/qt_hu.ts: Translated: 2402 of 2464 (97%) translations/qvfb_hu.ts: Translated: 65 of 65 (100%) Merge-request: 659 Reviewed-by: Andreas Aardal Hanssen <andreas.aardal.hanssen@nokia.com>
* | | remove spurious empty lines in the linguist tools' outputOswald Buddenhagen2010-06-036-18/+18
| | | | | | | | | | | | ConversionData::error() does already newline-terminate the strings.
* | | don't use qWarning() - or even qFatal()! - gratuitously.Oswald Buddenhagen2010-06-039-178/+178
|/ / | | | | | | Task-number: QTBUG-8044
* | write PO files without duplicated message idsOswald Buddenhagen2010-06-021-7/+60
| | | | | | | | | | | | | | | | 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
* | update Russian translation for Qt librariesRitt Konstantin2010-05-311-1/+1
| | | | | | | | | | | | | | this contains some changes from symbian-commissioned "professional" translations Merge-request: 621 Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com>
* | Merge remote branch 'origin/4.6' into qt-4.7-from-4.6Olivier Goffart2010-04-161-27/+70
|\ \ | |/ | | | | | | | | | | | | | | | | | | | | | | | | 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-2/+7
| | | | | | | | | | 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-151-6/+47
| | | | | | | | | | | | | | | | | | 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
| * make HashString and HashStringList objects smallerOswald Buddenhagen2010-04-151-13/+10
| | | | | | | | | | | | | | | | | | | | qHash(QString) has only 28 bits, so we can use the upper bits for flagging whether the hash is valid. size effect: LP32: align(4, 4 + 4 + 1) = 12 vs. align(4, 4 + 4) = 8 LP64: align(8, 8 + 8 + 1) = 24 vs. align(8, 8 + 8) = 16 P64: align(8, 8 + 4 + 1) = 16 vs. align(8, 8 + 4) = 16
| * remove pointless manual assignments from token type enumOswald Buddenhagen2010-04-151-6/+6
| | | | | | | | | | making the range discontiguous just makes the switch() jump table bigger or not applicable at all.
* | Apply f176759fc41abc4cb901c2cbaa15264f2a9ac85b to stdout too.Thiago Macieira2010-04-101-0/+4
| | | | | | | | | | | | | | Ossi is right: on WinCE, _setmode is different from regular Windows and the docs... Reviewed-by: ossi
* | the _setmode() prototype is different on win ceOswald Buddenhagen2010-04-091-0/+4
| | | | | | | | | | | | ... both from windows and the wince doc ... Reviewed-by: joerg
* | fcntl.h doesn't seem to exist, either - contrary to an example on msdnOswald Buddenhagen2010-04-091-2/+2
| |
* | fix compile on winceOswald Buddenhagen2010-04-091-2/+7
| | | | | | | | Reviewed-by: joerg
* | remove CONFIG += ordered againOswald Buddenhagen2010-04-091-1/+0
| |
* | Allow building Qt without the QtGui moduleBernhard Rosenkraenzer2010-04-071-1/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | This adds a -no-gui switch to configure, allowing to build Qt without QtGui and components depending on QtGui. This is useful on headless servers, and in using QtCore, QtNetwork, QtXml, QtSql etc. on platforms QtGui hasn't been ported to yet. Task-number: QTBUG-4007 Merge-request: 543 Reviewed-by: Thiago Macieira <thiago.macieira@nokia.com> Reviewed-by: Benjamin Poulain <benjamin.poulain@nokia.com>
* | Fix compilation: Linguist uses QtDeclarative .cpp and private headersThiago Macieira2010-04-021-1/+1
| |
* | Fix compilation on solaris-g++: ctype functions are sometimes macrosThiago Macieira2010-04-012-4/+4
| | | | | | | | | | | | | | At least with g++ 3.4 on Solaris, they are. So you can't write ::isalpha because that expands to something invalid. Reviewed-by: Trust Me
* | handle qt-format PO flagsOswald Buddenhagen2010-03-311-1/+24
| |
* | handle encoding of PO filesOswald Buddenhagen2010-03-311-134/+202
| |
* | make variable naming politically correct :-DOswald Buddenhagen2010-03-311-4/+4
| |
* | add Plural-Forms header in PO writerOswald Buddenhagen2010-03-316-26/+65
| |
* | simplify arabic plural ruleOswald Buddenhagen2010-03-311-1/+1
| |
* | don't mark untranslated messages as fuzzy in PO filesOswald Buddenhagen2010-03-311-2/+2
| | | | | | | | ... as this is what gettext processors expect.
* | support gettext POT filesOswald Buddenhagen2010-03-311-0/+14
| | | | | | | | | | these are in fact the same as PO files, only that exporting to one automatically drops translations.
* | fix writing of length variant separators in the singular caseOswald Buddenhagen2010-03-311-0/+2
| |
* | make PO header handling less of a monster hackOswald Buddenhagen2010-03-311-44/+80
| | | | | | | | | | | | instead of doing string editing magic, parse the header properly. don't add a template file comment, either - it's not mandatory, after all.
* | fix updating of X-Source-Language PO headerOswald Buddenhagen2010-03-311-0/+3
| |
* | interpret source language "en" as "POSIX" (more precisely: "none specified")Oswald Buddenhagen2010-03-311-0/+2
| | | | | | | | | | | | | | 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 branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into ↵Qt Continuous Integration System2010-03-311-1/+2
|\ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 4.7-integration * '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1: (31 commits) Fix compilation with Sun CC: no semi-colon after Q_ENUM. Remove the "Insert unicode control character" menu entry on X11. adds a timeout option to QThreadPool::waitForDone(); Remove leading whitespace from Qt header macros. Rename the xxxMsecsSinceEpoch functions to xxxMSecsSinceEpoch. Add QDateTime members that operate on 64-bit milliseconds. Fix compilation on WinCE and MinGW by memsetting the OVERLAPPED struct. qdoc: Added <div> elements to some html output for class references. Fix compile error on mingw. MONILITY-645 Do not override alternate background color in Plastique Fix QComboBox ignoring foreground role in some styles Fix compilation on HP-UXi: _SC_MONOTONIC_CLOCK isn't defined Fix compilation with Sun CC: Ensure that we return QPair<long,long> in all cases. Update PLATFORM(SPARC64) to CPU(SPARC64) jui files are no c++ ... scan some more file types by default Support EtchDisabledText with spin box on Windows style QNAM HTTP: Fix invoking a method when being destructed right now ...
| * | jui files are no c++ ...Oswald Buddenhagen2010-03-291-0/+1
| | |
| * | scan some more file types by defaultOswald Buddenhagen2010-03-291-1/+1
| | | | | | | | | | | | | | | | | | | | | - java & jui - js, qs & qml Task-number: QTBUG-9429
* | | Merge remote branch 'origin/4.6' into qt-4.7-from-4.6Thiago Macieira2010-03-311-2/+0
|\ \ \ | |/ / |/| / | |/ | | | | | | | | Conflicts: configure doc/src/modules.qdoc src/gui/graphicsview/qgraphicsitem_p.h src/gui/graphicsview/qgraphicswidget.h
| * no need for CONFIG += ordered hereOswald Buddenhagen2010-03-301-2/+0
| |
* | Use standard theme icons in Linguist where possibleThorbjørn Lindeijer2010-03-231-11/+33
| | | | | | | | Reviewed-by: Jens Bache-Wiig <jbache@trolltech.com>
* | Merge remote branch 'origin/4.6' into qt-4.7-from-4.6Thiago Macieira2010-03-151-1/+1
|\ \ | |/ | | | | | | Conflicts: src/gui/styles/qs60style_s60.cpp
| * isalpha() is unspecified for values outside uchar and EOFOswald Buddenhagen2010-03-111-1/+1
| | | | | | | | Task-number: QTBUG-8907
* | Merge remote branch 'origin/4.6' into qt-4.7-from-4.6Rohan McGovern2010-03-062-8/+60
|\ \ | |/ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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-051-8/+20
| | | | | | | | Task-number: QTBUG-8360
| * update russian translations and phrasebookRitt Konstantin2010-03-021-0/+40
| | | | | | | | | | Merge-request: 485 Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com>
* | Change class prefix to from QmlXXX to QDeclarativeXXX, QmlGraphicsXXX to ↵Warwick Allison2010-02-242-8/+8
| | | | | | | | QDeclarativeXXX.
* | Merge branch 'master' of scm.dev.nokia.troll.no:qt/qtMartin Jones2010-02-181-1/+1
|\ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: mkspecs/linux-g++-x11egl/qplatformdefs.h src/declarative/qml/qmldom.h src/declarative/util/qmlview.cpp src/declarative/util/qmlview.h tools/qdoc3/cppcodemarker.cpp tools/qmldebugger/standalone/canvasframerate.cpp tools/qmldebugger/standalone/engine.cpp tools/qmldebugger/standalone/expressionquerywidget.cpp tools/qmldebugger/standalone/expressionquerywidget.h tools/qmldebugger/standalone/objectpropertiesview.cpp tools/qmldebugger/standalone/objectpropertiesview.h tools/qmldebugger/standalone/objecttree.cpp tools/qmldebugger/standalone/qmldebugger.cpp tools/qmldebugger/standalone/watchtable.cpp tools/qmldebugger/standalone/watchtable.h
| * | Fix copyright year.Jason McDonald2010-02-161-1/+1
| | | | | | | | | | | | Reviewed-by: Trust Me