| Commit message (Collapse) | Author | Age | Files | Lines |
|\
| |
| |
| |
| |
| |
| |
| | |
Conflicts:
configure.exe
src/gui/math3d/qmatrix4x4.cpp
src/gui/math3d/qmatrix4x4.h
tools/qdoc3/htmlgenerator.cpp
|
| |
| |
| |
| | |
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
|
| | | |
|
| | | |
|
| |\ \ |
|
| | | | |
|
|\ \ \ \
| | |/ /
| |/| |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | | |
kinetic-declarativeui
Conflicts:
mkspecs/features/qt.prf
src/corelib/animation/qanimationgroup.cpp
src/corelib/animation/qparallelanimationgroup.cpp
src/corelib/animation/qpauseanimation.cpp
src/corelib/animation/qpropertyanimation.cpp
src/corelib/animation/qsequentialanimationgroup.cpp
src/corelib/kernel/kernel.pri
src/corelib/kernel/qvariant_p.h
src/corelib/tools/qeasingcurve.cpp
src/gui/graphicsview/qgraphicsitem.cpp
src/opengl/opengl.pro
src/opengl/qgl_x11egl.cpp
tests/auto/auto.pro
|
| |\ \ \
| | | |/
| | |/|
| | | |
| | | | |
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
|
| | | |
| | | |
| | | |
| | | |
| | | | |
Note that two digit years are always in the year 19xx
This is excepted for compatibility reason as discussed with Peter
|
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | | |
the model initially
This was caused by two different bug:
- In the QSortFilterProxyModel, we need to re-sort when setting the
source model change the sorting column (happen when setting a model
initially)
- In the treeview, we need to activate the sorting even if there is no
column yet (because the initial model is empty
Task-number: 254234
Reviewed-by: Thierry
BT:
|
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | | |
DESTDIR=./ and using Windows, nmake and shadow builds.
qmake would canonicalize the DESTDIR of "./" to "". Then it would check
if the original DESTDIR ended with "/", and if so, append it to the new
DESTDIR, resulting in a DESTDIR of "/" - the root of the current drive.
Don't do that.
This bug doesn't occur with in-source builds because qmake detects that
the source and build directories are the same directory and replaces
the DESTDIR of "./" with "" before it reaches the buggy code.
Autotest: included
Reviewed-by: Lincoln Ramsay
|
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | | |
Previously, two images with indexed colors were not equal if their
color tables were not the same. The image are not compared by
the value of the pixels
Reviewed-by: Samuel
|
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | | |
It is often desirable, when doing connection, to ensure that the same
connection is only made once. This can be done with the
Qt::UniqueConnection 'flag'
Also documented the order the slot are called
Reviewed-by: Brad
|
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | | |
If we don't remove the pixmap from QCache first then the key is invalid
and the removal failed
Reviewed-by: sroedal
|
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | | |
the same type as the property
For example, if you set a start value of 0 (integer) for a qreal
animation, it would not work.
Reviewed-by: janarve
|
| | | |
| | | |
| | | |
| | | |
| | | | |
The previous fix fails on msvc-2005, since QString::setNum()
does not handle rounding of numbers such as 0.015625 consistently.
|
| |\ \ \
| | |/ /
| | | |
| | | |
| | | | |
Conflicts:
src/corelib/kernel/qsharedmemory_unix.cpp
|
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | | |
newline
Do the same special case as for QTextEdit
(yes, this is a pitty that we have special cases like that
Reviewed-by: Thierry
Task-number: 252532
|
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | | |
Although QTemporaryFile hides QFile::open(OpenMode), this function is
still available when accessing instance methods through the base class.
Unconditionally setting ReadWrite allows the temporary file to be
re-opened with different flags.
Task-number: 248223
Reviewed-by: Thiago
|
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | | |
Note: this showed even if the file descriptor was kept open.
Reviewed-by: Peter Hartmann
Reviewed-by: Thiago
|
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | | |
When copying a resource file to the native file system the (read-only)
permissions also get copied. On Windows platforms, this was preventing a
test file from being deleted.
Reviewed-by: Peter Hartmann
Reviewed-by: Thiago
|
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | | |
Also added check in test case for rename fallback.
Task-number: 165920
Reviewed-by: Thiago
|
| | | |
| | | |
| | | |
| | | | |
Trying to get coverage up to 100%
|
| | | | |
|
| | | | |
|
| | | |
| | | |
| | | |
| | | |
| | | |
| | | | |
When the signal or senderObject is changed while the state is active,
the transition needs to be unregistered _before_ either property is
changed, only _then_ can it be re-registered.
|
| | | |
| | | |
| | | |
| | | |
| | | |
| | | | |
When the eventType or eventObject is changed while the state is active,
the transition needs to be unregistered _before_ either property is
changed, only _then_ can it be re-registered.
|
| | | | |
|
| | | | |
|
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | | |
Easing curve autotests was converting the easing(qreal) to int before,
but this is a very rough comparison and was failing due to different
conversions to int, so now we do a qFuzzyCompare.
Reviewed-by: Thierry
|
| |\ \ \
| | |/ / |
|
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | | |
This test verifies that the network test server is behaving as
expected. I think I caught all the services we need testing in the
server, but there's still some work to be done:
1) verify that the FTP files are there where they're supposed to be
2) verify that FTP writable areas are writable
3) verify that the HTTP server has the correct files too
4) verify that the HTTP server requests credentials for the protected area
5) attempt to do NTLM authentication to verify the password (probably
can't be done with netChat)
6) add Windows SMB tests (//qt-test-server/etc.)
7) add SQL tests (connecting to the SQL server ports)
It would be good as well if we could not use QtNetwork. If you break
QtNetwork, this test breaks too, so we don't know where the fault
is. However, rewriting networking code will add another source of bugs
(same for the NTLM authentication).
Reviewed-By: João Abecasis
|
| |\ \ \ |
|
| | |\ \ \
| | | | | |
| | | | | |
| | | | | | |
into kinetic-animations
|