| Commit message (Collapse) | Author | Age | Files | Lines |
|
|
|
|
|
|
| |
Updated version of LGPL and FDL licenseheaders.
Apply release phase licenseheaders for all source files.
Reviewed-by: Trust Me
|
|\ |
|
| |
| |
| |
| | |
Reviewed-by: ossi
|
|\ \
| |/
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| | |
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
|
| |
| |
| |
| | |
Reviewed-by: Trust Me
|
|/
|
|
|
|
|
|
|
|
|
|
| |
- Made the output translator a member of the parser, since the
processComment() callback needs it now.
- Made the context for tr()/TR_NOOP() a member of the parser,
since it should persist for subsequent tr calls.
- The comment processing logic should match that of cpp.cpp,
as usual.
Task-number: QTBUG-15502
Reviewed-by: Oswald Buddenhagen
|
|
|
|
|
| |
Task-number: QTBUG-13799
Reviewed-by: Martin Jones
|
|
|
|
|
| |
the sensivity to additions of new calls to unimplemented qmake functions
to .prf files kinda sucks, so remove it.
|
|
|
|
|
|
|
|
| |
otherwise, if the next token to be fetched is a non-empty #define, it
would save the context before entering the namespace, and thus the
post-define context restore would just discard the namespace entry.
Task-number: QTBUG-12683
|
|
|
|
| |
Task-number: QTBUG-11426
|
| |
|
|
|
|
|
|
|
|
|
| |
the PO format doc suggests that all references are in
filename:linennumber format, but some tools seem to deviate from that.
so do our best to preserve such references, even if we can't do anything
with them.
Task-number: QTBUG-9488
|
| |
|
|
|
|
| |
Reviewed-by: Oswald Buddenhagen
|
|
|
|
|
|
|
|
|
| |
Extracting the translation data is only the first step;
a separate commit will make the functions available in the
QtScript runtime.
Task-number: QTBUG-8454
Reviewed-by: Oswald Buddenhagen
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
| |
This brings the support more in line with the C++ frontend.
No support for magic TRANSLATOR comment yet.
Add a proper test for the QtScript parser.
Support for qtTrId() and friends coming in a separate commit.
Previously the lexer just skipped comments. Now the contents
of each comment is retained and passed to a "comment processor"
interface. The parser implements the interface and performs
logic very similar to the C++ parser to extract data from
the comment.
Task-number: QTBUG-11774
Reviewed-by: Oswald Buddenhagen
|
|
|
|
|
|
|
|
| |
otherwise, tr() calls without absolute qualification will not be
properly qualified inside the first function if it has no qualification,
either.
Task-number: QTBUG-11742 (not really)
|
|
|
|
|
| |
fixing QProcess::execute() revealed that this test has always been
broken on windows.
|
| |
|
|
|
|
|
| |
Reviewed-by: Kent Hansen
Task-number: QTBUG-11818
|
|\
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| | |
src/3rdparty/* is left untouched and not merged from 4.6. The corresponding
changes in Harfbuzz and WebKit are already in the 4.6 staging areas.
Conflicts:
src/3rdparty/webkit/VERSION
src/3rdparty/webkit/WebCore/ChangeLog
src/3rdparty/webkit/WebKit/qt/ChangeLog
src/3rdparty/webkit/WebKit/qt/tests/qgraphicswebview/tst_qgraphicswebview.cpp
src/3rdparty/webkit/WebKit/qt/tests/qwebview/tst_qwebview.cpp
src/3rdparty/webkit/WebKit/qt/tests/qwebview/tst_qwebview.qrc
tests/auto/qtextlayout/tst_qtextlayout.cpp
tests/auto/qwidgetaction/tst_qwidgetaction.cpp
|
| |
| |
| |
| | |
Increase timeout running lconvert from 1 to 10 seconds.
|
| |
| |
| |
| | |
Increase timeout when running lupdate from 5 to 30 seconds.
|
|\ \
| |/
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| | |
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
|
| |
| |
| |
| |
| |
| |
| |
| |
| | |
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
|
| |
| |
| |
| | |
Task-number: QTBUG-8044
|
| |
| |
| |
| |
| |
| |
| |
| | |
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
|
| |
| |
| |
| | |
this makes windows-style path specs *ugly*. that's intentional. :-P
|
|\ \
| |/
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| | |
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
|
| |
| |
| |
| |
| | |
there is really no point in marking them "unfinished". later file
rewrites would reset the state anyway.
|
| |
| |
| |
| |
| |
| |
| |
| |
| | |
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
|
| | |
|
| | |
|
| |
| |
| |
| | |
... as this is what gettext processors expect.
|
| |
| |
| |
| |
| |
| |
| | |
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.
|
|\ \
| |/
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| | |
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
|
| |
| |
| |
| | |
Task-number: QTBUG-8360
|
| |
| |
| |
| | |
Reviewed-by: Trust Me
|
|\ \
| |/
| |
| |
| |
| |
| |
| |
| |
| | |
Conflicts:
src/gui/kernel/qeventdispatcher_mac.mm
src/gui/kernel/qt_cocoa_helpers_mac.mm
src/gui/widgets/qmenu_mac.mm
tests/auto/qgraphicswidget/tst_qgraphicswidget.cpp
tools/assistant/tools/assistant/centralwidget.cpp
tools/linguist/lupdate/main.cpp
|
| |
| |
| |
| | |
normalize the user input first
|
| |
| |
| |
| |
| |
| |
| |
| | |
if the pro file for the translations lives in a sibling tree of the
actual source tree, messages from included headers wouldn't have been
collected, as they were not considered part of the project.
Task-number: QTBUG-7495
|
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| | |
previously, the semantics of nesting projects were pretty bizarre:
the list of TS files grew ever as the subdirs were visited. the
source files otoh were cleared for every project. this meant that
some TS files were updated over and over again, each time with different
data.
this is obviously total nonsense, so there is no compatibilty to keep.
so here come the new semantics:
- each project is scanned separately. it has separate include paths and
may override the inherited CODECFORSRC.
- the messages from all sub-projects are merged
- if a sub-project has a TRANSLATIONS entry, it is "detached" from its
parent project, thus starting an own merged translator. it is also
possible to name an empty set of TS files to simply exclude the
sub-project.
- CODECFORTR can be specified in each project with TRANSLATIONS
- if TS files are specified on the command line, they override
TRANSLATIONS from the top level project and stop processing of
detached projects alltogether. if multiple top-level projects are
specified, they are all merged.
this is somewhat slower, as now includes are re-scanned per project,
while previously all sources were simply accumulated and scanned as one
project. this can be fixed retroactively if needed.
|
| | |
|
| | |
|
| | |
|
| | |
|
|\ \
| |/
| |
| |
| |
| |
| |
| |
| |
| |
| | |
Conflicts:
bin/syncqt
doc/src/deployment/deployment.qdoc
src/corelib/io/qfsfileengine_win.cpp
src/corelib/xml/qxmlstream.cpp
src/opengl/gl2paintengineex/qpaintengineex_opengl2_p.h
tools/assistant/tools/assistant/centralwidget.cpp
tools/linguist/lupdate/main.cpp
|
| |\
| | |
| | |
| | |
| | | |
Conflicts:
tests/auto/linguist/lupdate/testlupdate.cpp
|
| | |
| | |
| | |
| | | |
Reviewed-by: Trust Me
|
| | |
| | |
| | |
| | | |
stupid testr ... and me.
|