| Commit message (Collapse) | Author | Age | Files | Lines |
|---|
| |\
| |
| |
| |
| |
| |
| |
| |
| |
| | |
Conflicts:
doc/src/modules.qdoc
mkspecs/common/symbian/symbian.conf
src/gui/graphicsview/qgraphicswidget.h
src/s60installs/bwins/QtGuiu.def
src/s60installs/eabi/QtGuiu.def
|
| | |\
| | |
| | |
| | |
| | | |
Conflicts:
src/3rdparty/phonon/ds9/iodevicereader.cpp
|
| | | |
| | |
| | |
| | | |
Task-number: QTBUG-9205
|
| | | |
| | |
| | |
| | | |
these events.
|
| | | | |
|
| | | | |
|
| | | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | | |
QDeclarativeSmoothedAnimation inherits from QDeclarativeNumberAnimation,
as a consequence SmoothedAnimation can be used inside Behaviors and
as PropertySourceValues, like any other animation. The old EaseFollow
properties changed to comply with the other declarative animations
('source' changed to 'to'), so now 'to' changes are not automatically
'followed' anymore.
You can achieve the following behavior by putting a SmoothedAnimation
inside a Behavior of a property that is bound to another, as the
following example:
If you want to follow an hypothetical rect1, you should do now:
Rectangle {
color: "green"
width: 60; height: 60;
x: rect1.x - 5; y: rect1.y - 5;
Behavior on x { SmoothedAnimation { velocity: 200 } }
Behavior on y { SmoothedAnimation { velocity: 200 } }
}
SmoothedAnimation also supports animating multiple target(s)/property(ies)
in the transition case. When a QDeclarativeSmoothedAnimation is restarted,
it will match the QDeclarativeProperty which were being animated and
transfer the corresponding track velocity to the new starting animations.
QSmoothedAnimation is an uncontrolled animation, duration == -1.
The duration is set as -1 to avoid consecutive animation state changes
stop()/start(). This is particularly useful when using QSmoothAnimation
to 'follow' another property, which is also being animated (change the
'to' property every tick).
Reviewed-by: Michael Brasser
|
| | |\ \ |
|
| | | | |
| | | |
| | | |
| | | |
| | | |
| | | | |
Temporary fix until configure.exe can be re-compiled.
Reviewed-By: TrustMe
|
| | |/ /
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | | |
Avoid taking fast path in drawText() since this is optimized and does
not draw text completely accurate on a floating point font engine.
Rather we use the slightly slower but more accurate drawText() which
takes a rectangle so that the results are identical to the ones
produced by drawStaticText().
Reviewed-by: TrustMe
|
| | | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | | |
The current formula for isLeapYear() assumes that years -4, -8, etc are
leap years in the Julian Calendar. This is not the case, leap years in
fact fall in -1, -5, -9, etc as there is no year 0 in the Julian
Calendar (count back 4 years from 4AD to confirm). The
julianDayFromDate() and getDateFromJulianDay() functions correctly
calculate this, but isValid() uses isLeapYear() and so causes setDate()
to incorrectly reject valid dates.
Sample test code to round-trip a jd to ymd and back to jd:
QDate testDate;
QDate loopDate = QDate::fromJulianDay(1);
while ( loopDate.toJulianDay() <= 5373484 ) { // <= 9999-12-31
testDate.setDate( loopDate.year(),
loopDate.month(),
loopDate.day() );
if ( !testDate.isValid() || loopDate != testDate ) {
qDebug() << "Round Trip failed : " <<
loopDate.toJulianDay() << " = " <<
loopDate.year() << loopDate.month() <<
loopDate.day() << " = " <<
testDate.toJulianDay();
}
loopDate.addDays(1);
}
Before the fix, 29 Feb 1 BC (year = -1) and all other BC leap days
returned by year() month() day() would result in setDate() failing.
After the fix the round trip works fine.
Merge-request: 2282
Reviewed-by: Olivier Goffart <ogoffart@trolltech.com>
|
| | | |
| | |
| | |
| | | |
Relates to QT-2627
|
| | |\ \
| | |/
| |/|
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | | |
4.7-integration
* '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-2: (47 commits)
QScript: More missing APIShim
QScriptEngine: Fix reentrency involving creation and desctructions of QScriptEngines
Work-around Symbian 10.1's broken egl.h
Add some #warnings to debug Symbian EGL build failure
Don't detect EGLImage presence by testing function pointers
Implement proper QStaticText support in QPaintBuffer
Make QStaticText layout lazy
Change QStaticText::setMaximumSize() to setTextWidth()
Respect QPainter::pen() in QPainter::drawStaticText()
QVarLenghtArray: add some API to be consistant to QVector
Don't try to resolve EGLImage function pointers if they are defined
Change ORs to ANDs when checking EGLImage extension defines
Protect EGLImage function definitions in #ifdef
Fix a bug in greek shaping causing infinite loops
Define QT_NO_EGL in configure.exe
improve mingw 64 bit support
Fix build on Windows
Round instead of ceil font metrics when ForceIntegerMetrics is enabled
cetest: remove source file duplicates from cetest.pro
Remove EGLImage create/destroy resolving from VG pixmap data
...
|
| | | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | | |
QScriptEngines
the currentIdentifierTable table, which is a static thread local variable, could be corrupted.
The main change is to fix the QScriptEngine constructor not to alter the currentIdentifierTable
This showed a lot of cases where APIShim guards where missings.
The problem was seen with creator, related to QTBUG-9426
Reviewed-by: Jedrzej Nowacki
|
| | | |\ |
|
| | | | |
| | | |
| | | |
| | | |
| | | |
| | | | |
That way it is easier to have QVarLenghtArray as a drop-in replacement for QVector
Reviewed-by: Joao
|
| | | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | | |
Update harfbuzz to 33b9cde6a08293d26047734e046c6677a2959adb
Reviewed-By: TrustMe
AutoTest: qtextscriptengine
Task-number: QTBUG-391
|
| | | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | | |
Non expected paint events and screen size on pulse_qws/linux-x86-g++
seem to be the reason the auto-test fails.
Reviewed-by: jeremy
|
| | | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | | |
Regression since b881d8fb99972f1bd04ab4c84843cc8d43ddbeed
Task-number: QTBUG-9354
Reviewed-by: Kent Hansen
|
| | | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | | |
'const' was not removed from templated class
This even fixes compilation errors if using const return templated types
We can change the normalized signature in Qt 4.7 as it has already changed
and we have code to check that if moc revision < 5 it will
renormalize all the symbols
cf commit b881d8fb99972f1bd04ab4c84843cc8d43ddbeed
Task-number: QTBUG-7421
Reviewed-by: Brad
Reviewed-by: Kent Hansen
|
| | | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | | |
To avoid the unnecessary overhead of doing the text layout every time
a part of the QStaticText object is changed, we mark it as invalid
instead and do the layout when we have to. This means an overhead on
the first paint event for most users. The overhead can be avoided by
using the QStaticText::prepare() function and will probably not be
noticable anyway, since it's a one-time thing.
Task-number: QTBUG-9030
Reviewed-by: Gunnar
|
| | | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | | |
To avoid having to precalculate the height of the laid out text, we
now only supply a maximum text width to QStaticText. The only usage of
the maximum height would be to clip the results, and clipping should be
set separately from the QStaticText call, since this has no impact on
the layout of the glyphs. The tests have been updated to reflect the
change in logic.
We also need a consistent way of specifying the position of the text.
Before, the position meant "baseline position" for unbroken text and
"top left position" for text with a specified layout width. We want
to be consistent, and since baseline position makes no sense for
multiline text, we standardize on top left position.
Task-number: QTBUG-9029
Reviewed-by: Gunnar
|
| | | |/
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | | |
QStaticText needs to support changing the pen on the painter to support
rich text, but it should not override the pen unless it has been
explicitly set in the rich text. We do this by marking the pen as dirty
in updateState() when we record the text items.
Task-number: QTBUG-8908
Reviewed-by: Gunnar
|
| | | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | | |
Drawing a string as plain text and rich text should have identical
results unless special formatting information is added in the html.
This means we should not have any implicit margin on the QTextDocument
used to paint the text, and we should make up for the fact that
the drawStaticText() call currently takes the position of the baseline
and QTextDocument::drawContents() takes the top-left corner.
Reviewed-by: Gunnar
|
| | | |\
| | | |
| | | |
| | | |
| | | |
| | | | |
Conflicts:
tools/qdoc3/generator.cpp
tools/qdoc3/node.cpp
|
| | | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | | |
When changing transformation properties (i.e., setRotation(),
setScale(), setTransformOriginPoint()), itemChange() is now called to
allow notification and change of the values. The flag
ItemSendsGeometryChanges needs to be set to enable this.
Autotest included.
Task-number: QTBUG-8112
Reviewed-by: alexis
|
| | | |\ \
| | | | |
| | | | |
| | | | |
| | | | | |
Conflicts:
tests/auto/declarative/qdeclarativedom/data/importlib/sublib/qmldir
|
| | | | | | |
|
| | | | |\ \
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | | |
4.7-integration
* '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-2:
Add QFont::ForceIntegerMetrics style strategy flag
Auto test for commit 4a4458d1cf5ec7885c6f63f739b7ee80c70ad211
|
| | | | | |\ \
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | | |
4.7-integration
* '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-2:
Add QFont::ForceIntegerMetrics style strategy flag
Auto test for commit 4a4458d1cf5ec7885c6f63f739b7ee80c70ad211
|
| | | | |_|/ /
| | |/| | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | | |
Since the Mac font engine has been fixed to support fractional metrics,
we can no longer expect qRound(A + B) to be equal to qRound(A) +
qRound(B). The documentation states that height = ascent + descent + 1.
To honor this contract, we need to rewrite the implementation of
height() to round each metric separately. Same with lineSpacing.
The bearingIncludedInBoundingrect() test was wrong. We can guarantee
that the italic text is not more narrow than the normal text, but we
cannot guarantee that they are never the same width.
Reviewed-by: Olivier
|
| | | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | | |
Reviewed-by: Trust me
Task-number: QTBUG-9216
|
| | | | | | | |
|
| | | | | | | |
|
| | |\ \ \ \ \ |
|
| | | | | | | | |
|
| | | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | | |
Also add Flow tests.
Task-number: QTBUG-9421
|
| | |/ / / / / |
|
| | | | | | |
| | | | | |
| | | | | |
| | | | | | |
"property var a" works just as well
|
| | | | | | |
| | | | | |
| | | | | |
| | | | | | |
Task-number: QTBUG-9439
|
| | |\ \ \ \ \ |
|
| | | |\ \ \ \ \ |
|
| | | | | | | | | |
|
| | | | | | | | |
| | | | | | | |
| | | | | | | |
| | | | | | | |
| | | | | | | |
| | | | | | | | |
changed.
Task-number: QTBUG-9386
|
| | | | | | | | | |
|
| | |\ \ \ \ \ \ \
| | | |/ / / / /
| | |/| | | | |
| | | | | | | |
| | | | | | | |
| | | | | | | |
| | | | | | | |
| | | | | | | |
| | | | | | | |
| | | | | | | |
| | | | | | | |
| | | | | | | |
| | | | | | | | |
Conflicts:
doc/src/declarative/examples.qdoc
doc/src/declarative/focus.qdoc
doc/src/declarative/modules.qdoc
doc/src/declarative/network.qdoc
doc/src/declarative/qdeclarativedebugging.qdoc
doc/src/declarative/qdeclarativei18n.qdoc
doc/src/declarative/qmlruntime.qdoc
doc/src/declarative/tutorial.qdoc
tests/auto/declarative/qdeclarativeimage/tst_qdeclarativeimage.cpp
|
| | | |/ / / / / |
|
| | | | | | | | |
|
| | | | | | | | |
|
| | | | | | | | |
|
