| Commit message (Collapse) | Author | Age | Files | Lines |
|
|
|
|
|
|
|
|
|
| |
Previously it was only possible to use EPOCROOT in qt.conf via env
variable, while qmake & configure could resolve it also via devices.xml.
Changed qt.conf parsing to support $${EPOCROOT} tag and use same
resolving logic as qmake & configure.
Task-number: QTBUG-15393
Reviewed-by: axis
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
| |
If developer specifies "CONFIG += localize_deployment" in .pro file,
the generated .loc and .pkg will now use translatable strings from
.ts files defined in TRANSLATIONS. The .ts files must have an
underscore and Qt language code at the end of the filename body
to be compatible with deployment localization. E.g. myapp_en.ts.
Running lupdate will generate these entries into .ts files:
- Application short caption
- Application long caption
- Package name
- Smart installer package name
Task-number: QTBUG-13917
Reviewed-by: Oswald Buddenhagen
Reviewed-by: Janne Anttila
Reviewed-by: axis
|
| |
|
| |
|
|
|
|
|
|
|
| |
Task-number: QTBUG-13619
Merge-request: 2486
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com>
|
| |
|
|
|
|
|
|
| |
this makes no real difference, as at this point the token is known to be
an opening brace which will be handled without side effects in the next
iteration, but this is a tad more efficient and simply cleaner.
|
|
|
|
|
|
|
|
| |
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
|
|
|
|
| |
Task-number: QTBUG-13466
|
|
|
|
| |
Task-number: QTBUG-4165
|
|\
| |
| |
| |
| |
| |
| |
| |
| |
| |
| | |
* '4.7' of scm.dev.nokia.troll.no:qt/qt-qml:
The declarative parser should only save comment text (and not /*,*/,//)
Support for qsTrId and meta-data in comments for QML.
Flickable ensure internal pressed state is cleared when mouse is released.
Fix examples autotest
Support JS "in" operator on QML objects
Only emit change signal when variant properties actually change
Use QApplication in QDeclarativeEngine example.
|
| |
| |
| |
| | |
Reviewed-by: Roberto Raggi
|
| | |
|
| |
| |
| |
| |
| | |
Merge-request: 2456
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com>
|
|/
|
|
|
|
|
|
|
|
| |
QTranslator is installed in tools (qcollectiongenerator, qhelpconverter,
qhelpgenerator, lconvert, lrelease, lupdate).
Build targets that updates .ts files are changed to include strings from
this tools.
Merge-request: 2456
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com>
|
|
|
|
|
|
|
|
|
| |
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
|
| |
|
|
|
|
|
| |
after all, it is pretty much specific to xlf files, even if the problem
majorly concerns converted po files.
|
|
|
|
|
|
|
|
|
| |
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
|
|
|
|
|
|
|
|
|
|
|
| |
Like the C++ parser, use a yyMsg() function.
Make the lexer a member of the parser, so yyMsg() can access
the filename and current line number.
This refactoring is done in preparation of two changes that
introduce quite a few more potential error message calls
(comment processing and qtTrId support).
Reviewed-by: Oswald Buddenhagen
|
|
|
|
|
|
|
|
| |
U+FF01 (FULLWIDTH EXCLAMATION MARK), U+FF1F (FULLWIDTH QUESTION MARK) and
U+FF1A (FULLWIDTH COLON)
Merge-request: 2455
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com>
|
|
|
|
|
| |
Merge-request: 2445
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com>
|
|
|
|
|
|
|
|
| |
validating and adding some french translations.
Plus all the fixes from Gabriel's extensive review.
Doc: Fix a typo
Reviewed-by: gabi
|
|
|
|
| |
Reviewed-by: gabi
|
|
|
|
|
| |
Task-number: QTBUG-12485 QTBUG-12651
Reviewed-by: ck
|
|
|
|
|
|
|
|
|
| |
there are now per-language ts-<package>-<lang> and ts-<lang> targets to
update only the files relevant for a given language.
there is also a ts-all target which does what the old ts target did.
the ts-<package> targets are now named ts-<package>-all and should not
be used manually - they exist for the convenience of the ts-all target.
the ts target is now only a help blurb.
|
|
|
|
|
|
|
|
| |
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)
|
|\
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| | |
* '4.7' of scm.dev.nokia.troll.no:qt/qt-qml: (54 commits)
update qml.qch to version 4.7
Undefined is undefined, and now qml warns about it
Fix so window will resize with the root object (broken by
Avoid duplicate code for testing initial sizes
Remove an unnecessary connect() in TextInput
Ensure micro focus is updated in TextEdit and TextInput
Fix flow layout not taking into account whether it's width and height are implicit or not.
Avoid binding loop.
Ensure Loader item change listener is removed when Loader is destroyed
Adapt all qmlviewer testcases to the code changes in the actual viewer.
Stop QMLLauncher from crashing on exit on Mac when quitting app via the
VisualDataModel hasModelChildren role shadowed user roles.
Allow positioning of ListView items width sub-pixel precision.
Examples clean up
Docs
Improve appearance when scaling
Tweak Qt Demo Behaviour
forget to rename the moc include when renaming deviceorientation_maemo.cpp
fix namespace macros
fix QML Viewer resize modes
...
|
| | |
|
| |
| |
| |
| |
| |
| | |
Also fixes a potential crash with non-string-literal nodes.
Task-number: QTBUG-11580
|
| |
| |
| |
| | |
Task-number: QTBUG-11579
|
| | |
|
| |
| |
| |
| |
| | |
Reviewed-by: Kent Hansen
Task-number: QTBUG-11818
|
|/ |
|
|\
| |
| |
| |
| |
| |
| | |
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.
|
| |
| |
| |
| |
| |
| | |
trailing semicolon.
Reviewed-by: Rohan McGovern
|
|\ \
| |/
|/|
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| | |
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
|
| |
| |
| |
| | |
missed that in 60acaf5e
|
|\ \
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | | |
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
|
| | |
| | |
| | |
| | |
| | | |
Merge-request: 659
Reviewed-by: Andreas Aardal Hanssen <andreas.aardal.hanssen@nokia.com>
|
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | | |
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>
|
| | |
| | |
| | |
| | | |
ConversionData::error() does already newline-terminate the strings.
|
|/ /
| |
| |
| | |
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 contains some changes from symbian-commissioned "professional" translations
Merge-request: 621
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com>
|
|\ \
| |/
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| | |
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.
|