| Commit message (Collapse) | Author | Age | Files | Lines |
|
|
|
|
| |
Merge-request: 438
Reviewed-by: Leonardo Sobral Cunha <leo.cunha@nokia.com>
|
|
|
|
|
| |
Task-number: QTBUG-6890
Reviewed-by: Thierry
|
|\ |
|
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| | |
Error was:
../../include/QtCore/../../src/corelib/arch/qatomic_ia64.h(208):
error: argument of type "QMutexPool *volatile *" is incompatible with parameter of type "void *volatile *"
return (T *)_InterlockedExchangePointer(&_q_value, newValue);
^
detected during instantiation of "T *QBasicAtomicPointer<T>::fetchAndStoreAcquire(T *) [with T=QMutexPool]"
Patch by Intel Yolanda Chen (relayed by reporter Richard Fleck).
Task-number: QTBUG-7356
|
| |\
| | |
| | |
| | |
| | |
| | |
| | |
| | | |
4.6-integration
* '4.6' of scm.dev.nokia.troll.no:qt/qt-s60-public:
Enable surface transparency support on Symbian^4.
Improve the behavior of expose events on Symbian.
|
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | | |
On Symbian^4 systems where the window supports surface transparency, we
use this for the Qt::WA_TranslucentBackground flag instead of the
previous method.
Task-number: QT-2026
Reviewed-by: Iain
|
| |/
| |
| |
| |
| |
| |
| |
| | |
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
|
| |\
| | |
| | |
| | |
| | | |
Conflicts:
dist/changes-4.6.1
|
| | |
| | |
| | |
| | |
| | |
| | | |
QFileInfo().absolutePath() is legal and shouldn't produce a warning.
Reviewed-by: João Abecasis
|
|\ \ \
| | |/
| |/|
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | | |
Conflicts:
bin/syncqt
doc/src/deployment/deployment.qdoc
src/corelib/io/qfsfileengine_win.cpp
src/corelib/xml/qxmlstream.cpp
src/opengl/gl2paintengineex/qpaintengineex_opengl2_p.h
tools/assistant/tools/assistant/centralwidget.cpp
tools/linguist/lupdate/main.cpp
|
| |\ \
| | |/
| |/|
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | | |
4.6-integration
* '4.6' of scm.dev.nokia.troll.no:qt/oslo-staging-2: (23 commits)
My changes
Significant digits were lost in QDoubleSpinBox range when changing precision
My changelog for 4.6.1.
Added my changes to the 4.6.1 change log.
Put LinesHint into QVectorPath hints to enable further optimizations
Update changes file for 4.6.1
Avoid coordinate limitations in the raster engine.
Update changelog with my 4.6.1 changes.
4.6.1 changes
Fixed bug where QGLPixmapData::toImage() returned too dark image.
Update change log with Yoann Lopes work.
Fix completion in QFileDialog.
Fix point drawing on raster engine for flat and square caps
Update changes file with Rhys Weatherley's work.
warning fixes for platforms, where qreal == float
fix release mode crash in qfont.cpp initFontSubst() on Windows mobile
Fixed justify aligned text drawing with the GL1 engine.
Add odf-writer benchmark.
Fixed subpixel antialiased text drawing with the GL2 engine.
Fixes warning in the QMacStyle
...
|
| | |\
| | | |
| | | |
| | | |
| | | | |
Conflicts:
dist/changes-4.6.1
|
| | | |
| | | |
| | | |
| | | | |
Reviewed-by: thartman
|
| | |/
| |/|
| | |
| | | |
Reviewed-by: axis
|
| |\ \ |
|
| | | |
| | | |
| | | |
| | | |
| | | | |
Merge-request: 426
Reviewed-by: Thiago Macieira <thiago.macieira@nokia.com>
|
| |/ /
| | |
| | |
| | |
| | |
| | |
| | |
| | | |
Replaced the ambiguous "delivered" with the explanation that the
blocking queued connection type blocks the emitter's thread until
the slot finishes executing in the receiver's thread.
Task-number: QTBUG-6392
|
| |\ \ |
|
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | | |
This is private API for now. For 4.7, decide whether to have a public
method for this.
Also investigate whether to provide a qHash function. Adding one to Qt
would break source- and binary-compatibility with code that already
has that (like Soprano).
Patch-By: Warwick Allison
Reviewed-by: Thiago Macieira
|
| | |\ \
| | | |/
| | |/|
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | | |
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 )
...
|
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | | |
Revert "Use the new QTextCodec api in the QXmlStreamWriter."
This reverts commit fdac6df6d46e6d4f00763365de5a4437ad06ba39.
Revert "Added new functions to QTextCodec that accept ConversionFlags."
This reverts commit 7fb78e7f60ea72e9e471d6cbc4403d490581df17.
|
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | | |
Instead of accesing private data, use the QTextCodec::makeEncoder() to pass the
initial conversion flags to the codec.
Also improved the behavior - we shouldn't add BOM in the middle of the data
when dumping xml in all encodings, not only for utf8.
Task-number: QTBUG-7180
Reviewed-by: Thiago
|
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | | |
In some cases the user might want to pass initial conversion flags that should
be used by the QTextEncoder and QTextDecoder, so added convenience
QTextCodec::makeDecoder and makeEncoder functions that accept those flags as an
argument.
Task-number: QTBUG-7180
Reviewed-by: Thiago
|
| | | |
| | | |
| | | |
| | | | |
Task-number: QTBUG-7246
|
| | |/
| |/|
| | |
| | | |
Task-number: QTBUG-5121
|
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | | |
Try to retrieve user/group name in a single call to LookupAccountSid, by
using pre-allocated buffers. Only call a second time if the buffer size
is insufficient. 64 bytes should be enough in common case.
Previously, we would always call LookupAccountSid twice, even if
ERROR_NONE_MAPPED occured first time.
Merge-request: 815
Reviewed-by: João Abecasis <joao@trolltech.com>
|
| | |
| | |
| | |
| | |
| | | |
Merge-request: 815
Reviewed-by: João Abecasis <joao@trolltech.com>
|
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | | |
* tabs -> spaces;
* if( -> if (
* some strings rearranged.
no code changes!
Merge-request: 815
Reviewed-by: João Abecasis <joao@trolltech.com>
|
| | |
| | |
| | |
| | |
| | |
| | |
| | | |
QFSFileEngine::owner(OwnerUser) now works as expected
Merge-request: 815
Reviewed-by: João Abecasis <joao@trolltech.com>
|
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | | |
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
|
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | | |
Now that we don't defer to the file engine for the write buffer it is
doubly more important to retain errors from flush. The logic employed
reproduces what we already had in QFSFileEngine::close, earliest error
stays.
Reviewed-by: Thiago Macieira
|
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | | |
Since Qt 4.3 QIODevice has been providing read buffering for buffered
devices; QFile provides a write buffer. Thus, requesting a buffered file
from the engine results in unnecessary double-buffering where this is
supported natively.
By preferring QFile/QIODevice's buffering over the file engine we reduce
the number of system calls.
On the other hand, buffering inside QIODevice can't easily be disabled
without changing the return value of QIODevice::openMode() (function is
non-virtual).
Reviewed-by: Thiago Macieira
|
| |\ \ |
|
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | | |
On Mac/32 QXmlStreamWriter is actually QCoreXmlStreamWriter, so the friend
declaration in QTextEncoder to access the private state needs to cover
that class, too.
Reviewed-by: Prasanth
|
| |/ /
| | |
| | |
| | | |
Task-number: QTBUG-6606
|
| |\ \ |
|
| | | |
| | | |
| | | |
| | | | |
Reviewed-by: Trust Me
|
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | | |
One major cost is that QUrl::d is never 0 (even for default
constructor). While this simplifies the code, it has a real
performance impact, since QUrlPrivate is quite expensive to create (14
QString/QByteArray members, plus others). In a simple test of the QML
flickr demo, 1 in 3 QUrlPrivate objects that were created were never
used before being deleted.
According to callgrind, this reduces cost of QUrl+QUrlPrivate by 25%
in the case tested.
Patch-by: Warwick Allison
Reviewed-by: Thiago Macieira
|
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | | |
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: Trust Me
|
| |/ /
| | |
| | |
| | | |
Task-number: QTBUG-7156
|
| | |
| | |
| | |
| | | |
Reviewed-by: Bradley T. Hughes
|
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | | |
we had a hash function defined in xmlpatterns; this commit adds a global
hash function for QUrls.
Beware that code that defines its own hash function for QUrls will need
to #ifdef it out for 4.7.
Patch-By: Warwick Allison
Reviewed-by: Peter Hartmann
Reviewed-by: Thiago Macieira
|
|\ \ \
| | |/
| |/| |
|
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | | |
This is purely an optimization for fullscreen-only apps.
Task: QTBUG-6098
RevBy: Jason Barron
RevBy: mread
AutoTest: Included
|
| |/
| |
| |
| |
| |
| | |
The extra line would make qdoc treat the next text as a separate
paragraph, but it should be part of the description for the previous
value.
|
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| | |
When creating a single dialog in the main function, and tell it
to exec, we run a modal dialog. But there is really no other
window on screen to be modal for. So in that case, since this is
a rather common pattern for Qt applications, we allow users to
quit the application from the dock. But this action is sendt as
an apple event. And and that point in time, cocoa has the the
apple event handler, and refuses to close down the application
because it detects a modal window.
Our solution is to install/overwrite the apple event handler for
kAEQuit _after_ cocoa has finished its own installation. But in
order to do this, we need to wait until [NSApplication run] has
started, otherwise it will not take effect. And that is what this
patch essentially does.
|
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| | |
Instead of accesing private data, use the QTextCodec::makeEncoder() to pass the
initial conversion flags to the codec.
Also improved the behavior - we shouldn't add BOM in the middle of the data
when dumping xml in all encodings, not only for utf8.
Task-number: QTBUG-7180
Reviewed-by: Thiago
Conflicts:
src/corelib/xml/qxmlstream.cpp
|
| |
| |
| |
| |
| |
| |
| |
| |
| |
| | |
In some cases the user might want to pass initial conversion flags that should
be used by the QTextEncoder and QTextDecoder, so added convenience
QTextCodec::makeDecoder and makeEncoder functions that accept those flags as an
argument.
Task-number: QTBUG-7180
Reviewed-by: Thiago
|