| Commit message (Collapse) | Author | Age | Files | Lines |
|\
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| | |
4.6-integration
* '4.6' of scm.dev.nokia.troll.no:qt/oslo-staging-1: (49 commits)
Reverted two commits that were pushed to the wrong branch.
Use the new QTextCodec api in the QXmlStreamWriter.
Added new functions to QTextCodec that accept ConversionFlags.
Fix passing of arguments to syncqt
doc: Fixed typos.
Fixes: Fix spinbox with NoButton style in QGtkStyle
doc: Explained parameter value defaults where appropriate.
Cocoa: Fix painting errors on QGLWidget resizing.
Fix broken QGLWidget::renderPixmap on Mac/Carbon
Fixes: Setting any style sheet breaks checkbox positioning
Fixes: MenuItem size fixes and missing separator with Gtk+
Autotest: add a test for QNAM's HTTP cache handling code
QNAM HTTP: just use the expirationDate in the code that validates the cache
QNAM HTTP: change the caching semantics to match documentation
QNAM HTTP: fix the caching algorithm from RFC 2616
Avoid repeatedly calling LookupAccountSid in QFSFileEngine::owner
improve readability a bit more
fix styling; improve readability
make it possible to retrieve name of the user who owns the file
Updated WebKit from /home/shausman/src/webkit/trunk to qtwebkit/qtwebkit-4.6 ( 99ccc1c3e4db5354246720f9b9aa3d282e64497d )
...
|
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| | |
Task: QTBUG-7198
RevBy: ogoffart
Details:
It was impossible to override the checkbox positioning in a custom
style if any style sheet was set on the application of widget.
This was because the style sheet never passed control to the
base style. We now fix it by checking if the style sheet has
the appropriate style rules.
|
| | |
|
| |\
| | |
| | |
| | |
| | | |
Conflicts:
src/multimedia/audio/qaudioformat.cpp
|
| | | |
|
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | | |
When closing a file, the contents of the write buffer should be emptied
even in the case where flush fails, so it doesn't leak to subsequent
files opened through the same instance. This is inline with what would
happen with native close on a buffered device.
Also changed the resource file engine to succeed on flush. Since all
writes fail there, logically it's write buffer is empty and flush should
succeed. This keeps auto-tests happy :-)
tst_QFile::fullDisk auto-test extended to ensure re-opening QFile does
not keep the write buffer alive.
Reviewed-by: Thiago Macieira
|
| | |
| | |
| | |
| | | |
Reviewed-by: Trust Me
|
| |\ \
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | | |
4.6-integration
* '4.6' of scm.dev.nokia.troll.no:qt/oslo-staging-1:
QIODevice: Fix readAll()
Temporary hackiesh solution to prevent BOM in the xml data.
Fixed qxmlstream autotest when using shadow builds.
Attempt at readding the capital P headers for Phonon
Remove special Phonon processing from syncqt.
Use the lowercase/shortname.h headers for Phonon includes
Fixes a crash when setting focus on a widget with a focus proxy.
Update copyright year to 2010
doc: Clarified activeSubControls and subControls.
Remove warning "statement with no effect"
doc: Clarified that .lnk files are System files on Windows.
|
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | | |
My patch from yesterday did not have any effect: Instead of
really using what was in the buffer, it used it but then read
it from the underlying device anyway.
Thanks Ritt Konstantin and Joao.
Reviewed-by: joao
|
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | | |
We don't want to have byte-order-mark in the middle of the written string.
Task-number: QTBUG-6893
Reviewed-by: Thiago
|
| | | |
| | | |
| | | |
| | | | |
Reviewed-by: trustme
|
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | | |
When the focus proxy widget doesn't have InputMethodEnabled attribute set we
shouldn't try to set an input context on it.
Reviewed-by: Simon Hausmann
|
| | | |
| | | |
| | | |
| | | | |
Reviewed-by: Trust Me
|
| |_|/
|/| |
| | |
| | |
| | |
| | |
| | |
| | |
| | | |
This is purely an optimization for fullscreen-only apps.
Task: QTBUG-6098
RevBy: Jason Barron
RevBy: mread
AutoTest: Included
|
|\ \ \
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | | |
4.6-integration
* '4.6' of scm.dev.nokia.troll.no:qt/qt-multimedia-team:
QAudioInput loses data on Maemo5/other linux platforms.
Fix warning in qfilesystemmodel_p.h
Frequency to SampleRate and channels to channelCount.
Added setChannelCount() to QAudioFormat.
|
| |\ \ \
| | |/ /
| | | |
| | | |
| | | | |
Conflicts:
examples/multimedia/audiodevices/audiodevices.cpp
|
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | | |
-Added channelCount(), changed everything to use this instead
of channels() in QAudioFormat class.
-Added setSampleRate() and sampleRate(), changed everthing to use these
instead of setFrequency() and frequency() in QAudioFormat class.
-Added supportedSampleRates() and supportedChannelCounts(), changed
everything to use these instead of supportedFrequencies() and
supportedChannels() in QAudioDeviceInfo class.
Reviewed-by:Justin McPherson
|
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | | |
Added setChannelCount() and updated docs/examples/tests to use it
instead of setChannels().
Reviewed-by:Justin McPherson
|
| |/ /
|/| |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | | |
QSet is a hash internally, using Iterator::begin while erasing elements
inside the set might create holes and then the complexity increase.
We now use the return value of erase (the next element) so the
complexity is linear.
For those who create/delete item in the polish event (BAD), _q_polishItem
might be slower than the normal call.
Task-number:QTBUG-6958
Reviewed-by:olivier
|
|\ \ \
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | | |
4.6-integration
* '4.6' of scm.dev.nokia.troll.no:qt/oslo-staging-2: (42 commits)
QBoxLayout::setGeometry would not respect the widget min/max width
Revert "QStyleSheetStyle: Fixed some text croped when having padding with native border."
Use QFile:rename when moving items in QFileystemModel.
Revert "Add GLfloat[2][2] & GLfloat[3][3] uniform setters to QGLShaderProgram"
Fix default filter selection when using HideNameFilterDetails option.
Don't write out fo:word-spacing if its the default value.
Improved initial startup time for a QGLWidget ontop of EGL/X11.
Document the QGraphicsView::IndirectPainting flag
Display broken symlinks in the filesystem model.
Fix typo in autotest testcase name.
Fixed a bug with distribution of spans.
Make unit test more robust
Compile with QT_NO_DOCKWIDGET
Removed temporary QGLWidget created during QGLWidget/X11 initialization.
Fix test: The bug is now fixed
Fix auto-test failure on Windows
QScript: Lookup the native setter from the prototype
Implement QScript::QObjectDelegate::getOwnPropertyDescriptor
fix compilation in GL2 paint engine for Windows
Move QGLTextureGlyphCache into it's own file
...
|
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | | |
When calling heightforWidth after a geometry change, the width actually used
could be outside the widget's width bounds. The height could then be smaller
than needed to fit the widget's contents resulting in a clipped widget being
drawn. Auto-test included.
Reviewed-by: Olivier
Task-number: QTBUG-7103
|
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | | |
native border."
This reverts commit 6e90192b599cee9b903177a0978198326f667613.
his change the behaviour a little bit. It is better to wait for Qt 4.7
Reviewed-by: jbache
|
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | | |
When you have HideNameFilterDetails on, comparing the default filter
given in parameter for selectNameFilter has to be done with the striped
version of the filter, i.e. without the details.
Task-number:QTBUG-4842
Reviewed-by:gabriel
Reviewed-by:olivier
|
| |\ \ \ |
|
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | | |
If a span required more size than the rows/columns it spanned, the
size of the span was not distributed to the rows it spanned. The
result was that the size hints of the layout was not correct,
causing the layout to be potentially smaller than the spanning item.
Task: QT-2261
Reviewed-by: Alexis
|
| | | | | |
|
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | | |
Make sure that on systems that have a default font of "Sans Serif" (or
another not really existing font name) the unit test doesn't fail.
Reviewed-By: Simon Hausmann
Reviewed-By: Olivier
|
| | | | | |
|
| | | | |
| | | | |
| | | | |
| | | | | |
Reviewed-by: Olivier
|
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | | |
The test passes/doesn't fail, but is a useful test nonetheless, so
adding it to the testsystem anyway.
Task-number: QTBUG-6852
|
| | | | |
| | | | |
| | | | |
| | | | |
| | | | | |
Task-number: QT-2600
Reviewed-by: Samuel
|
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | | |
This option was simply not implemented at all so it didn't work.
Task-number:QTBUG-6558
Reviewed-by:ogoffart
|
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | | |
This test renders various primitives with anti-aliasing both on and
off. It then repeats the render at several non-integer offsets.
Note: The reference image was generated with the raster engine,
which seems to have off-by-one errors on fills when rendering
aliased (It seems to ceil the coords rather than round them).
Reviewed-By: Trustme
|
| | | | |
| | | | |
| | | | |
| | | | |
| | | | | |
Task-number: QTBUG-7047
Reviewed-by: Benjamin Poulain
|
|\ \ \ \ \
| |_|_|_|/
|/| | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | | |
4.6-integration
* '4.6' of scm.dev.nokia.troll.no:qt/berlin-staging-1:
uic3/uic: Ignore buttonGroupId property when there is no parent QButtonGroup
Changelog: Added Designer/uic entries for 4.6.1
Designer: Enable seconds editing for Q[Date]TimeEdit's properties.
Designer: Selection handles disappear when using style sheet on form.
do not accumulate messages
|
| |/ / /
| | | |
| | | |
| | | |
| | | |
| | | |
| | | | |
The uic from Qt3 did the same. And otherwise uic3/uic generates a
radiobutton->setButtonGroupId(val) line, which does not compile.
Reviewed-by: Friedemann Kleint <Friedemann.Kleint@nokia.com>
|
|\ \ \ \ |
|
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | | |
For some reason, I got it wrong.
Reviewed-by: TrustMe
|
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | | |
.. and more testcases
Reviewed-by: joao
|
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | | |
Move benchmarks into tests/benchmarks directory.
Reviewed-by: Thiago
|
| |/ / /
|/| | |
| | | |
| | | |
| | | |
| | | | |
We always test the proxies now.
Reviewed-by: Thiago
|
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | | |
Happens for example if a DockWidget is undocked and has a child
whith the WA_StaticContents attribute.
The parent does not change (so newParent is false) but still, the
top level widget change. So staticWidget need to be moved to the
new backingstore.
Reviewed-by: Benjamin Poulain
Task-number: QTBUG-6883
|
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | | |
QUrl::setPassword() without QUrl::setUserName() is actually useful,
e.g. for kde's ldap:// slave. QUrl::toString() already handled this correctly,
but QUrl::toEncoded() would forget the password in such a case.
Autotest added.
Merge-request: 2276
Reviewed-by: Olivier Goffart <ogoffart@trolltech.com>
|
| | | |
| | | |
| | | |
| | | | |
Commit d27006b2a853924a11aa2bc45 did not fully revert the test
|
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | | |
The native border width need to be taken into account in QRenderRule::boxRect()
Task-number: QTBUG-6855
Reviewed-by: Benjamin Poulain
|
|\ \ \ \
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | | |
4.6-integration
* '4.6' of scm.dev.nokia.troll.no:qt/oslo-staging-2:
revert f36fb8b2b63b3734cc2bd66b329ca4fef1204845
Read QWS_SIZE from layer rather than screen
Get rid of no_cast_from_ascii warning
Docs: Amendments to latest changes to QImageReader docs.
images: Document QImageReader::loopCount behaviour for infinite loops
gif: Add unit test for QImageReader::size calls
gif: 10% speedup on microbenchmark on QImageReader
png: Avoid calling QImage::scanLine(int) from within a loop
QImageReader: Avoid errorString creation in the normal case
Fix text rendering on GL2 paint engine
|
| |\ \ \ \
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | | |
4.6-integration
* '4.6' of scm.dev.nokia.troll.no:qt/oslo-staging-2:
revert f36fb8b2b63b3734cc2bd66b329ca4fef1204845
Read QWS_SIZE from layer rather than screen
Get rid of no_cast_from_ascii warning
Docs: Amendments to latest changes to QImageReader docs.
images: Document QImageReader::loopCount behaviour for infinite loops
gif: Add unit test for QImageReader::size calls
gif: 10% speedup on microbenchmark on QImageReader
png: Avoid calling QImage::scanLine(int) from within a loop
QImageReader: Avoid errorString creation in the normal case
Fix text rendering on GL2 paint engine
|
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | | |
as discussed at #qt-labs special dirs should be hidden on unix
to preserve qt3-like behavior
unhiding those dirs was not a good idea and now i do revert of my changes
Merge-request: 1894
Reviewed-by: Joerg Bornemann <joerg.bornemann@nokia.com>
|
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | | |
The gif and mng reader will return -1 as QImageReader::loopCount()
for infinite images. Document that this -1 is clashing with the
error handling of this method.
The documentation was mixing the default and error cases. In some
cases "Otherwise -1" and "Otherwise 0" was used. Change this to
mention the default coming from QImageIOHandler in the "Otherwise"
clause and document the error case with -1.
Add a test case to check that loopCount() returns -1 for infinite
animations.
Reviewed-by: Andreas
|
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | | |
Verify that QImageReader::size is not consuming a frame and
can be called before each frame and that the last frame will
return a QSize of (-1x-1).
Task-number: QTBUG-6696
Reviewed-by: Andreas
|