| Commit message (Collapse) | Author | Age | Files | Lines |
|
|
|
|
|
| |
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
|
|\
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| | |
Conflicts:
src/3rdparty/webkit/VERSION
src/3rdparty/webkit/WebCore/ChangeLog
src/3rdparty/webkit/WebCore/bridge/qt/qt_instance.cpp
src/3rdparty/webkit/WebCore/bridge/qt/qt_instance.h
src/3rdparty/webkit/WebCore/page/DragController.cpp
src/3rdparty/webkit/WebKit/qt/Api/qwebframe.cpp
src/3rdparty/webkit/WebKit/qt/ChangeLog
src/3rdparty/webkit/WebKit/qt/tests/qwebpage/tst_qwebpage.cpp
src/gui/painting/qpaintengineex_p.h
tools/linguist/lupdate/main.cpp
|
| |
| |
| |
| |
| |
| |
| |
| | |
The translator had been installed for the jui format, but the extension
wasn't recognized.
Task-number: 258547
Reviewed-by: Gunnar
|
| | |
|
| |
| |
| |
| |
| |
| | |
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
|
| |
| |
| |
| | |
cherry-picked a86bdfdde40ca3bff03da590d98ee31f6d704751 from creator
|
| |
| |
| |
| |
| |
| |
| |
| | |
this also removes the optimization to skip test function calls which
appear to be part of a failed test, as this could skip includes, etc. as
well.
cherry-picked ed00bd2c85cbf2c1bea63dc18d0ae7084b4fb65f from creator
|
| |
| |
| |
| |
| |
| |
| | |
an evaluation function can be an include statement. the included code
must neither inherit nor change the current inversion state.
cherry-picked 68b1b828e6030b4fe26ca9ffc4ee7a0b4bfe8f4e from creator
|
| |
| |
| |
| |
| |
| |
| | |
to enable cleaner save/restore - for later
cherry-picked 51f5ee959f58ee198e0fc51e2ad0161c612bf8d1 and
3104e4c121f3209890823db69a7c09d644b90951 from creator
|
| |
| |
| |
| |
| |
| |
| |
| | |
functions which have essentially two return values are kinda confusing.
so represent file & parse errors as false in the regular evaluation
result (like qmake effectively does).
cherry-picked cee3ca324e6979d6c476001cafb452a286f09a69 from creator
|
| |
| |
| |
| | |
cherry-picked from d2a8449bea58275723e769cd41c085468cb56295 from creator
|
|\ \
| |/
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| | |
Conflicts:
src/3rdparty/webkit/VERSION
src/3rdparty/webkit/WebCore/ChangeLog
src/3rdparty/webkit/WebCore/generated/JSDOMWindow.cpp
src/3rdparty/webkit/WebCore/page/DOMWindow.idl
src/corelib/io/qdiriterator.cpp
src/plugins/gfxdrivers/directfb/qdirectfbpaintengine.cpp
src/plugins/gfxdrivers/directfb/qdirectfbpixmap.h
tests/auto/qxmlquery/tst_qxmlquery.cpp
tools/linguist/lconvert/main.cpp
|
| |
| |
| |
| |
| | |
- make -input-codec affect PO files, default to UTF-8
- add -output-codec for PO files, same default
|
| |
| |
| |
| |
| |
| | |
replace implicit normalization of individual messages on file writeout
with global normalization which is called by the command line tools.
this should a) be faster and b) cover the most critical case: lrelease.
|
| |
| |
| |
| |
| |
| |
| |
| | |
On Windows, the FileDescription part of the version information is used
as a caption for the grouped taskbar button.
Task-number: 253065
Reviewed-by: Prasanth Ullattil
|
|\ \
| |/
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| | |
Conflicts:
src/3rdparty/webkit/JavaScriptCore/generated/Grammar.cpp
src/3rdparty/webkit/JavaScriptCore/generated/Grammar.h
src/3rdparty/webkit/VERSION
src/3rdparty/webkit/WebCore/ChangeLog
src/3rdparty/webkit/WebCore/generated/CSSGrammar.cpp
src/3rdparty/webkit/WebCore/generated/CSSGrammar.h
src/3rdparty/webkit/WebCore/generated/Grammar.cpp
src/3rdparty/webkit/WebCore/generated/Grammar.h
src/3rdparty/webkit/WebCore/generated/XPathGrammar.cpp
src/3rdparty/webkit/WebCore/generated/XPathGrammar.h
src/3rdparty/webkit/WebKit/qt/ChangeLog
tools/linguist/lrelease/main.cpp
tools/linguist/lupdate/main.cpp
tools/linguist/shared/profileevaluator.cpp
|
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| | |
this also removes the bogus special casing of various
filename-containing variables inside the pro parser.
while this is a feature as such, it restores backwards compatibility
without damaging the correct behavior again, so it qualifies for 4.5.
based on a2f40fce2a1cf3c19a13fa27eea08192493ab76e from creator
Task-number: 254098
|
| |
| |
| |
| | |
it is simpler to keep it in sync with creator then.
|
|\ \
| |/
| |
| |
| |
| |
| |
| | |
Conflicts:
src/plugins/kbddrivers/usb/main.cpp
tests/auto/qnetworkreply/tst_qnetworkreply.cpp
tests/auto/qwidget/tst_qwidget.cpp
|
| |
| |
| |
| | |
cherry-picked 07730341bd739aac823ac9b4336d8294510a35e2 from creator
|
| |
| |
| |
| | |
cherry-picked 167a09b20614d282ec898f69fc2a3f0bafa11229 from creator
|
| |
| |
| |
| | |
cherry-picked d8b1cc5f0ecbb8de734d241d72a05b325c2bbb2c from creator
|
| |
| |
| |
| | |
Reviewed-by: TrustMe
|
|\ \
| |/
| |
| |
| |
| |
| |
| |
| |
| | |
Conflicts:
src/sql/drivers/ibase/qsql_ibase.cpp
tests/auto/q3sqlcursor/tst_q3sqlcursor.cpp
tests/auto/qsqldatabase/tst_databases.h
tests/auto/qsqldatabase/tst_qsqldatabase.cpp
translations/qt_ru.ts
|
| |
| |
| |
| | |
Task-number: 256647
|
| |
| |
| |
| |
| | |
Merge-request: 803
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com>
|
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| | |
- .ts file -> TS file
- .qm file -> QM file
- .ui file -> UI file
+ a handfull of typos I stumbled over
Merge-request: 802
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com>
|
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| | |
unlike in an earlier attempt, ids are textual this time.
the developer is able to provide a template for the string. when lupdate
and lrelease are integrated into the build process, this makes it
possible to avoid a round-trip to a dedicated string designer during the
early development stage.
Requirement-id: QT-435
|
| | |
|
| |
| |
| |
| | |
Requirement: QT-457
|
| |
| |
| |
| |
| |
| |
| | |
Also QString::fromUtf16() -> QString::fromWCharArray()
Merge-request: 604
Reviewed-by: Marius Storm-Olsen <marius@trolltech.com>
|
| | |
|
| |
| |
| |
| |
| |
| |
| |
| | |
On windows, if your default printer is not reachable it would take a
lot of time to fail to construct the print engine. During that time
the UI would be frozen on the splash screen.
Reviewed-by: ossi
|
|\ \
| |/ |
|
| |
| |
| |
| |
| | |
Merge-request: 760
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com>
|
| |
| |
| |
| |
| |
| |
| |
| |
| | |
this is not complete, e.g. full text search does not discern which
variant contains the hit, the integration with phrases&guesses is
non-existing, etc.
the form preview will do funny things as long as the widgets don't
support the multi-variant strings.
|
| |
| |
| |
| |
| | |
Merge-request: 758
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com>
|
|\ \
| |/
| |
| |
| | |
Conflicts:
src/sql/drivers/psql/qsql_psql.cpp
|
| |
| |
| |
| |
| |
| | |
this contains both a "clean" code path based on translation count and a
fallback path based on looking for "%n" (for languages with only one
form).
|