| Commit message (Collapse) | Author | Age | Files | Lines |
|\ |
|
| |\ |
|
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | | |
header + file. Now test check only size of the real file content,
assuming that it is rather boring (9,5MB of '\0'). It simply skip
header.
Reviewed by Peter Hartmann
|
| | |
| | |
| | |
| | | |
Reviewed-by: Peter Hartmann
|
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | | |
That way we prevent the current possible race condition that may appears
while touching signals slot while object are moved to different threads.
For exemple, when we do sender->threadData->mutex->lock(); the sender
can possibly be moved to another thread between the moment we get the
pointer to the threadData and the moment we aquire the lock. We could
check if we locked the right mutex and retry otherwise, but that would
break if the threadData (and hence the mutex) get destroyed in between.
The per object mutex is implemented with a thread pool.
I'm not using the global QThreadPool because we might ends up locking
two of their mutex, and that would be dangerous if something else holds
a lock on the same mutex (possible deadlock)
Putting the mutex pool in a Q_GLOBAL_STATIC doesn't work as it might
result of the ppol being deleted before some other object in others
Q_GLOBAL_STATIC structures
There is no need to lock this mutex in moveToThread as this is safe.
When emiting a signal, we do not need to lock the thread data, as the
user must ensure that the object is not moved to a thread while emiting
a AutoConnection signal.
Reviewed-by: Brad
|
|\ \ \
| | |/
| |/| |
|
| |/
| |
| |
| |
| |
| |
| | |
... by being able to load the certificates also in a shadow build
directory
Reviewed-by: Thiago
|
| |
| |
| |
| | |
Reviewed-by: Trust Me
|
| | |
|
| | |
|
| |
| |
| |
| |
| |
| |
| |
| |
| | |
Refactor the test of QImageReader to work with shadow build.
Add two tests for the TIFF format
Fix an error of the test of QImageWriter that prevented the cleaning
of the created files after the test.
Reviewed-by: Olivier
|
|\ \
| |/ |
|
| |
| |
| |
| |
| |
| |
| | |
translucentWidget: On Windows mobile the ColorRedWidget is initially
moved to the taskbar position where it cannot be grabbed.
Reviewed-by: mauricek
|
| |
| |
| |
| |
| |
| |
| | |
On some platforms (e.g. Mac) it's not sufficient to call
processEvents() only once.
Reviewed-by: Andreas Aardal Hanssen
|
| |
| |
| |
| | |
Reviewed-By: Peter Hartmann
|
| |
| |
| |
| | |
Reviewed-by: Peter Hartmann
|
| |
| |
| |
| | |
failures in Berlin.
|
| |
| |
| |
| |
| |
| | |
... but use the test server instead
Reviewed-by: Frans Englich
|
| |
| |
| |
| |
| |
| |
| |
| |
| |
| | |
While downloadProgress and uploadProgress both work on local files.
There still may be a delay before the connection is actually picked up.
This usually is caught by the processEvents(), but could be missed.
Therefore, do a wait if we don't have any pending connections and work
in ALL cases.
Reviewed-by: Markus Goetz
|
| |
| |
| |
| |
| |
| |
| | |
I think grabWindow was borken and we were compensating for it in the
auto test. Now that it works as documented our workaround broke.
Reviewed-by: Morten Sørvig
|
| |
| |
| |
| | |
Reviewed-by: jbache
|
| |
| |
| |
| | |
It's not enough to call processEvents() just once on all platforms.
|
| |
| |
| |
| |
| |
| | |
Not always is "." in the includes path...
Reviewed-by: mauricek
|
| |
| |
| |
| | |
Reviewed-by: mauricek
|
| |
| |
| |
| |
| |
| | |
Fixed a broken include
Reviewed-by: Thomas Zander
|
| |
| |
| |
| |
| | |
QApplication::activeWindow() returns null for native dialogs, so null
cannot be passed as the target widget when calling QTest::keyClick().
|
| |
| |
| |
| | |
Reviewed-by: Thomas Zander
|
| |
| |
| |
| |
| |
| |
| | |
Some optimized smooth scaling functions were introduced in 4.5, so
increase the tolerance level a small bit.
Reviewed-by: Trond
|
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| | |
It's wrong to assume that static_cast<> is allowed everywhere where
dynamic_cast<> is allowed. For example, if class C derives from both A
and B, then you can dynamic_cast<B *>(ptr_to_A), but you can't
static_cast.
So introduce a helper for dynamic casts that doesn't do
static_cast.
Reviewed-by: Olivier Goffart
|
| |
| |
| |
| |
| |
| |
| |
| |
| |
| | |
When expiring cache files use a QMultiMap, when using a QMap not all
files are put into the map because often many files (downloaded or
updated at the same time) will have the same creation QDateTime and
so only one will go into the QMap who's key is QDateTime.
Reviewed-By: Thiago Macieira
Reviewed-By: Peter Hartmann
|
| |
| |
| |
| | |
Reviewed-By: Peter Hartmann
|
| |
| |
| |
| |
| |
| |
| |
| |
| | |
The resolution was not saved when the image was saved
as tiff. This fix add the resolution, and try to guess if the user have
set it in dpi or dot per centimeter
Task-number: 245242
Reviewed-by: Samuel
|
| |
| |
| |
| | |
Reviewed-by: Peter Hartmann
|
| |
| |
| |
| | |
failures in Berlin.
|
| |
| |
| |
| |
| |
| |
| |
| |
| |
| | |
xunitxml testlib logger.
In the testlib plain logger, xfail is considered a pass and xpass
considered a fail. xunitxml had the opposite behavior; change it
to be the same.
Autotest: included
|
|\ \
| | |
| | |
| | |
| | |
| | |
| | |
| | | |
David Faure (1):
Fix compilation with strict iterators
Merge-request: http://qt.gitorious.org/qt/qt/merge_requests/437
Reviewed-by: Simon Hausmann <simon.hausmann@nokia.com>
|
| | | |
|
|\ \ \
| | |/
| |/|
| | |
| | |
| | |
| | | |
Conflicts:
src/corelib/kernel/qobject.cpp
src/corelib/kernel/qobject_p.h
src/network/access/qhttpnetworkconnection.cpp
|
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | | |
if one specify more than one parameter in font-family,
e.g., font-family: Verdana, Arial
Qt should fallback on the second font if the first cannot be found.
QFont::setFamily handle the case when the family name contains a comas,
so we do not need to handle that specially in the css parser code.
Task-number: 252311
Reviewed-by: Thomas Zander
|
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | | |
while using QOrderedMutexLocker::relock we might unlock our mutex
protecting the 'senders' list for a short moment. Another thread may then
modify or remove element on the list.
Therefore, we need to recheck the consistency of the list once we did
that.
Also, we cannot call removeSender because that will remove every
connections, making impossible for another object destroyed in the same
time to clean up the senders list, so call derefSender instead.
Reviewed-by: Brad
|
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | | |
According to the documentation, QCalendarWidget::setDateTextFormat() should
reset the format if the date is not valid.
New tests included for the formating of this widget.
Task-number: 252943
Reviewed-by: Olivier
|
| | |
| | |
| | |
| | | |
Task-number: 251248
|
| | |
| | |
| | |
| | |
| | |
| | |
| | | |
return error upon receiving an unknown authentication method (e.g.
WSSE); before we were just silently returning.
Reviewed-by: Thiago Macieira
|
| |/
|/|
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| | |
This commit add a new API to add/find/remove pixmaps into QPixmapCache.
This new extension is based on a key that the cache give you during
the insertion. This key is internally a int which makes all operations
in the cache much more faster that the string approach.
Auto-tests has been extended as well and a benchmark has been added to
compare both approach. I also depecrate the find method for the
string API to have a method pointer based and not reference based like
the Qt policy says.
Reviewed-by: bnilsen
Reviewed-by: andreas
Followed-deeply-by: trond
|
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| | |
QStyleOptionGraphicsItem extends QStyleOption with three values:
1) matrix, 2) levelOfDetail, 3) exposedRect, and they all
involve expensive QTranform operations when calculated. We
pass style option(s) to drawItems() and paint(), but the
extended values are usually not in use. We can therefore gain
quite some nice speedup by making them opt-in with the
QGraphicsItem::ItemUsesExtendedStyleOption flag.
Additionally, QStyleOptionGraphicsItem::levelOfDetail has been
obsoleted, and a new function QStyleOptionGraphicsItem::
levelOfDetailFromTransform(const QTransform &) has been added.
Me and Andreas don't consider this change to be too controversial
even though it changes the behavior.
Auto tests still pass.
Reviewed-by: Andreas
|
|\ \
| |/
| |
| |
| | |
Conflicts:
tools/macdeployqt/shared/shared.cpp
|
| |
| |
| |
| |
| |
| |
| |
| |
| | |
QColor::toCmyk() converted the color to RGB and then to CMYK. If the color
was already in CMYK, this conversion change it.
The color is now returned directly if it is in CMYK
Reviewed-by: Ariya
Task-number: 253625
|
| |\ |
|
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | | |
QGraphicsItem::deviceTransform() returns the item-to-device transform,
provided with the device-to-scene transform, and combining it with the
item's scene transform. This function is meant to handle items that
enable ItemIgnoresTransformations, but it happened to not work properly
for items that _don't_ enable that flag. Unfortunately this bug is
hard to work around for users from the outside, as it requires you to
check if the item or any ancestor enables ItemIgnoresTransformations.
The fix also removes unnecessary branchs inside QGV so that we use the
same function for all items.
Reviewed-by: bnilsen
|
| |/
| |
| |
| |
| |
| |
| |
| |
| | |
If two urls were added to the sidebar that only differed in how they
referenced the added url (i.e. /foo/bar/. and /foo/bar) then only one
entry should appear.
Task-number: 253532
Reviewed-by: Alexis
|