| Commit message (Collapse) | Author | Age | Files | Lines |
|---|
| |\
| |
| |
| |
| |
| |
| | |
Conflicts:
src/gui/kernel/qapplication_win.cpp
src/gui/kernel/qwidget.cpp
src/gui/kernel/qwidget_p.h
|
| | |
| |
| |
| |
| |
| |
| |
| |
| | |
There were cases where the QGLWidget would not be fully
updated on screen on Windows Vista and Windows 7 with Aero
disabled.
Task-number: QTBUG-7865
Reviewed-by: Prasanth
|
| | |
| |
| |
| |
| |
| |
| |
| | |
Never ever create global cache objects that deletes QPixmaps when
destructed!
Task-number: QTBUG-8046
Reviewed-by: Friedemann Kleint
|
| | |
| |
| |
| |
| |
| |
| |
| | |
Since 6c1388ee5a3c4796d hidden items are not taken in account when
counting the scrollbar position, and so the vector may be smaller.
Reviewed-by: Gabriel
Task-number: QTBUG-7929
|
| | |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| | |
The problem was that when an item had a QGraphicsEffect on itself and
that item was outside of the sceneRect, the cached pixmap of the item
was just an empty pixmap (when using DeviceCoordinates mode). Therefore
the effect filter was trying to paint into an unformatted and empty
image. Now, paint() for all pixmap filters just return immediatly when
the pixmap is empty.
Task-number: QTBUG-5358
Reviewed-by: sroedal
|
| | |
| |
| |
| |
| |
| |
| | |
This modification is needed to allow performance optimisations
necessary for QML.
Reviewed-by: Warwick Allison
|
| |\ \
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | | |
4.6-integration
* '4.6' of scm.dev.nokia.troll.no:qt/oslo-staging-2:
Make generate uid3 (symbian) work on 64 bit host platform.
Updated the docs for QPainter::begin/endNativePainting()
Compile fix for network benchmarks.
Add a pixmap modification hook to blur pixmap filter cache
Delete benchmark examples (qtestlib-simple and qtwidgets).
Restructure tests/benchmarks directory.
Fixed QImagReader::setAutoDetectImageFormat() to work with plugins.
QLineEdit: regression: read-only line edits would eat shortcuts.
QGraphicsItem: Do not crash at exit if there is static QGraphicsItem.
Make QTextCodec reentrant.
|
| | | |
| | |
| | |
| | |
| | | |
Task-number: QTBUG-7661
Reviewed-by: Kim
|
| | | |
| | |
| | |
| | |
| | |
| | |
| | | |
We probably want to kick out filtered pixmaps from the cache when the
source pixmap is modified as well as just destroyed.
Reviewed-By: Samuel
|
| | | |
| | |
| | |
| | |
| | |
| | |
| | |
| | | |
Only the compiled in formats where checked when
setAutoDetectImageFormat(false) was set on a QImageReader object.
Task-number: QTBUG-7980
Reviewed-by: aavit
|
| | | |
| | |
| | |
| | |
| | |
| | |
| | | |
Restore Qt 4.5 behaviour.
Task-number: QTBUG-7395
Reviewed-by: Thierry
|
| | |\ \
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | | |
4.6-integration
* '4.6' of scm.dev.nokia.troll.no:qt/oslo-staging-2:
QGraphicsItem: Do not crash at exit if there is static QGraphicsItem.
Make QTextCodec reentrant.
|
| | | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | | |
The DataStore could have been destroyed before.
Even if having static QGraphicsItem is not really supported, it is
better not to crash
Task-number: QTBUG-7629
Reviewed-by: bnilsen
|
| | | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | | |
QTextCodec::codecForName and codedForMib were not reentrant
Reviewed-by: Brad
Reviewed-by: Denis
|
| |\ \ \ \
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | | |
4.6-integration
* '4.6' of scm.dev.nokia.troll.no:qt/qt-s60-public:
Documentation: clarified RVCT support for Symbian
Update Symbian OS def files for 4.6.2
Don't remove all dependencies when patching the pkg.
Workaround for abld toolchain issue with s60main
|
| | | | | |
| | | | |
| | | | |
| | | | | |
Task-number: QTBUG-8024
|
| | |/ / /
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | | |
When building for ARMV6 with abld toolchain in Symbian, qtmain.lib
ends up missing some symbols that are required to link it against
GCCE apps. This happens because --dllimport_runtime compiler
option is missing in ARMV6 builds of qtmain.lib.
Task-number: QTBUG-7952
Reviewed-by: axis
|
| | | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | | |
Fixed a bad merge in the QAbstractSlider::wheelEvent.
Modified an autotest to follow a change in behavior - scrolling with a
horizontal mouse wheel to the "right" means increasing the value.
Reviewed-by: Richard Moe Gustavsen
|
| |\ \ \ \
| |/ / /
|/| | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | | |
4.6-integration
* '4.6' of scm.dev.nokia.troll.no:qt/oslo-staging-1:
Fixes scrolling horizontally with a mouse wheel over sliders.
Doc: Clarified ownership of custom buttons added to a QDialogButtonBox.
Updated WebKit from /home/shausman/src/webkit/trunk to qtwebkit/qtwebkit-4.6 ( da5d96a26e80162027bc95ce7e5725fe4b277ff7 )
A fix for accidently reused variable names in nested iterations.
Iain's changes for 4.6.2
Doc: Fixed typo.
|
| | |\ \ \
| | |/ /
| |/| |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | | |
4.6-integration
* '4.6' of scm.dev.nokia.troll.no:qt/oslo-staging-1:
Fixes scrolling horizontally with a mouse wheel over sliders.
Doc: Clarified ownership of custom buttons added to a QDialogButtonBox.
Updated WebKit from /home/shausman/src/webkit/trunk to qtwebkit/qtwebkit-4.6 ( da5d96a26e80162027bc95ce7e5725fe4b277ff7 )
A fix for accidently reused variable names in nested iterations.
Iain's changes for 4.6.2
Doc: Fixed typo.
|
| | | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | | |
When scrolling horizontally over sliders the slider should go to the right,
which means the value of the slider should increase. However in Qt scrolling
with a mouse wheel horizontally means the delta value is negative, which is
wrong. So changed the delta to be inversed.
Reviewed-by: Richard Moe Gustavsen
|
| | | |\ \ |
|
| | | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | | |
( da5d96a26e80162027bc95ce7e5725fe4b277ff7 )
Changes in WebKit/qt since the last update:
|
| | | |\ \ \
| | | |/ / |
|
| | | | | |
| | | | |
| | | | |
| | | | | |
Reviewed-by: Peter Hartmann
|
| | | | | |
| | | | |
| | | | |
| | | | |
| | | | | |
Reviewed-by: Trust Me
Suggested-by: Robert Griebl
|
| | | | | |
| | | | |
| | | | |
| | | | | |
Reviewed-by: Trust Me
|
| |\ \ \ \ \
| |/ / / /
|/| | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | | |
4.6-integration
* '4.6' of scm.dev.nokia.troll.no:qt/qt-s60-public:
Fixed casual crash in initializeDb (Symbian)
Fixed a bug where text would disappear in password fields.
Fixed sendEvent call.
Removed useless member variable and replaced with var on the stack.
Fixed indentation.
Fix to S60 softkey pressed down image.
Whitespace/tab fixes.
s60 application loses normalGeometry when returning from fullscreen
Fixing 'softvfp+vfpv2' compiling issue for Tb9.2
|
| | | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | | |
dynamic_cast should be used carefully with rvct before version 4.
We found that out after the a dynamic (down)-cast from CFont* to
CFbsFont* in QtGui suddenly failed.
We test for (TypeUid() == KCFbsFontUid), before doing the
cast. So, a static_cast is safe in this case. Also the other
two dynamic_casts in qfontdatabase_s60.cpp were changed to
static_cast.
http://bugreports.qt.nokia.com/browse/QTBUG-7963
Task-number: QTBUG-7963
Reviewed-by: lars
modified: src/gui/text/qfontdatabase_s60.cpp
|
| | |\ \ \ \ |
|
| | | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | | |
There were two bugs:
- First, we need to avoid triggering the CancelTransaction call when
committing the temporary preedit text, because otherwise FEP starts
sending us spurious backspace events. Since the
"triggeredBySymbian" variable is no longer descriptive for that use
case, I renamed it in the process and that changed the negation of
the flag. Notice the absense of a change inside
commitTemporaryPreeditString(). That is because we want that one
to avoid the transaction cancel, and therefore wee keep the old
negation.
- Second, m_cursorPos needs to be kept in sync with the widget state
when we send the temporary preedit string, because the input
context cannot separate between types of preedit text when it hits
the first block in commitCurrentString() (types being either our
temporary text, or FEP's text), and we have to avoid the longPress
code path.
RevBy: Janne Koskinen
|
| | | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | | |
The documentation states we should use the local sendEvent. Not sure
if it makes a difference, but better to be consistent.
RevBy: Trust me
|
| | | | | | |
| | | | | |
| | | | | |
| | | | | | |
RevBy: Trust me
|
| | | | | | | |
|
| | |\ \ \ \ \
| | |_|_|/ /
| |/| | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | | |
4.6-integration
* '4.6' of scm.dev.nokia.troll.no:qt/qt-s60-public:
Fix to S60 softkey pressed down image.
Whitespace/tab fixes.
s60 application loses normalGeometry when returning from fullscreen
Fixing 'softvfp+vfpv2' compiling issue for Tb9.2
|
| | | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | | |
On Symbian the icons which are passed to softkeys, i.e. to actions with
softkey role, need to use pixmap alpha channel instead of mask. Otherwise
S60 CBA framework fails to create 50% transparent pressed down mask for
softkey icon.
Task-number: QTBUG-7314
Review-By: Sami Merila
|
| | | | | | |
| | | | | |
| | | | | |
| | | | | | |
Reviewed-by: Trust me
|
| | | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | | |
Problem description: normalGeomerty lost during showFullScreen
1. Reported problen was due on void QSymbianControl::PositionChanged()
over write top->normaGeometry on every position change. As fix
top->normalGeometry is moved to new rect:s top left only when
widget windowState == 0.
2. Also made some new qwidget auto tests. Refactored s60 side
setWindowState to be more readable. Minimized window state now
hides window decoration.
QApplication & QWidget autotest run on emulator and tested on
s60 5.0 hw using attached application.
http://bugreports.qt.nokia.com/browse/QTBUG-6231
Task-number:QTBUG-6231
Merge-request: 2256
Reviewed-by: Jani Hautakangas <ext-jani.hautakangas@nokia.com>
|
| | | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | | |
When compiling with -fpu=softvfp+vfpv2 on Tb9.2 we were getting the
segmentattion fault.
This seems to be due to the RVCT bug when it comes to using int->float
(and reverse) castings. One extra level of indirection (function
call) has to be applied.
Task-number: QTBUG-4893
Reviewed-by: TrustMe
|
| |\ \ \ \ \ \
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | | |
4.6-integration
* '4.6' of scm.dev.nokia.troll.no:qt/oslo-staging-2: (49 commits)
Fixed qt_x11_wait_for_window_manager
Revert change 34f1758 on non-Synbian platforms
Fixed QGifHandler::loopCount().
Fix tst_QAccessiblity failure.
fix compile error when linuxinput keyboard driver is compiled as plugin
Fixed the context menu test case in the qgraphicsscene autotest.
fix regression from Qt 4.5 wrt missing text pixels in QTabBar
Cleanup after "Changed qgraphicswidget autotest to use qWaitForWindowShown"
Cleanup after "QGraphicsWidget is painted twice on the first show"
Changed qgraphicswidget autotest to use qWaitForWindowShown.
Improved QTest::qWaitForWindowShown on X11.
Stabilize tst_QGraphicsWidget::initialShow2 (new test)
Make sure we define S_IFDIR on Windows
Fix copy/pasto
Crash when closing any top-level widget on Symbian.
Cache the sizes of the images in an animated GIF.
Fix the QAbstractSlider autotest.
Use OpenVG scissor on 90/180/270 rotations and simple clips.
Optimize single-rect IntersectClip in OpenVG using the scissor
QGraphicsWidget is painted twice on the first show.
...
|
| | | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | | |
When we wait for the window to be shown by looking for ReparentNotify,
MapNotify, etc events in the event queue, we should check if those events come
for the right window, otherwise we might exit too early if there are event for
an other window in the queue.
Reviewed-by: Leonardo Sobral Cunha
|
| | | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | | |
The change introduces behavior changes (including crashing on QWS).
It is only critical for Symbian. To reduce risk, we only apply it
on the Symbian platform for now.
Task-number: Autotest regression
Reviewed-by: Jesper
|
| | | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | | |
Task-number: QTBUG-7037
Reviewed-by: Kim
|
| | |\ \ \ \ \ \
| | |/ / / / /
| | | | | | |
| | | | | | |
| | | | | | | |
Conflicts:
dist/changes-4.6.2
|
| | | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | | |
This started to fail after 34f1758428282a327c12b0d8040061c1f67ecc7f.
Or actually, the test crashes on my machine. Reason is that the the test
first creates a top-level line edit (which then gets its own backing
store). The line edit is then reparented into another top-level. When
the line edit is destroyed extra->topextra->backingStore is true and we
delete the backing store it first got when created as a top-level.
However, the line edit was reparented so this backing store is not the
"active" one. We should still delete topextra->backingstore, but we must
also remove any pointer references to the line edit in the "active" backing
store.
Reviewed-by: jbarron
|
| | | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | | |
When creating the driver instance two parameters are given to the
driver. But it accepts only the name of the device to be used.
Reviewed-by: Paul
Merge-request: 2288
|
| | | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | | |
The line spacing fix showed a bug in QCommonStylePrivate::tabLayout.
Since QFontMetrics::height() now usually returns one pixel less than
in Qt 4.5, the tab bar is one pixel smaller.
Squeezing the tab rect vertically can result in missing pixels.
This depends on anti-aliasing settings and font size.
The new behaviour in tabLayout is now: If we have to shift the tab
rect, then we move its position instead of changing its height.
Task-number: QTBUG-7137
Reviewed-by: jbache
|
| | |\ \ \ \ \ \
| | |_|/ / / /
| |/| | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | | |
4.6-integration
* '4.6' of scm.dev.nokia.troll.no:qt/oslo-staging-2: (42 commits)
Cleanup after "Changed qgraphicswidget autotest to use qWaitForWindowShown"
Cleanup after "QGraphicsWidget is painted twice on the first show"
Changed qgraphicswidget autotest to use qWaitForWindowShown.
Improved QTest::qWaitForWindowShown on X11.
Stabilize tst_QGraphicsWidget::initialShow2 (new test)
Make sure we define S_IFDIR on Windows
Fix copy/pasto
Crash when closing any top-level widget on Symbian.
Cache the sizes of the images in an animated GIF.
Fix the QAbstractSlider autotest.
Use OpenVG scissor on 90/180/270 rotations and simple clips.
Optimize single-rect IntersectClip in OpenVG using the scissor
QGraphicsWidget is painted twice on the first show.
Compiler warning in QAbstractSlider.
Optimize QPathClipper::pathToRect.
QGraphicsScene: Use QPainter::setClipRect instead of setClipPath if possible.
QStyleSheetStyle: Fix combinaison of border-image and border-radius
Revert "QAbstractScrollArea: Wheel over a scrollarea that has only one horizontal scrollbar"
Proper Fav icon is not shown, for all the links default fav icon shown
Update changes-4.6.2.
...
|
| | | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | | |
Commit: dda8a57c085216db609f822837c50bae38006b4e
We don't want to reset 'updateAll' at that point, for the same reason as
mentioned in the above commit. More details in the task.
Task-number: QTBUG-6956
|
| | | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | | |
The function is supposed to wait until the window has been managed by the
window manager on X11 - i.e. it has been reparented to a frame, mapped and
received at least one Expose event after that.
Reviewed-by: Olivier Goffart
|
