| Commit message (Collapse) | Author | Age | Files | Lines |
|\
| |
| |
| |
| |
| |
| | |
Conflicts:
configure.exe
src/corelib/io/qfsfileengine.cpp
tests/auto/qfile/tst_qfile.cpp
|
| |
| |
| |
| | |
... was breaking symbian-abld build.
|
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| | |
After the refactoring to src/tools/tools.pro the dependencies for IDC
and UIC3 ended up being incorrect, due to the eval rules later in that
file. This patch adds IDC and UIC3 to SRC_SUBDIRS after Qt3Support, and
before ActiveQt, so the dependencies remain correct as before the
refactoring. The added condition of src/tools/tools.pro ensures that we
add the tools to the Makefile in src/tools, should we decide to generate
it, and compile from there.
Reviewed-by: Jason McDonald
|
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| | |
This was a serious performance issue on Symbian and not necessarily
optimal on other platforms. For the time being, we'll allow the OS to
read/write as much as it can.
Otherwise cleaned up the code, adding checks for invalid len arguments.
Task-number: QT-2347
Reviewed-by: Peter Hartmann
|
| |
| |
| |
| |
| |
| |
| |
| | |
To test not only native, but fd and FILE* backends as well. Moved
expensive generation of large block into a separate function that caches
the result.
Reviewed-by: Peter Hartmann
|
| |
| |
| |
| |
| |
| |
| |
| |
| | |
Configure.exe would simply initiate a build for each of the tools in
order. However, this would break certain distributed build systems,
since they would return right away after initiating the make. Thus,
sometimes moc et al. would try to link before bootstrap lib was built.
Reviewed-by: Jason McDonald
|
| |
| |
| |
| |
| |
| |
| |
| |
| |
| | |
patch by Warwick Allison. On cleanup in QHostInfoAgent, we were waiting
forever for the thread to terminate, which did not always succeed due to
a Linux kernel bug. Now, we just wait for some time and then return
anyway.
Reviewed-by: Marius Storm-Olsen
Task-number: QTBUG-5296
|
| |
| |
| |
| |
| |
| | |
... to make sure bytes are availabe to read
Reviewed-by: Aleksandar Sasha Babic
|
| |
| |
| |
| |
| |
| |
| |
| | |
Move the performance tests from tests/auto/qnetworkreply to
tests/benchmarks/qnetworkreply, because they belong there and they were
crashing from time to time.
Reviewed-by: Markus Goetz
|
| |
| |
| |
| |
| | |
Reviewed-by: Thiago
Reviewed-by: Jason McDonald
|
| | |
|
| |
| |
| |
| | |
Reviewed-by: TrustMe
|
| | |
|
|\ \ |
|
| | |
| | |
| | |
| | |
| | |
| | | |
Declarative tripped these (crashes).
Reviewed-by:Aaron Kennedy
|
| | | |
|
|/ / |
|
|\ \
| | |
| | |
| | |
| | | |
Conflicts:
dist/changes-4.6.0
|
| | | |
|
| | | |
|
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | | |
Was reproducable with the example in
<QTDIR>\examples\dialogs\trivialwizard
You could not push the navigation buttons using the stylus.
Task-number: QTBUG-3613
Reviewed-by: thartman
|
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | | |
The old button sizes were just to big. For example the trivialwizard
example had a minimal width that was much too wide for the screen.
Task-number: QTBUG-3613
Reviewed-by: thartman
|
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | | |
Unguarded use of QList::first() leads to Q_ASSERT() if the list is empty
Add support for a "-d" option to project file print parser debugging
Do not make use of QMAKESPEC variables in .qmake.cache instead
determine the current default if mkspec was not passed to cetest
Task-number: QTBUG-5490
Reviewed-by: Lincoln Ramsay
Joerg Bornemann
|
| | |
| | |
| | |
| | | |
Reviewed-by: Maurice
|
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | | |
Correct typing error "azy" -> "az"
Ensure that the example code returns indicated values.
Task-number: QTBUG-5571
Reviewed-by: Peter Yard
|
| | | |
|
| | |
| | |
| | |
| | |
| | |
| | | |
Describe 4.6 changes by Sarah Smith
Reviewed-by: TrustMe
|
|\ \ \ |
|
| | | |
| | | |
| | | |
| | | |
| | | |
| | | | |
Using operator[] can cause a deep copy if the container is not const.
Some of the containers were const, but I changed all of them to use at() since
its more Qt-style.
|
| |\ \ \ |
|
| | |\ \ \
| | | | | |
| | | | | |
| | | | | | |
git://gitorious.org/~cmarcelo/qt/cmarcelos-clone into cmarcelo-vertexsimplification
|
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | | |
Not all of the interpolation functions needed the orientation information,
and the one that needs can look at the orientation of the anchor in the
parameter. This simplified a little bit the function calls.
Signed-off-by: Caio Marcelo de Oliveira Filho <caio.oliveira@openbossa.org>
|
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | | |
Some vertices are connected by anchors with size 0, which means that
in practice, they represent the same point when positioning items,
i.e. their distance value is the same. In those cases, we can merge the two
anchors in one, that's what vertex simplification do.
The algorithm is walking in the graph, merging vertices in pairs (this could be enhanced to allow groups with arbitrary number of children vertices)
The vertex simplification stage happens before the anchor
simplification, so it'll make less passes. Also, in some situations of
redudant anchors it will allow more anchors to be simplified.
This commit creates a new type of AnchorVertex, add the algorithm
for vertex simplification and restoration, make sure that distribution also
works with simplified vertices.
Consequences:
- the assert after creating a sequence might not be true anymore, it
was a structural assumption that vertex simplification may destroy;
- we assumed that a center anchor could appear only in the beginning
or end of the candidates, because the "center vertex" always would
have 3 adjacents. A mix of parallel+center and vertex
simplification break that assumption.
The commit deal with those consequences.
We still have one limitation: vertex simplification needs to restore
the graph in every invalidation (which might be caused by some child's
updateGeometyry()), since a change in the sizeHint might cause a new
anchor to have size 0 or a 0-sized anchor to have a different size. In
the future we can track the 0 sized anchors and only
restore/re-simplify when the set changes.
Signed-off-by: Caio Marcelo de Oliveira Filho <caio.oliveira@openbossa.org>
Reviewed-by: Eduardo M. Fleury <eduardo.fleury@openbossa.org>
|
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | | |
Adds a simple test to check whether redundant anchors avoid
simplification to happen. In this case, the use of addCornerAnchors
generate redundant anchors.
Signed-off-by: Caio Marcelo de Oliveira Filho <caio.oliveira@openbossa.org>
Reviewed-by: Eduardo M. Fleury <eduardo.fleury@openbossa.org>
|
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | | |
This commit make possible to parallelize anchors that are center
anchors, i.e. that have extra constraints (stored in
itemCenterConstraints).
This is trivial to support since the parallel anchor will have the same
size as its children, so it can just "take the place" of its children in
the constraints. Restore function was added as well.
To manipulate internal structures, relevant static functions were
promoted to methods.
Signed-off-by: Caio Marcelo de Oliveira Filho <caio.oliveira@openbossa.org>
Reviewed-by: Eduardo M. Fleury <eduardo.fleury@openbossa.org>
|
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | | |
The restore algorithm had a leak, so we did not delete all the sequences
and parallel anchors that were not part of the simplified graph, i.e.
that were nested inside other anchors.
This commit fix the leak and clean the restore function a little bit, so
the recursive function is called even for Normal anchors (which are
dealt accordingly). Note that the before/after information is exactly the
->from/->to information available in the anchor being looked on.
Also added an assertion to document the fact that at this point
(restoring anchor simplification), one of the two anchors inside a parallel
anchor must be a sequence. The algorithm depends on that because you
can't have two anchors with the same start and end points.
Signed-off-by: Caio Marcelo de Oliveira Filho <caio.oliveira@openbossa.org>
Reviewed-by: Eduardo M. Fleury <eduardo.fleury@openbossa.org>
|
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | | |
Some tests were still disabled because were not supported somewhere
in the past.
Signed-off-by: Eduardo M. Fleury <eduardo.fleury@openbossa.org>
Reviewed-by: Caio Marcelo de Oliveira Filho <caio.oliveira@openbossa.org>
|
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | | |
We were not handling the case where a parallel anchor is created
to simplify a central anchor. Unfortunately no tests had shown
that case yet.
Signed-off-by: Eduardo M. Fleury <eduardo.fleury@openbossa.org>
Reviewed-by: Caio Marcelo de Oliveira Filho <caio.oliveira@openbossa.org>
|
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | | |
Simplify the code of interpolateSequentialAnchor to use the distance
values of the sequential anchor itself as base for the children
distances. So the 'base' parameter was removed.
This also allowed out-of-order parallel anchors to be interpolated, and
the 'base' parameter also to be removed from interpolateParallelAnchor.
Signed-off-by: Eduardo M. Fleury <eduardo.fleury@openbossa.org>
Reviewed-by: Caio Marcelo de Oliveira Filho <caio.oliveira@openbossa.org>
|
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | | |
Now parallel anchors account for the fact they may be composed of
anchors with different directions. We arbitrarily set the direction
of the parallel anchor to be the same direction as the first child.
The methods refreshSizeHints and updateChildren were updated to
support this situation.
Signed-off-by: Eduardo M. Fleury <eduardo.fleury@openbossa.org>
Reviewed-by: Caio Marcelo de Oliveira Filho <caio.oliveira@openbossa.org>
|
| |/ / / /
| | | | |
| | | | |
| | | | | |
course!
|
| |\ \ \ \
| | | | | |
| | | | | |
| | | | | | |
morpheuz-fixes
|
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | | |
The widget has sizePolicy as a property and declaring that properly
helps scripting. Just as it was done with min/pref/max sizes.
Signed-off-by: Artur Duque de Souza <artur.souza@openbossa.org>
|
|\ \ \ \ \ \ |
|
| | | | | | | |
|
| |/ / / / /
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | | |
Saw a couple of sporadic failures on Windows platforms. Debug output
should help find what's happening.
Once the fillFileSparsely test fails, there's no point in trying to read
what we failed to write so maximum tested size is reset on a failed
write.
Reviewed-by: Markus Goetz
|
| |\ \ \ \ \
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | | |
Conflicts:
dist/changes-4.6.0
|
| | |\ \ \ \ \ |
|
| | | |\ \ \ \ \ |
|
| | | | | | | | |
| | | | | | | | |
| | | | | | | | |
| | | | | | | | | |
Reviewed-by: paul
|