| Commit message (Collapse) | Author | Age | Files | Lines |
|\
| |
| |
| |
| |
| |
| |
| | |
kinetic-declarativeui
Conflicts:
mkspecs/features/qt.prf
src/corelib/global/qglobal.h
|
| |
| |
| |
| |
| |
| | |
Removed lots of places where we check for Tiger. Now we can assume it.
Reviewed-by: Morten Sørvig
|
| |\
| | |
| | |
| | |
| | |
| | |
| | |
| | | |
Conflicts:
src/3rdparty/webkit/VERSION
src/3rdparty/webkit/WebCore/ChangeLog
src/3rdparty/webkit/WebKit/qt/ChangeLog
tests/auto/qgraphicsitem/tst_qgraphicsitem.cpp
|
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | | |
In 4.4 QRectF handled flat rectangles in the same fashion as QRect does,
but that changed with Lars' and Jo's optmizations done in the falcon
branch. The difference is that the optimized version only checks whether
the width or height is 0, whereas in 4.4 both had to be 0 (isNull()) before
we bailed out.
This regression also introduced a regression in
QGraphicsItem::childrenBoundingRect().
Auto-test included.
Task-number: 254995
Reviewed-by: Lars
|
| | |
| | |
| | |
| | | |
Reviewed-by: Andreas
|
| | |
| | |
| | |
| | |
| | |
| | |
| | | |
build was failing because of a wrong include path set, and the test
requires zlib
Reviewed-by: Jesper Thomschütz
|
| |\ \
| | |/
| | |
| | |
| | | |
Conflicts:
src/sql/drivers/psql/qsql_psql.cpp
|
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | | |
object.
QWizard crashed when removing a page after deleting an object
that was already registered as a field for the page. This patch
prevents such a crash by doing the necessary cleanup immediately
when the object is deleted. QWizard::removePage() will then see a
consistent state in this case.
Reviewed-by: janarve
Task-number: 255350
|
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | | |
The problem was that we did an accelerated move, i.e. scrolled the
widget's contents in the backing store and repainted the old area. We
cannot do this trick when the widget has been invalidated (show(),
resize()). In this case the widget had never been painted, so we
basically scrolled the content of its parent and the widget itself
appeared as invisible.
Auto-test included.
Task-number: 255117
Reviewed-by: Paul
|
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | | |
The documentation is a bit ambiguous on what the expected behavior here
is, but the behavior was consistent across paint engines before 4.5.
QPaintEngineEx introduced inconsistencies in the raster and OpenGL paint
engines, so this patch reverts the behavior back to what it was in 4.4.
Task-number: 256549
Reviewed-by: Trond
|
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | | |
Having an implicit default error state in the graph which the user
has not added is unintuitive and ugly. Rather than have a default error
state, we stop execution of the machine and print an error message when
the machine has run-time errors. If a user wishes to prevent errors
from stopping the machine, you can set one or more error states
explicitly.
|
| | |
| | |
| | |
| | |
| | |
| | | |
Formatting of pointers in sprintf() is platform dependent. Use
QString::sprintf() instead to make sure warnings match the actual
warnings emitted.
|
| | |
| | |
| | |
| | |
| | | |
Mostly cleanup of dropping of tables to a consistent place.
Also enable itemmodel tests.
|
| | | |
|
| | |
| | |
| | |
| | |
| | | |
This change also moves the EGL support classes from QtOpenGL to QtGui
so they can be shared between OpenGL and OpenVG.
|
|\ \ \
| | | |
| | | |
| | | | |
git@scm.dev.nokia.troll.no:qt/kinetic into kinetic-declarativeui
|
| |\ \ \
| | |/ /
| | | |
| | | | |
kinetic-declarativeui
|
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | | |
Elements with display="none" should not be rendered. Modified and
autotest added by Kim.
Reviewed-by: Kim
|
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | | |
Autotest added by Kim.
Task-number: 204686
Reviewed-by: Kim
|
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | | |
In path, if 'moveto' is followed by multiple pairs of coordinates,
those pairs shall be treated as 'lineto'. Autotest added by Kim.
Reviewed-by: Kim
|
| | | |
| | | |
| | | |
| | | |
| | | |
| | | | |
Modified and autotest added by Kim.
Reviewed-by: Kim
|
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | | |
Polygon element should apply the fill rule which is specified in its
fill-rule attribute. Default fill rule is 'WindingFill' (nonzero).
Modified and autotest added by Kim.
Reviewed-by: Kim
|
| | | |
| | | |
| | | |
| | | | |
Make state->addTransition(foo, SIGNAL( bar( ) ), ...) work.
|
| | | | |
|
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | | |
Change 855aa89e0ba99f8a0f75d7b31930bab2cefb93f8 incorrectly changed
toNormalizedFillRect to use int truncation instead of qRound. This
fixes the autotest failure in tst_QPainter::drawRect2 as well.
Reviewed-by: Trond
|
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | | |
If no quotes around identifiers are provided by the programmer,
identifiers are treated identically to how the underlying engine
would behave. i.e. some engines uppercase the identifiers
others lowercase them. If the programmer wants case sensitivty
and/or use whitespaces they will need to quote their identifiers.
The previous (incorrect) behaviour always quoted the identifiers.
Originally committed to 4.5, but removed due to BC concerns, this
is a reintegration into mainline for inclusion in 4.6
Reviewed-by: Bill King
|
| | | |
| | | |
| | | |
| | | | |
All autotests pass now for all databases except DB2 (untested).
|
|\ \ \ \
| |/ / /
| | | |
| | | | |
git@scm.dev.nokia.troll.no:qt/kinetic into kinetic-declarativeui
|
| | | | |
|
|\ \ \ \
| |/ / /
| | | |
| | | | |
git@scm.dev.nokia.troll.no:qt/kinetic into kinetic-declarativeui
|
| |\ \ \
| | |/ /
| | | |
| | | |
| | | |
| | | |
| | | |
| | | | |
kinetic-declarativeui
Conflicts:
configure.exe
tools/qdoc3/htmlgenerator.cpp
|
| | |\ \
| | | |/
| | | |
| | | |
| | | |
| | | |
| | | | |
Conflicts:
configure.exe
tests/auto/qpainter/tst_qpainter.cpp
translations/qt_ru.ts
|
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | | |
QItemEditorCreator
The creators were not deleted i nthe destructor of QItemEditorFactory
and they could not be safely used for more than one type.
Task-number: 228255
Reviewed-by: jasplin
|
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | | |
This reverts a behavior change introduced with Qt 4.5.0 where
QInputDialog::getText() returned the line edit's text when the dialog
was rejected.
However, the behavior since Qt 4.0 has been to return a null QString
when the dialog is rejected.
Task-number: 256299
Reviewed-by: Andy Shaw
|
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | | |
Change from a relative to an absolute fuzzy compare as was the case
pre-4.4. With a relative fuzzy compare points that have an x or y
coordinate of 0 will never be merged with points that are very close to
0, for example (1e-15, 0).
Task-number: 251909
Reviewed-by: Trond
|
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | | |
Make sure not to use the broken QRect constructor, and do an early check
on whether the clip rect is empty in QRasterizer::rasterizeLine().
Task-number: 254105
Reviewed-by: Trond
|
| | | | |
|
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | | |
This could happen when the list of styles depending on the font is
different from the font you selected before. It then is not updated
and the style of the font returned by the QFontDialog is wrong.
Task-number: 256466
|
| | | |
| | | |
| | | |
| | | |
| | | | |
Ideally these should be investigated at some point. For now disable them
so that the test can be completed.
|
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | | |
An item without menu could stay highlighted even when the mouse left
the menu bar.
Task-number: 256322
Reviewed-by: alexis
|
| | | | |
|
| | | |
| | | |
| | | |
| | | | |
Explicit casts make aCC happy.
|
| | | |
| | | |
| | | |
| | | | |
Task-number: 256184
|
| | | | |
|
| | | |
| | | |
| | | |
| | | |
| | | |
| | | | |
If the engine was deleted, the agent will be 0, but we still
want to fall through rather than return immediately, so that
the other variables are reset correctly.
|
| | | | |
|
| | | | |
|
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | | |
The problem is that it was relying on button->isVisible whereas
it should rely on isHidden. isVisible returns false initially when the
whole widget is not yet shown.
I also added an autotest for it.
Task-number: 256331
|
| | | |
| | | |
| | | |
| | | |
| | | |
| | | | |
If the machine's initial state is nested, a set of states will
be entered, and we need to do the property assignments of all
of them.
|
| | | |
| | | |
| | | |
| | | |
| | | |
| | | | |
It's been requested by several users. Since we have
QAbstractState::{entered,exited}() signals, we should have this one
as well.
|