| Commit message (Collapse) | Author | Age | Files | Lines |
| |
|
| |
|
|
|
|
|
|
| |
there is really no point in doing so
Reviewed-by: hjk
|
|
|
|
|
|
|
|
|
|
| |
the translator comment field is not written out, so reading the
definition into it is basically discarding it as far as any roundtrips
which arrive at qph again are concerned.
the message's disambiguation seems most suitable for the task.
Reviewed-by: hjk
Task-number: QTBUG-4498
|
|
|
|
|
|
| |
qlocale.h includes qobjectdefs.h which forward-declares it as a class.
Reviewed-by: aportale
|
|
|
|
|
| |
Task-number: QTBUG-4499
Task-number: QTBUG-5276
|
| |
|
|
|
|
|
|
|
|
| |
needed for build-time qm generation in qt itself.
the downsides are a) that the other bootstrapped tools grow by ~12kB
(on x86) due to qdatastream being pulled in by qbytearray and qstring
and b) that lrelease isn't l10n'd itself anymore (the latter could be
fixed by building a non-qobject qtranslator).
|
|
|
|
|
|
| |
this makes sense if one uses lupdate only for validation purposes, i.e.
to find out if the code uses only ids which are defined in some external
specification.
|
|
|
|
|
| |
when comparing two messages which both have ids, compare only the ids.
this affects finding/reporting duplicates and merging.
|
|
|
|
| |
preparation work ...
|
| |
|
|
|
|
|
|
|
|
|
| |
in a ts file, the top level categorization are the contexts, so it makes
no sense to make messages adjoint by file when the context is different.
a more clever algorithm which tries to order the entire contexts is
conceivable. that would be advantageous for files which use multiple
contexts subsequentially if each context appears in only one file.
|
|
|
|
| |
replace the one use case with something more efficient
|
| |
|
|
|
|
|
|
|
|
| |
two messages with identical singular but different plural sources simply
make no sense.
this should be quite a bit faster, as it saves lots of QHash<QString,...>
lookups.
|
|
|
|
| |
it was once needed for QMap, but we don't use that any more
|
| |
|
|
|
|
| |
maemo *really* want it, so pushing it in now ...
|
| |
|
|
|
|
| |
otherwise the fallback to use the source string is rather pointless
|
|
|
|
| |
unfinished messages
|
|\ |
|
| |
| |
| |
| |
| |
| | |
xlf uses xx-YY notation instead of xx_YY
Reviewed-by: ossi
|
| |
| |
| |
| | |
Reviewed-by: Trust Me
|
| |
| |
| |
| | |
Reviewed-by: Trust Me
|
| |
| |
| |
| | |
Reviewed-by: Trust Me
|
| |
| |
| |
| | |
Reviewed-by: Trust Me
|
|\ \
| |/
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| | |
Conflicts:
demos/boxes/glshaders.cpp
demos/boxes/vector.h
demos/embedded/fluidlauncher/pictureflow.cpp
demos/embedded/fluidlauncher/pictureflow.h
doc/src/desktop-integration.qdoc
doc/src/distributingqt.qdoc
doc/src/examples-overview.qdoc
doc/src/examples.qdoc
doc/src/frameworks-technologies/dbus-adaptors.qdoc
doc/src/geometry.qdoc
doc/src/groups.qdoc
doc/src/objecttrees.qdoc
doc/src/platform-notes.qdoc
doc/src/plugins-howto.qdoc
doc/src/qt3support.qdoc
doc/src/qtdbus.qdoc
doc/src/qtdesigner.qdoc
doc/src/qtgui.qdoc
doc/src/qtmain.qdoc
doc/src/qtopengl.qdoc
doc/src/qtsvg.qdoc
doc/src/qtuiloader.qdoc
doc/src/qundo.qdoc
doc/src/richtext.qdoc
doc/src/topics.qdoc
src/corelib/tools/qdumper.cpp
src/gui/embedded/qkbdpc101_qws.cpp
src/gui/embedded/qkbdsl5000_qws.cpp
src/gui/embedded/qkbdusb_qws.cpp
src/gui/embedded/qkbdvr41xx_qws.cpp
src/gui/embedded/qkbdyopy_qws.cpp
src/gui/embedded/qmousebus_qws.cpp
src/gui/embedded/qmousevr41xx_qws.cpp
src/gui/embedded/qmouseyopy_qws.cpp
src/gui/painting/qpaintengine_d3d.cpp
src/gui/painting/qwindowsurface_d3d.cpp
src/opengl/gl2paintengineex/glgc_shader_source.h
src/opengl/gl2paintengineex/qglpexshadermanager.cpp
src/opengl/gl2paintengineex/qglpexshadermanager_p.h
src/opengl/gl2paintengineex/qglshader.cpp
src/opengl/gl2paintengineex/qglshader_p.h
src/opengl/util/fragmentprograms_p.h
src/plugins/kbddrivers/linuxis/linuxiskbdhandler.cpp
src/plugins/mousedrivers/linuxis/linuxismousehandler.cpp
src/script/parser/qscript.g
src/script/qscriptarray_p.h
src/script/qscriptasm_p.h
src/script/qscriptbuffer_p.h
src/script/qscriptclass.cpp
src/script/qscriptclassdata_p.h
src/script/qscriptcompiler.cpp
src/script/qscriptcompiler_p.h
src/script/qscriptcontext.cpp
src/script/qscriptcontext_p.cpp
src/script/qscriptcontext_p.h
src/script/qscriptcontextfwd_p.h
src/script/qscriptecmaarray.cpp
src/script/qscriptecmaarray_p.h
src/script/qscriptecmaboolean.cpp
src/script/qscriptecmacore.cpp
src/script/qscriptecmadate.cpp
src/script/qscriptecmadate_p.h
src/script/qscriptecmaerror.cpp
src/script/qscriptecmaerror_p.h
src/script/qscriptecmafunction.cpp
src/script/qscriptecmafunction_p.h
src/script/qscriptecmaglobal.cpp
src/script/qscriptecmaglobal_p.h
src/script/qscriptecmamath.cpp
src/script/qscriptecmamath_p.h
src/script/qscriptecmanumber.cpp
src/script/qscriptecmanumber_p.h
src/script/qscriptecmaobject.cpp
src/script/qscriptecmaobject_p.h
src/script/qscriptecmaregexp.cpp
src/script/qscriptecmaregexp_p.h
src/script/qscriptecmastring.cpp
src/script/qscriptecmastring_p.h
src/script/qscriptengine.cpp
src/script/qscriptengine_p.cpp
src/script/qscriptengine_p.h
src/script/qscriptenginefwd_p.h
src/script/qscriptextenumeration.cpp
src/script/qscriptextenumeration_p.h
src/script/qscriptextqobject.cpp
src/script/qscriptextqobject_p.h
src/script/qscriptextvariant.cpp
src/script/qscriptfunction.cpp
src/script/qscriptfunction_p.h
src/script/qscriptgc_p.h
src/script/qscriptmember_p.h
src/script/qscriptobject_p.h
src/script/qscriptprettypretty.cpp
src/script/qscriptprettypretty_p.h
src/script/qscriptvalue.cpp
src/script/qscriptvalueimpl.cpp
src/script/qscriptvalueimpl_p.h
src/script/qscriptvalueimplfwd_p.h
src/script/qscriptvalueiteratorimpl.cpp
src/script/qscriptxmlgenerator.cpp
src/script/qscriptxmlgenerator_p.h
tests/auto/linguist/lupdate/testdata/recursivescan/project.ui
tests/auto/linguist/lupdate/testdata/recursivescan/sub/finddialog.cpp
tests/auto/qkeyevent/tst_qkeyevent.cpp
tools/linguist/shared/cpp.cpp
|
| |
| |
| |
| | |
Reviewed-by: Trust Me
|
| | |
|
| |
| |
| |
| | |
Reviewed-by: Trust Me
|
| |
| |
| |
| |
| |
| |
| | |
See 3ae2cab9c8bd1790a00da2755ac036143a3a35f4 for another similar fix.
Reviewed-by: Trust Me
(cherry picked from commit 18fbfdf0f774198e2e1277e064cc3a8eb9dbb29d)
|
| |
| |
| |
| |
| |
| |
| | |
"../shared/qm.cpp", line 556.45: 1540-0207 (S) No common type found for operands with type "const char [7]" and "QByteArray".
Reviewed-by: Trust Me
(cherry picked from commit 3ae2cab9c8bd1790a00da2755ac036143a3a35f4)
|
| |
| |
| |
| |
| |
| |
| | |
The second and third arguments to qmake's include function are optional
Task-number: 259398
Reviewed-by: Stian Sandvik Thomassen
|
| |
| |
| |
| | |
Reviewed-by: Trust Me
|
| | |
|
| |
| |
| |
| |
| |
| | |
See 3ae2cab9c8bd1790a00da2755ac036143a3a35f4 for another similar fix.
Reviewed-by: Trust Me
|
| |
| |
| |
| |
| |
| | |
"../shared/qm.cpp", line 556.45: 1540-0207 (S) No common type found for operands with type "const char [7]" and "QByteArray".
Reviewed-by: Trust Me
|
| | |
|
| |
| |
| |
| |
| |
| | |
Reviewed-By: ossi
cherry-picked 98f8fc78bc0f8bcc0e36f19f9728d21063379a51 from creator
|
| |
| |
| |
| | |
cherry-picked dc0bc586462e2a74fba38f054d303d2226eec4e5 from creator
|
| |
| |
| |
| | |
cherry-picked bd0f0aa182b1422b942ae8efdc773c1a92344eb5 from creator
|
| |
| |
| |
| |
| |
| | |
which basically means cutting features. heh
cherry-picked a03f8643a7a1df8b7c857446a19cb25f9314cdb2 from creator
|
| |
| |
| |
| | |
cherry-picked e083ad2920d6e5695f309fe5b4b7c7d1b3060d61 from creator
|
| |
| |
| |
| | |
cherry-picked 88de3e6a45a41baecb7e56e7cbab7fec30ac0a1c from creator
|
| |
| |
| |
| | |
cherry-picked d89338aa810861c636278be4a5bb5d8b23ce99b8 from creator
|
| |
| |
| |
| | |
cherry-picked dbdbe92d5d66cbd466bcc0aea532ce79a034ab84 from creator
|
| |
| |
| |
| |
| |
| |
| | |
defined(), return() & export()
cherry-picked d077ba29c34782d1699693b6e3f07c2037eecdba and
93571f7d42a81a8236ceac1f745ef277f194f1ca from creator
|
| |
| |
| |
| | |
cherry-picked 6ca93b31fd95ef7cce78a5e0d5225e50d6007f2f from creator
|