| Commit message (Collapse) | Author | Age | Files | Lines |
|---|
| |
|
|
|
|
|
|
| |
Details: Details: Make localtime a static function. This is needed for linking sqlite3.lib
into webkit and it generally makes sense for our build of sqlite using
the amalgamated build.
(cherry picked from commit 5e326c74239eecbd3e64df90ebbafaf51530d43d)
|
| |
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
| |
* Include <qconfig.h> and rely on Qt's QT_NO_THREAD
instdead of SQLite's THREADSAFE to toggle source code
releated to threading in SQLite.
* compilation for Windows CE 6
While for WinCE 5 localtime is declared but not defined
in the libraries, for CE 6 they are not even declared.
That usually makes sense but sqlite relies on it being
present in time.h. As sqlite defines their own localtime
for Windows CE, we "only" need to forward declare it
earlier.
Conflicts:
src/3rdparty/sqlite/sqlite3.c
|
| | |
|
| |\ |
|
| | |
| |
| |
| | |
Increasing the alignment does not seem to affect MBX.
|
| | |
| |
| |
| |
| |
| |
| |
| |
| |
| | |
When qmake was ran with -r over a subdirs project then it would lose the
error code if a later project succeeded.
This is a refix of the previous revert which has been confirmed to work
all over the place now.
Reviewed-by: Marius Storm-Olsen
|
| | |
| |
| |
| |
| |
| | |
Just the default font size will not work for this case. We set it to smaller one. Notice: we should make sure view->length() is different between view->setStretchLastSection(true) and view->setStretchLastSection(false).
RevBy: Aleksandar Babic
|
| | |
| |
| |
| |
| |
| |
| |
| | |
with a sample implementation for QAccessibleButton. Not implemented
for all widgets yet (API is preliminary).
Patch has been in the accessibility-fixes branch of qt-maemo for quite
a while now without complains, thus no reviewer.
|
| | |
| |
| |
| |
| | |
Patch has been tested thorougly in the accessibility-fixes branch
of the qt-maemo repository, thus no review
|
| | |
| |
| |
| |
| | |
The offending code is normally ifdef'ed out, so the bug did not manifest
itself before.
|
| | |
| |
| |
| |
| |
| |
| | |
This will result in a warning if the path entered doesn't exist,
which is the behavior of native applications.
Reviewed-by: Prasanth
|
| | |\ |
|
| | | |
| | |
| | |
| | | |
Reviewed-by: Joerg
|
| | | |
| | |
| | |
| | |
| | |
| | |
| | |
| | | |
Accounting for double resolution devices on Windows Mobile in the test
data sets (tst_qgraphicsview_2.cpp).
Skipped a test involving mouse tracking (tst_qgraphicsview.cpp).
Reviewed-by: Joerg
|
| | | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | | |
If we reparent a naive menu bar inside a widget that
has a menu bar from before, the old menu bar is lost.
This patch makes sure that we don't set the new
menu bar in this case, but let it remain as-is in
case the widget is reparanted out again later.
Rev-By: MortenS
|
| | | |
| | |
| | |
| | |
| | |
| | |
| | |
| | | |
softKeyActions QHash in QDialogButtonBoxPrivate was not kept properly
in sync with standardButtonHash, causing QFileDialog to crash upon
startup.
Reviewed-by: Sami Merila
|
| | | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | | |
Gives better performance in the raster paint engine.
For Symbian 9.3 onwards, this can also be used as the native pixmap
format. For 9.2, conversion is required.
Reviewed-by: Sami Merila
Reviewed-by: Jani Hautakangas
|
| | | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | | |
QS60Style disregards all selection behaviors for itemviews. This leads
to error when showing a highlighted selection rect; rect is only shown
for cell having focus.
Fixed by setting the highlight to all 'selected' cells.
Task-number: QT-693
Reviewed-by: Alessandro Portale
|
| | | | |
|
| | | |
| | |
| | |
| | |
| | | |
Task-number: QTBUG-4867
Reviewed-by: Aleksandar Sasha Babic
|
| | | | |
|
| | | |
| | |
| | |
| | |
| | |
| | | |
This will be handled differently (QTBUG-4751)
This reverts commit b12fb5861ce09539c04cd51db12a9bfbe32a4774.
|
| | | |\ |
|
| | | | |
| | | |
| | | |
| | | | |
sha1 of the fix: 2633931653757decd93dd3939c09f5e07203da1c
|
| | | | |
| | | |
| | | |
| | | |
| | | | |
Reviewed-by: thierry
Reviewed-by: pierre
|
| | | | |
| | | |
| | | |
| | | | |
Reviewed-by: alexis
|
| | | | | |
|
| | | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | | |
After this commit, when you modify the spacing of an anchor you are
effectively modifying the preferred size of the anchor, since all
anchors (except internal ones) have their minimumSizeHint to 0 and
maximumSizeHint to QWIDGETSIZE_MAX.
I also changed the sizeHintsFromItem to be more generic so that I could
use it for anchors. (Thus, it was renamed to "internalSizeHints"). It
now only takes care of setting the min/pref/exp/maxSize of AnchorData
based on the anchor/item size hint and their size policies.
As a consequence of all of this, setFixedSize changed behaviour and
became setPreferredSize (since setSpacing is basically setPreferredSize).
The implementation of that now only sets the prefSize.
The patch also has an unrelated fix for IgnoreFlag, where it will
(again) return the minimumSize for sizeHint(Qt::PreferredSize) instead
of the maximumSize. This was to be more consistent with
qgridlayoutengine.cpp. The docs are not very clear on this behaviour
unfortunately.
This API change has been discussed.
Reviewed-by: alexis
|
| | | | |\
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | | |
git://gitorious.org/~fleury/qt/fleury-openbossa-clone into 4.6
Conflicts:
src/gui/graphicsview/qgraphicsanchorlayout_p.cpp
src/gui/graphicsview/qgraphicsanchorlayout_p.h
tests/auto/qgraphicsanchorlayout/tst_qgraphicsanchorlayout.cpp
|
| | | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | | |
cases
Signed-off-by: Jesus Sanchez-Palencia <jesus.palencia@openbossa.org>
Reviewed-by: Eduardo M. Fleury <eduardo.fleury@openbossa.org>
|
| | | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | | |
Adding a benchmark to compare the use of three nested linear layouts
versus the use of a single anchor layout.
We also test two different anchor layout setups to achieve the
same visual result. In the first one we use the addCornerAnchors API
that, in the way it was used, adds reduntant anchors. The second uses
the basic addAnchor API to create only the essential anchors.
Currently the first setup is way slower than the second. That happens
because the redundant anchors create "zero-sized knots" in the graph,
that are not eaten by the simplification algorithm, thus requiring
the usage of the simplex solver.
Zero-sized knots are groups of three or more vertices that are linked
together by zero-sized anchors. In pratice, these vertices represent
the same place in the graph (remember, the distance between them is
zero), but to the simplification mechanism, they look like three
distinct ones.
Signed-off-by: Eduardo M. Fleury <eduardo.fleury@openbossa.org>
Reviewed-by: Caio Marcelo de Oliveira Filho <caio.oliveira@openbossa.org>
|
| | | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | | |
Some tests are expected to fail when run without simplification, ie. by
setting the environment var QT_ANCHORLAYOUT_NO_SIMPLIFICATION.
This commit adds QEXPECT_FAIL before those tests. In some cases
the failures are random therefore we must disable the test instead.
Signed-off-by: Eduardo M. Fleury <eduardo.fleury@openbossa.org>
Reviewed-by: Caio Marcelo de Oliveira Filho <caio.oliveira@openbossa.org>
|
| | | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | | |
Refactor the simplifyGraphIteration() function. The aim was to make it
more clear without changing too much the way it does stuff.
Before it collected a list of candidates and then filtered that into
sublists of same order, and after that removed the center edges from
the borders. It also reversed the list if the direction wasn't
forward, to pass it in forward order to simplifySequentialChunk()
helper function.
The refactored version
- take in account the order when building the candidates, this avoids
index manipulation;
- try to calculate 'beforeSequence' and 'afterSequence' as it builds the
candidates list;
- make simplifySequentialChunk() aware of directions, now it deals internally
with reversed direction sequences.
This commits also adds explanations to trickier parts of the code.
Signed-off-by: Caio Marcelo de Oliveira Filho <caio.oliveira@openbossa.org>
Reviewed-by: Artur Duque de Souza <artur.souza@openbossa.org>
Reviewed-by: Eduardo M. Fleury <eduardo.fleury@openbossa.org>
|
| | | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | | |
Create calculateTrunk() and calculateNonTrunk() methods, that
calculate sizes for anchors in different parts of the simplified graph
(using simplex when needed).
Also fixes a minor leak when the nontrunk part is non-feasible. The
old code left the loop leaving the contents of 'sizeHintConstraints'
not allocated.
Signed-off-by: Caio Marcelo de Oliveira Filho <caio.oliveira@openbossa.org>
Reviewed-by: Artur Duque de Souza <artur.souza@openbossa.org>
|
| | | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | | |
After calculations, update the size of all anchors in the simplified
graph. Those updates were happening locally after each calculation
(trunk and semifloats), however some anchors that were not involved in
simplex calculation were missing.
One concrete consequence of the previous behaviour is that semifloat
parts that were simplified into just one anchor, didn't have the chance
to set their sizeAt* values. One consequence of the new behaviour is
one more test passing.
Signed-off-by: Caio Marcelo de Oliveira Filho <caio.oliveira@openbossa.org>
Reviewed-by: Artur Duque de Souza <artur.souza@openbossa.org>
|
| | | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | | |
Change the functions solvePreferred() and solveExpanding() to take a
list of variables, so they don't need to calculate them based on the
list of constraints. That way, the trunk variables are calculated only
once.
This commit also reduce the scope of 'sizeHintConstraints' variable
instead of clearing and reusing it.
Signed-off-by: Caio Marcelo de Oliveira Filho <caio.oliveira@openbossa.org>
Reviewed-by: Artur Duque de Souza <artur.souza@openbossa.org>
|
| | | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | | |
This is one good way to track whether simplification is doing all its
job or not. However it can only track cases where the graph simplify
to only one anchor. For more complex cases the graph dumps are the way
to go.
Signed-off-by: Caio Marcelo de Oliveira Filho <caio.oliveira@openbossa.org>
Reviewed-by: Artur Duque de Souza <artur.souza@openbossa.org>
|
| | | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | | |
The graph dumper function take a name, and added debug code (that need
to be enabled manually) to generate dumps from the graph before and
after calculation. This is useful to debug simplification.
Signed-off-by: Caio Marcelo de Oliveira Filho <caio.oliveira@openbossa.org>
Reviewed-by: Artur Duque de Souza <artur.souza@openbossa.org>
|
| | | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | | |
After the addition of expanding SizePolicy, the distribution of sequential
anchors became wrong.
We must now account for three intervals of distribution instead of only two.
This commit also unifies the logic used by the sequential group anchor and
the edge interpolator.
Signed-off-by: Eduardo M. Fleury <eduardo.fleury@openbossa.org>
Reviewed-by: Caio Marcelo de Oliveira Filho <caio.oliveira@openbossa.org>
|
| | | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | | |
With four items anchored side by side, each of them being allowed
to grow to QWIDGETSIZE_MAX, we have a situation of fair distribution
because the layout itself can grow only to QWIDGETSIZE_MAX (and not
four times this amount).
This test identified an error on the expanding distribution logic.
Signed-off-by: Eduardo M. Fleury <eduardo.fleury@openbossa.org>
Reviewed-by: Caio Marcelo de Oliveira Filho <caio.oliveira@openbossa.org>
|
| | | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | | |
Currently we do not support negative-sized anchors in the graph,
instead we invert such anchors and make their value positive.
We consider changing this sometime in the future but until then,
spacing must be non-negative at all times.
Signed-off-by: Eduardo M. Fleury <eduardo.fleury@openbossa.org>
Reviewed-by: Caio Marcelo de Oliveira Filho <caio.oliveira@openbossa.org>
|
| | | | |\ \ |
|
| | | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | | |
Auto-test included. Will timeout on fail.
Reviewed-by: Alexis
|
| | | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | | |
A QPointer was set to point to a QWidget by one of its children, during its
deletion. This happens during the child deletion, and after the call to
QObject::clearGuards(), which means that the QPointer becomes a dangling one.
The fix ensures that qt_x11_enforce_cursor will not be called with a
being-deleted QWidget. The included auto-test doesn't test anything, except
that it doesn't crash.
Reviewed-by: Olivier
|
| | | | |/ /
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | | |
The problem was that lastCalculationUsedSimplex was only compiled in
debug mode. The autotests run in release, so it did not compile.
Reviewed-by: alexis
|
| | | | |\ \ |
|
| | | | | | |
| | | | | |
| | | | | |
| | | | | | |
+ stabilize the linear layout test
|
| | | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | | |
The updated rectangle coordinates didn't use the viewport offsets.
Reviewed-by: Olivier
Task-number: QTBUG-4819
|
| | | | | | | |
|
| | | | | | | |
|
