| Commit message (Collapse) | Author | Age | Files | Lines |
|
|
|
| |
Reviewed-by: TrustMe
|
|\
| |
| |
| |
| |
| | |
Conflicts:
src/gui/graphicsview/qgraphicsscene.cpp
src/gui/kernel/qt_cocoa_helpers_mac_p.h
|
| |
| |
| |
| |
| |
| |
| | |
Setting a file from a resource would result in 'qrc::/file' as
the resource browser returns ':/file'.
Reviewed-by: Jarek Kobus <jkobus@trolltech.com>
Initial-patch-by: andy <qt-info@nokia.com>
|
| |
| |
| |
| | |
Also marked the other QHttpXxx classes as \obsolete.
|
| |
| |
| |
| |
| |
| |
| | |
The classes marked \obsolete are no longer included in the
"All Classes" list. They are listed separately on an
"Obsolete Classes" list. The new page is reachable from the
"All Classes" page and from the "Grouped Classes" page.
|
| | |
|
| |
| |
| |
| | |
Reviewed-by: mauricek
|
| | |
|
| |
| |
| |
| |
| |
| | |
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
|
|\ \ |
|
| | |
| | |
| | |
| | | |
e.g. '\reimp' in myFunc() should be '\internal' because its base function is private or internal
|
|\ \ \
| |/ /
|/| /
| |/
| |
| |
| |
| |
| |
| |
| |
| |
| | |
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
|
| |
| |
| |
| |
| |
| |
| | |
Trivial fix. Reported by Michael Brasser.
Task-number: 258337
Reviewed-By: Peter Hartmann
|
| |
| |
| |
| |
| | |
- 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.
|
| |
| |
| |
| | |
Reviewed-by: Friedemann Kleint <Friedemann.Kleint@nokia.com>
|
| | |
|
| |
| |
| |
| |
| |
| |
| |
| |
| | |
The checksdk build was broken and it makes no sense to maintain two
seperate bootstrap configurations. The checksdk sources had to be
corrected in certain cases to work with the bootstrap lib.
Esp. using qDebug for ouput message is not a good idea.
Reviewed-by: thartman
|
| |
| |
| |
| |
| |
| |
| | |
Added qtextcodec and qutfcodec to bootstrapped applications (checksdk
and configure)
Reviewed-by: trustme
|
|\ \ |
|
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | | |
We need this to support the behavior in Gtk+ where, when
Qt::ToolButtonTextBesideIcon is used, only text labels
for important actions are shown. It will also enable us to
prioritize actions in the future when for instance collapsing
a toolbar.
Task-number: 258290
Reviewed-by: thierry
|
| | |
| | |
| | |
| | |
| | | |
If we are doing it for Creator, we may as well be nice and do a similar
thing for Designer.
|
|/ /
| |
| |
| |
| | |
Reviewed-by: Trust Me
Post-review-sanity-check-by: Peter Hartmann
|
| |
| |
| |
| | |
Reviewed-by: Trust Me
|
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| | |
KDE and GNOME has the concept of a default tool button style that
can be set system-wide. Qt currently allways default to IconOnly.
I have added an optional Qt::ToolButtonSystemDefault value so you
can opt-in to respect the system setting. We did not change the
default because a lot of apps will look odd when for instance
text is beside icons and the descriptive text is too long.
Task-number: 237864
Reviewed-by: ogoffart
|
| | |
|
|\ \ |
|
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | | |
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
|
|\ \ \
| |/ / |
|
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | | |
phonon backend:
- mention the DirectShow SDK, not the DirectX SDK (which doesn't include DirectShow anymore)
- mention which exact files were not found, rather than just "all required files couldn't be found"
Merge-request: 881
Reviewed-by: Rohan McGovern <rohan.mcgovern@nokia.com>
|
| | | |
|
| | | |
|
| |\ \
| | |/
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | | |
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.
|