| Commit message (Collapse) | Author | Age | Files | Lines |
|
|
|
|
|
|
|
|
| |
still paint them.
The autotest is included.
Task-number: 254449
Reviewed-by: ogoffart
|
|\
| |
| |
| |
| |
| |
| |
| | |
Conflicts:
src/3rdparty/phonon/qt7/mediaobject.mm
src/3rdparty/phonon/qt7/quicktimevideoplayer.mm
src/gui/text/qfontengine_win.cpp
tools/linguist/shared/cpp.cpp
|
| |
| |
| |
| |
| |
| |
| |
| |
| |
| | |
Some of the tests (including the httpsServer one) requested that the
server close the connection (Connection: close). It could happen that,
well, the server did close the connection and we noticed it while doing
the waitForBytesWritten in the doSocketFlush function. Then we'd create
an error in the next step because the socket wasn't connected.
Reviewed-by: TrustMe
|
| |
| |
| |
| |
| | |
cursorPositionChanged() singals of QTextDocument. The contentChange() signal
is used for the syntax highlighter.
|
| |
| |
| |
| |
| |
| |
| | |
More information in task 166873.
Merge-request: 514
Reviewed-by: Jan-Arve Sæther <jan-arve.saether@nokia.com>
|
| |
| |
| |
| |
| |
| | |
Also, issue a warning if a type is not known to the meta-type system.
Task-number: 248129
|
| |
| |
| |
| |
| |
| |
| | |
Converting the array to its string representation is not very useful.
Now round-trip conversion will work as well.
Reviewed-by: Ariya Hidayat
|
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| | |
The fix that was introduced adds regressions, and I don't see a way we
can fix it without breaking someone elses code. So restoring the
original fix that just avoid a crash (autotest by Thierry is included).
Revert "Revert Avoid a crash when setting a focus in a widget
hierarchy containing"
Revert "Setting a focus on a widget hierarchy which contains both
visible and invisible widgets could cause a crash."
This reverts commit be833a4f25a8ec8c3dd7a8ac4fa4b0507c93e7ee.
This partially reverts commit 1a7da7096bbda17197738061902f4489af234bc0
Reviewed-by: Thierry Bastian
Reviewed-by: Prasanth Ullattil
|
| |
| |
| |
| |
| |
| |
| |
| |
| | |
added new method QNetworkAccessManager::deleteResource (naming the
method "delete" was not possible since it is a reserverd word in
C++) and adjusted all the internals necessary.
Task-number: 242916
Reviewed-by: Thiago
|
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| | |
When cross-compiling, it's possible that the size of qreal for moc
itself (host platform) is different from the size of qreal on the target
platform. Thus, we should not encode the metatype-id of qreal at moc
time. Instead, use QMetaType::QReal in the generated code so that the
the property flags are only derived at compile time.
We also need to support the pesky QT_COORD_TYPE. In this case, qreal can
be _any_ type (not just float or double), so we encode the property type
as 0 and have a special check in QMetaProperty::type() that resolves the
correct type at runtime.
Reviewed-by: Simon Hausmann
|
| |
| |
| |
| |
| |
| |
| |
| | |
So far, only operator% was working for concatenation in those circumnstances.
Now, defining QT_USE_FAST_OPERATOR_PLUS and QT_USE_FAST_CONCATENATION is
enough, so user code will work without any source changes.
Reviewed-by: joao
|
|\ \
| |/ |
|
| |
| |
| |
| | |
Reviewed-by: TrustMe
|
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| | |
QMotifStyle
Same fix as in e9a7e43031d7c1ee712e43be682c4e2c183759c4 but with motif
Reported by https://bugs.kde.org/show_bug.cgi?id=193911
Task-number: 255138
Reviewed-by: jbache
|
| |
| |
| |
| | |
Reviewed-by: TrustMe
|
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| | |
The blend functions assume the width / height of the images being
blended to be greater than 0. A width of 0 caused the first iteration of
a duff's device memcpy (QT_MEMCPY_USHORT) to be executed, thus blending
8 pixels instead of none.
BT: yes
Task-number: 255014
Reviewed-by: Trond
|
| |
| |
| |
| |
| |
| |
| |
| |
| | |
The BOM was created correctly, but half of the BOM was then overwritten
by the converted data afterwards.
Also made the autotest also do reverse encoding tests where possible.
Task-number: 255095
Reviewed-by: lars
|
| | |
|
| |
| |
| |
| | |
Reviewed-by: mauricek
|
| |
| |
| |
| | |
Reviewed-by: TrustMe
|
| | |
|
| |
| |
| |
| | |
Reviewed-by:TrustMe
|
| | |
|
| |
| |
| |
| | |
auto.pro added `qtransition' to SUBDIRS but there is no such directory.
|
| |
| |
| |
| |
| |
| |
| |
| |
| |
| | |
Yeesh.
The function worked for the common case of the argument being a plain
script object (obviously, otherwise this would have been discovered
sooner), but it would never pick the less expensive path when replacing
the QObject pointer of an existing proxy. And if you passed in a
QVariant proxy (now who would ever do something like that...?),
it would assert.
|
| |
| |
| |
| |
| | |
Just as with the QSignalTransition::signal property, this makes it
possible to use the function from language bindings (e.g. QtScript).
|
|\ \
| |/ |
|
| |
| |
| |
| | |
QFont() returns the app font, not an invalid font.
|
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| | |
invisible widgets could cause a crash.
Also, when there is a widget hierarchy A->B->C and A and C are marked
as visible but B is hidden, when the user gives focus explicitely to
C, we should remember that and respect it when B becomes visible.
Task-number: 254563
Reviewed-by: Thierry Bastian
|
|\ \
| |/
| |
| |
| |
| |
| |
| | |
Conflicts:
src/opengl/gl2paintengineex/qpaintengineex_opengl2.cpp
tests/auto/qgraphicswidget/tst_qgraphicswidget.cpp
tests/auto/selftests/expected_skip.txt
tests/auto/selftests/tst_selftests.cpp
|
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| | |
Cherry-pick of 548da9a5434d615456a7a6efda3380b7138c6000 and some
earlier changes predating public repo.
Note that this test is not failing if using Qt 4.5 only.
However, it fails if using Qt 4.5 selftests against Qt master testlib.
We want to be able to use master testlib to run 4.5 testcases,
and this change does no harm when using Qt 4.5 testlib, so backport
it to 4.5 for convenience.
Original change description follows:
A few tests use printf, which means they interfere with the XML test
logging. Blacklist them for the XML test.
Note that these tests happened to pass under the old test logger
implementation. That was because the test logger always printed XML
tags on a single line, and the printf calls contained no special XML
characters. The test logs generated were technically valid XML but
contained extraneous text.
|
| |
| |
| |
| |
| |
| |
| |
| |
| | |
We were adding two times in the QActionPrivate list the entry for
the current QGraphicsWidget if the action was existing before.
Task-number:KDE
Reviewed-by:bnilsen
BT:yes
|
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| | |
An optimization was made to the sorting of QFileDialog to sort only
the current root (meaning what the user see). This avoided slowness
when the model was big with lots of leafs. The problem here is
for the treeview, the root is always the same, we expands only
nodes. In that case, a recursive sorting is needed to ensure that
all expanded nodes are correctly sorted (and filtered). This will
be slower that's why i use an hidden flag in the d pointer to
deactivate the recursive sort for the QFileDialog.
Task-number:254701
Reviewed-by:olivier
BT:yes
|
| |
| |
| |
| |
| |
| |
| |
| |
| | |
If pixmaps were added through QIcon::addFile() with different sizes
than the sizes of the pixmaps themselves, streaming the icon in didn't
work properly.
Task-number: 254374
Reviewed-by: Kim
|
| |
| |
| |
| | |
Reviewed-by: Kim
|
| |
| |
| |
| |
| |
| |
| | |
The bounding rect computed in fixup() is one pixel too wide, causing
potential memory corruption by painting outside device boundaries.
Reviewed-by: Trond
|
| | |
|
| | |
|
| | |
|
|\ \ |
|
| |\ \ |
|
| | | | |
|
| |/ /
|/| |
| | |
| | | |
undefined.
|
| | |
| | |
| | |
| | |
| | |
| | |
| | | |
operator+() easier.
This adds a few explicit QString(...) casts around operator+()
based expressions to make them acceptable for QCOMPARE.
|
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | | |
QString objects from smaller chunks.
The QStringBuilder class:
QStringBuilder uses expression templates (using the '%' operator)
to postpone any actual concatenation until it is assigned to an
actual QString. At that time it knows the exact sizes of all chunks,
can compute the required space, allocates once a QString of
appriopriate size and then copies over the chunk data one-by-one.
In addition, QLatin1Literal is a drop-in replacement for QLatin1String
(which we can't change for compatibility reasons) that knows its
size, therefore saving a few cycles when computing the size of the
resulting string.
Some further saved cycles stem from inlining and reduced reference
counting logic (the QString created from a QStringBuilder has typically
ref count equal to 1, while QString::append() needs an extra test)
Minor changes to the existing QString class:
- Introduce QString constructor to create an uninitialized QString of a given size.
This particular constructor is used by QStringBuilder class.
- Introduce a QT_USE_FAST_CONCATENATION macro to disable the existing
overloads of operator+() and helps finding the places where they are used in code.
- Introduce QT_USE_FAST_OPERATOR_PLUS. This also disables the existing
overloads of operator+() and creates a new templated operator+() with
identical implementation of operator%(). This allows code that is compilable
QT_CAST_{TO,FROM}_ASCII to use QStringBuilder almost transparently. The only
case that is not covered is creating objects like QUrl that are implicitly
constructible from a QString from a QStringBuilder result. This needs to be
converted explicitly to a QString first, e.g. by using QUrl
url(QString(QLatin1String("http://") + hostName));
Reviewed-by: MariusSO
|
|\ \ \
| | |/
| |/|
| | |
| | | |
Conflicts:
tests/auto/qtreeview/tst_qtreeview.cpp
|
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | | |
This was already fix. But there was still a frame if there was a
stylesheet on the applicaiton.
The reason is that the frame's constructor call the style for some
hints. And later the combobox will query the style again for the frame
hint, before the view get polished.
The problem is that the StyleSheetStyle will fill the css cache with
wrong information on the first call.
This is not visible if there is no stylesheet as in the constructor, the
widget style is still the default application stylesheet if there is no
global applicaiton stylesheet.
Task-number: 254589
Reviewed-by: jbache
BT:
|
| | |
| | |
| | |
| | | |
Removed unused line and added task number to autotest.
|
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | | |
When setVisible() is called on a QGraphicsItem, if the parent of that
item was hidden, the child shouldn't be actually shown.
Task-number: 197802
Reviewed-by: leo
Reviewed-by: alexis
|
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | | |
The problem was that we don't clear the selection model if the previous
selection was valid.
Task-number:251341
Reviewed-by:jasplin
|