| Commit message (Collapse) | Author | Age | Files | Lines |
|\
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| | |
4.6-integration
* '4.6' of scm.dev.nokia.troll.no:qt/berlin-staging-1:
don't falsely complain about mismatched codecfortr
Fix QSettings default paths not being initialized when setPath() is called
add directories with sources to list of project roots
add -codecfortr option
sanitize lupdate's behavior regarding SUBDIRS projects
absorb cmdline tests into "good" structure
add ability to set working dir for test
support multiple output files
fix printing output from failed command
unshare pro post-processing code
complain if both sources and projects are given on the cmdline
still complain if only ts files where specified on the cmdline
do not sort the TS files
fix bogus warning message
|
| |
| |
| |
| | |
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.
|
| | |
|
| | |
|
| | |
|
| | |
|
|\ \
| |/
|/|
| |
| |
| |
| | |
4.6-integration
* '4.6' of scm.dev.nokia.troll.no:qt/qt-multimedia-team:
Add additional text and painting benchmarks.
|
| |
| |
| |
| |
| | |
These benchmarks have been moved in from the kinetic-declarativeui
branch as they are not QML specific.
|
| |
| |
| |
| |
| |
| |
| |
| |
| |
| | |
Calling setParentItem is causing the previous opacity/visible updates
to be discarded because the dirty flags were not propagated to the new parent.
Also removed some unnecessary 'markDirty' and 'update' calls.
Task-number: QTBUG-6738
Reviewed-by: bnilsen
|
| |
| |
| |
| |
| |
| | |
We are only interested in getting the posted MetaCall events delivered,
so we can get away with sendPostedEvents() instead of processEvents().
Makes the test also pass on Mac g++ carbon 32.
|
| |
| |
| |
| |
| |
| |
| | |
We need to invalidate the graphics source pixmap cache for both child
items and parent items when changing the opacity of a graphics item.
Reviewed-by: Bjørn Erik Nilsen
|
| |
| |
| |
| |
| |
| |
| |
| |
| | |
That rare case when we are deleting the last span was not being taken care
of. Unbelievable but true. Auto-test included.
Reviewed-by: Thierry
Reviewed-by: leo
Task-number: QTBUG-6004
|
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| | |
These were processed immediately, so there was a fair chance that we
could end up doing a virtual function call on items that were not fully
constructed. This patch is also an optimization, since we never remove
anything from the vector.
Auto-test included.
Reviewed-by: Jan-Arve
|
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| | |
Problem occured when doing something in the polishEvent() which
eventually ended up as an update(). The problem was that in
QGraphicsScene::addItem we scheduled a polish event after scheduling
an update, resulting in update requests being processed before polish
requests.
Auto-test included.
Task-number: QTBUG-6956
Reviewed-by: alexis
|
| |
| |
| |
| |
| |
| | |
We can't call QCOMPARE from within a nested function, because the
return statement will just exit that function.
VERIFY_COLOR can't be turned into a function this way.
|
| |
| |
| |
| |
| |
| | |
as agreed with Warwick.
This reverts commit 089ee7094eabb2058b478f5d2f306a69f6c0b3bf.
|
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| | |
If the file/data ends in the END CERTIFICATE line without a newline,
the certificate is still valid. If it's followed by anything other
than a newline, then it's no longer valid.
Also add another test for the BEGIN CERTIFICATE ending without
newline, to ensure we don't crash there either.
Reviewed-By: Peter Hartmann
|
| |
| |
| |
| |
| | |
Task-number: 6666
Reviewed-by: Harald Fernengel <harald.fernengel@nokia.com>
|
|\ \ |
|
| | |
| | |
| | |
| | |
| | |
| | |
| | | |
These auto tests are working only if developer build is defined, so exclude
those otherwise.
Reviewed-by: Rohan McGovern
|
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | | |
Adds a disconnectOne() method that allows a single signal/slot connection
to be disconnected, as required by QTBUG-6781.
Reviewed-by: Warwick Allison
Reviewed-by: Olivier Goffart
|
| | |
| | |
| | |
| | | |
Reviewed-by: Trust Me
|
| | |
| | |
| | |
| | | |
Reviewed-by: Trust Me
|
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | | |
We don't want to have to listen to the destroyed() signal for every
receiver object of a connection, and likewise we don't want to create
a QObject to handle each connection; instead, remove the connection
lazily at signal emission time after we've detected that the receiver
has been deleted.
Task-number: QTBUG-7313
Reviewed-by: Simon Hausmann
|
| | |
| | |
| | |
| | |
| | |
| | | |
Was a cut n paste error probably.
Reviewed-by: TrustMe
|
| | |
| | |
| | |
| | |
| | |
| | |
| | | |
We need a third one to benchmark the without-event-loop use case
that we now provide.
Reviewed-by: TrustMe
|
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | | |
It is now considered as finished immediatly after creation to avoid
an event loop spin.
Had to change the auto tests a bit to account for the new behaviour.
Reviewed-by: Peter Hartmann
|
| |\ \
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | | |
4.6-integration
* '4.6' of scm.dev.nokia.troll.no:qt/oslo-staging-1:
Fix QSslCertificate issues
Change the prefered content size of the anomaly browser
Avoid painting while loading in the anomaly demo browser
QFile::readData: Simplify code
If the file is open, there must be an engine.
QFile: Fix a pre-mature pessimization
don't assert when calling QtScript-wrapped method of deleted QObject
|
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | | |
Thank you Matthew Cattell for the fix!
Task-number: QTBUG-6466
Reviewed-by: joao
|
| | |/
| | |
| | |
| | |
| | |
| | | |
Make it behave the same as the old (4.5) back-end.
Reviewed-by: Jedrzej Nowacki
|
| |/
| |
| |
| |
| |
| |
| |
| |
| |
| | |
pointer then it should not crash but warn instead.
Task: -
RevBy: Andreas
AutoTest: Included
Details: This also fixes availableGeometry() as well to warn under
the same circumstances.
|
| | |
|
| |\
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | | |
4.6-integration
* '4.6' of scm.dev.nokia.troll.no:qt/oslo-staging-1:
QFile::remove: don't fail for unrelated errors
Fix tst_qmlgraphicstext::letterSpacing tst_qmlgraphicstext::wordSpacing Sent for review into 4.6.
Updated WebKit from /home/shausman/src/webkit/trunk to qtwebkit/qtwebkit-4.6 ( 8f6992f4e8f027818429d428393b08068eca9ffa )
network internals: fix uploading of data
File dialog mode is not correctly updated in Mac (Cocoa).
add tests for QFlags behavior in QtScript
|
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | | |
remove was checking for errors from close, but without clearing the
error state beforehand it ended picking unrelated errors.
Task-number: QTBUG-7285
Reviewed-by: qCaro
|
| | |
| | |
| | |
| | |
| | | |
It's currently not even documented, but this test defines the
current level of support.
|
| |\ \
| | |/
| |/|
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | | |
4.6-integration
* '4.6' of scm.dev.nokia.troll.no:qt/oslo-staging-2:
Updated WebKit from /home/shausman/src/webkit/trunk to qtwebkit/qtwebkit-4.6 ( 8f6992f4e8f027818429d428393b08068eca9ffa )
Better fix for build!=src Makefile generation
Make input mask cursor blink
Fix QGLWidget::renderPixmap() on Windows.
Fix rules for recreating the Makefile in a subdir
Disable some tests that require high floating point precision.
Replace the truncate function with fuzzierCompare().
Rework how Qt handles GL extensions.
More changelog additions for QtWebKit
Make compile on symbian/Linux
Removed pointless image comparison in raster colorize filter.
Improved performance of translating device coordinate graphics effects.
|
| | |\
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | | |
4.6-integration
* '4.6' of scm.dev.nokia.troll.no:qt/oslo-staging-2:
Fix rules for recreating the Makefile in a subdir
Disable some tests that require high floating point precision.
Replace the truncate function with fuzzierCompare().
Rework how Qt handles GL extensions.
More changelog additions for QtWebKit
Make compile on symbian/Linux
Removed pointless image comparison in raster colorize filter.
Improved performance of translating device coordinate graphics effects.
|
| | | |\
| | | | |
| | | | |
| | | | |
| | | | | |
Conflicts:
dist/changes-4.6.1
|
| | | | |
| | | | |
| | | | |
| | | | | |
Disable them if sizeof(qreal)==4
|
| | | |\ \ |
|
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | | |
Don't invalidate the cache if we're only translating and the effect rect
is fully contained within the device rect of the painter.
Task-number: QTBUG-6901
Reviewed-by: Bjørn Erik Nilsen
|
| | | |/ /
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | | |
truncate did a qRound of the two numbers, which could cause two numbers
that were close to become far away (e.g. (0.000049 and 0.000051 would
become 0 and 1 respectively)
fuzzierCompare allows less precision than qFuzzyCompare. This is because
the anchor layout engine can sometimes do quite a lot of calculations,
and the error will be larger than what the qFuzzyCompare checks for.
Thus, the factor in fuzzierCompare is not chosen due to mathematical
proof but rather it is just chosen by what is acceptable.
(actually it can still be larger and still be acceptable)
|
| |\ \ \ \
| | |/ / /
| |/| | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | | |
4.6-integration
* '4.6' of scm.dev.nokia.troll.no:qt/oslo-staging-1:
tst_qnetworkreply benchmark: Read HTTP headers when emulating HTTP
Add a selftest for tests/auto/auto.pro.
|
| | | | |
| | | | |
| | | | |
| | | | | |
Reviewed-by: Peter Hartmann
|
| | | |/
| | |/|
| | | |
| | | |
| | | |
| | | | |
This selftest enforces that tests/auto/auto.pro is properly maintained.
It may be extended to check other elements of the environment necessary
for autotests to run correctly.
|
| |\ \ \
| | |/ /
| |/| |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | | |
4.6-integration
* '4.6' of scm.dev.nokia.troll.no:qt/qt-multimedia-team:
Revert "Frequency to SampleRate and channels to channelCount." missed
Revert "Frequency to SampleRate and channels to channelCount."
Revert "Added setChannelCount() to QAudioFormat."
|
| | | |
| | | |
| | | |
| | | |
| | | |
| | | | |
unit test.
This reverts commit 80d4a4945d3273a4b2ce91e34597533f661af320.
unit test missed on last revert.
|
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | | |
This reverts commit 80d4a4945d3273a4b2ce91e34597533f661af320.
Conflicts:
examples/multimedia/audioinput/audioinput.cpp
examples/multimedia/audiooutput/audiooutput.cpp
src/multimedia/audio/qaudio_mac.cpp
src/multimedia/audio/qaudiodeviceinfo_alsa_p.cpp
src/multimedia/audio/qaudiodeviceinfo_mac_p.cpp
src/multimedia/audio/qaudiodeviceinfo_win32_p.cpp
src/multimedia/audio/qaudioformat.h
src/multimedia/audio/qaudioinput.cpp
src/multimedia/audio/qaudiooutput.cpp
tests/auto/qaudiodeviceinfo/tst_qaudiodeviceinfo.cpp
tests/auto/qaudioformat/tst_qaudioformat.cpp
tests/auto/qaudioinput/tst_qaudioinput.cpp
tests/auto/qaudiooutput/tst_qaudiooutput.cpp
|