| Commit message (Collapse) | Author | Age | Files | Lines |
|---|
| |
|
|
|
|
| |
Matches the addMSecs existing functions in QTime and QDateTime.
Reviewed-by: Marius Storm-Olsen
|
| |
|
|
|
|
|
| |
This complements QDateTime::currentMsecsSinceEpoch.
Task-number: QTBUG-9017
Reviewed-by: Denis Dzyubenko
|
| |\
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| | |
4.7-integration
* '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1: (25 commits)
Fix compilation on WinCE and MinGW by memsetting the OVERLAPPED struct.
qdoc: Added <div> elements to some html output for class references.
Fix compile error on mingw.
MONILITY-645
Do not override alternate background color in Plastique
Fix QComboBox ignoring foreground role in some styles
Fix compilation on HP-UXi: _SC_MONOTONIC_CLOCK isn't defined
Fix compilation with Sun CC:
Ensure that we return QPair<long,long> in all cases.
Update PLATFORM(SPARC64) to CPU(SPARC64)
jui files are no c++ ...
scan some more file types by default
Support EtchDisabledText with spin box on Windows style
QNAM HTTP: Fix invoking a method when being destructed right now
Fixed a typo in the QDoubleValidotor doc.
Trivial fix to JavaScriptCore to fix building with MSVC 2010
Autotest: oops, fix oops: remove qguard from auto.pro
Autotests: oops, remove last traces of QGuard
Remove QGuard.
Unskip test that used to crash
...
|
| | |\
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | | |
4.7-integration
* '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1: (24 commits)
qdoc: Added <div> elements to some html output for class references.
Fix compile error on mingw.
MONILITY-645
Do not override alternate background color in Plastique
Fix QComboBox ignoring foreground role in some styles
Fix compilation on HP-UXi: _SC_MONOTONIC_CLOCK isn't defined
Fix compilation with Sun CC:
Ensure that we return QPair<long,long> in all cases.
Update PLATFORM(SPARC64) to CPU(SPARC64)
jui files are no c++ ...
scan some more file types by default
Support EtchDisabledText with spin box on Windows style
QNAM HTTP: Fix invoking a method when being destructed right now
Fixed a typo in the QDoubleValidotor doc.
Trivial fix to JavaScriptCore to fix building with MSVC 2010
Autotest: oops, fix oops: remove qguard from auto.pro
Autotests: oops, remove last traces of QGuard
Remove QGuard.
Unskip test that used to crash
QtScript: Add yet more missing API shims
...
|
| | | |\
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | | |
4.7-integration
* '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1: (23 commits)
Fix compile error on mingw.
MONILITY-645
Do not override alternate background color in Plastique
Fix QComboBox ignoring foreground role in some styles
Fix compilation on HP-UXi: _SC_MONOTONIC_CLOCK isn't defined
Fix compilation with Sun CC:
Ensure that we return QPair<long,long> in all cases.
Update PLATFORM(SPARC64) to CPU(SPARC64)
jui files are no c++ ...
scan some more file types by default
Support EtchDisabledText with spin box on Windows style
QNAM HTTP: Fix invoking a method when being destructed right now
Fixed a typo in the QDoubleValidotor doc.
Trivial fix to JavaScriptCore to fix building with MSVC 2010
Autotest: oops, fix oops: remove qguard from auto.pro
Autotests: oops, remove last traces of QGuard
Remove QGuard.
Unskip test that used to crash
QtScript: Add yet more missing API shims
QtScript: Make sure the old identifier table is restored
...
|
| | | | | |
|
| | | | | |
|
| | | | |
| | | |
| | | |
| | | | |
After updating JavaScriptCore for 4.7 it no longer crashes.
|
| | | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | | |
Add magic header '/* XPM */' and turn off wrapping of lines that broke
image readers. Add a command line option to activate line-wrapping
in case someone exclusively wants to use the extracted images for
embedding in code. Also do line-wrapping in case images are embedded
into the ui-file.
Note: The current versions of MSVC do not seem to have a limitation of
line lengths any more.
Task-number: QTBUG-9207
Reviewed-by: Jarek Kobus <jkobus@trolltech.com>
|
| |\ \ \ \
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | | |
into 4.7-integration
* 'qt-4.7-from-4.6' of scm.dev.nokia.troll.no:qt/qt-integration: (35 commits)
Fix a crash in QGtkStyle when theme not available
Exporting QFontDatabase::removeAllApplicationFonts()
Adding QFontDatabase::removeAllApplicationFonts()
Fixed crash in Phonon MMF backend during application shutdown
Updated WebKit from /home/shausman/src/webkit/trunk to qtwebkit/qtwebkit-4.6 ( e9151b11e974f0aa47fd40c225f88f35ced91496 )
Fixed bitfield-related crash on Symbian WINSCW
Compile with MSVC 2005 and 2003 when no platform SDK is used
Updated WebKit from /home/shausman/src/webkit/trunk to qtwebkit/qtwebkit-4.6 ( c39615d8e78f083b23f34ac24cf7d3a7ce765122 )
Updated WebKit from /home/shausman/src/webkit/trunk to qtwebkit/qtwebkit-4.6 ( bd724fb2f716336a8a4b54cd2edc96851a5a26a4 )
QS60Style: very tall QSpinBox's buttons hide lineEdit
Export QGLContextResource for use with Qt/3D
Use QSKIP rather than commenting a failure.
Refactor QDirectFBPixmap::fromImage slightly
QDirectFBPixmap can handle NoOpaqueDetection.
Reverts using composition mode when using DeviceCoordinateMode cache.
Fix linking error
Fix compile error on Symbian 9.1, caused in network/access.
QInputContextFactory::languages implementation for Symbian.
QS60Style cannot draw transparency to UI element border areas
Changed pkg_prerules to not use default_deployment for vendor ID
...
|
| | |\ \ \ \
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | | |
Conflicts:
src/s60installs/bwins/QtGuiu.def
src/s60installs/eabi/QtGuiu.def
|
| | | |\ \ \ \
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | | |
4.6-integration
* '4.6' of scm.dev.nokia.troll.no:qt/oslo-staging-2:
Use QSKIP rather than commenting a failure.
|
| | | | | | | |
| | | | | | |
| | | | | | |
| | | | | | | |
Reviewed-by:TrustMe
|
| | |\ \ \ \ \ \
| | |_|_|/ / /
| |/| | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | | |
into 4.7-integration
* 'qt-4.7-from-4.6' of scm.dev.nokia.troll.no:qt/qt-integration: (23 commits)
Refactor QDirectFBPixmap::fromImage slightly
QDirectFBPixmap can handle NoOpaqueDetection.
Reverts using composition mode when using DeviceCoordinateMode cache.
Fix linking error
Fix compile error on Symbian 9.1, caused in network/access.
QInputContextFactory::languages implementation for Symbian.
QS60Style cannot draw transparency to UI element border areas
Changed pkg_prerules to not use default_deployment for vendor ID
Enable armcc version specific compler options for Symbian
Fix another off-by-1 error in OpenVG image painting.
Fix OpenVG build on non-Symbian platforms.
QNAM HTTP: Symbian compile fix
tst_qnetworkreply: Fix side effect, add another test
QNAM HTTP: Fix crazy crash when exiting application
Correct documentation for ObjectReplacementCharacter and ReplacementCh.
Prevents a useless repaint with QGraphicsItem cache mode.
Fix for submenu placement for QMenus in Symbian.
Symbian event loop priority drop not used in Symbian^4
QMessageBox is smaller than native MessageBox
Doc: Fix links in the ActiveQt framework, and also link to the tools.
...
|
| | | |\ \ \ \ \
| | | | |_|/ /
| | | |/| | |
| | | | | | |
| | | | | | |
| | | | | | | |
Conflicts:
mkspecs/common/symbian/symbian.conf
src/3rdparty/webkit/WebCore/WebCore.pro
|
| | | |\ \ \ \ \
| | | | |/ / /
| | | |/| | /
| | | |_|_|/
| | |/| | |
| | | | | |
| | | | | | |
Conflicts:
mkspecs/common/symbian/symbian.conf
qmake/generators/symbian/symmake.cpp
src/3rdparty/webkit/WebCore/WebCore.pro
|
| | | | |\ \ \
| | | | |_|/
| | | |/| |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | | |
4.6-integration
* '4.6' of scm.dev.nokia.troll.no:qt/oslo-staging-1:
Fix compile error on Symbian 9.1, caused in network/access.
QNAM HTTP: Symbian compile fix
tst_qnetworkreply: Fix side effect, add another test
QNAM HTTP: Fix crazy crash when exiting application
|
| | | | | |\ \
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | | |
4.6-integration
* '4.6' of scm.dev.nokia.troll.no:qt/oslo-staging-1:
QNAM HTTP: Symbian compile fix
tst_qnetworkreply: Fix side effect, add another test
QNAM HTTP: Fix crazy crash when exiting application
|
| | | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | | |
Fix a test that had a side effect.
But actually do the side effect in the last test: Have a
QNetworkReply that is parented to the application so it gets
destructed after the QNetworkAccessManager.
Reviewed-by: gabi
|
| | | | |/ / /
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | | |
Going back to always blitting the newly painted areas to the cache (and
not blending it like before). To avoid painting artifacts when the item
is rotated and when it uses DeviceCoordinateMode cache mode, the entire
cache is always repainted in that case.
Task-number: QTBUG-7863
Reviewed-by: trustme
|
| | | | |/ /
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | | |
No repaint is triggered anymore when setting the cache mode to
DeviceCoordinateMode when already using that mode.
Also added an autotest for checking repaints when setting cache modes.
Task-number: QTBUG-9391
Reviewed-by: ahanssen
|
| | | | | | |
|
| |/ / / / |
|
| | | | |
| | | |
| | | |
| | | | |
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
|
| | | | |
|
| | | | |
|
| |\ \ \ |
|
| | | | | |
|
| | | | |
| | | |
| | | |
| | | |
| | | |
| | | | |
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
|
| | |/ / / |
|
| | | | | |
|
| | | | | |
|
| | | | | |
|
| | | | | |
|
| | | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | | |
is set as soon as XML data is downloaded, so there is no notification
when model is actually ready to be used).
This also fixes data() to not crash if it is called before the model
is ready.
Task-number: QTBUG-7835
|
| | | | | |
|
| |/ / / |
|
