| Commit message (Collapse) | Author | Age | Files | Lines |
|\
| |
| |
| |
| |
| |
| | |
Conflicts:
examples/webkit/fancybrowser/main.cpp
src/opengl/gl2paintengineex/qpaintengineex_opengl2.cpp
tools/assistant/tools/assistant/bookmarkmanager.cpp
|
| |
| |
| |
| |
| | |
Task-number: QTBUG-3344
Reviewed-by: Trust Me
|
| |
| |
| |
| |
| |
| |
| | |
Ask selected state only once in QS60Style when handling element
CE_TabBarTabLabel.
Reviewed-by: TrustMe
|
| |
| |
| |
| | |
Reviewed-by: TrustMe
|
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| | |
ComboBoxes and SpinBoxes are squeezed in QVGA screens, due to
dodgy style calculations.
This fix ensures that sub-widget buttons for these widgets are always
square.
Task-number: QT-2158 (internal)
Reviewed-by: axis
|
| |\
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | | |
4.6-integration
* '4.6' of scm.dev.nokia.troll.no:qt/qt-s60-public:
Setting background color to a QDialog doesn't work
QWidget with the window flag Qt::Dialog is not decorated as a dialog
Device flickers badly when orientation change occurs
Changed make sis only require .make.cache if QT_SIS_TARGET is not set.
|
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | | |
Since dialogs use their own theme graphics for background, regular
method of checking the palette fails (as generic background brush is
probably unchanged). Therefore to check if the dialog background is
using default (=theme graphic), it needs to check the cache key value
of background - so that it matches with the one in stored theme
palette.
Task-number: QTBUG-5898
Reviewed-by: Janne Koskinen
|
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | | |
Previously style casted widgets to QDialog to see if it is able to
draw dialog background theme graphic.
As a fix, we now query window flag from the widget and if it is
equivalent of Qt::Dialog, draw dialog background.
Task-number: QTBUG-5930
Reviewed-by: Janne Koskinen
|
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | | |
Currently what happens when orientation changes is:
1. Application gets notification that status pane size has changed.
2. Qt resizes S60Data to new size, and sends resize event.
3. Application redraws itself. But style is still using incorrect
screen size internally, so background brush is incorrect. Redrawing
thus might showup white rect on-screen.
4. Style gets notification that orientation is changed and style then
deletes existing background brush.
5. Style creates a new background brush and sends events to all toplevel
widgets that style has changed
6. Widgets might draw themselves with new style background brush.
What this fix changes is:
1. When application first tries to redraw itself, style notices that
the background brush size does not match to active screen size.
2. Style immediately re-creates background brush
3. Since cachekey for pixmaps won't match, new background is not drawn
until after background brush has been updated to application palette.
4. Due to #1 style needs to remove deletion of background brush from
clearCaches to avoid deleting (and re-creating) background twice.
Task-number: QTBUG-6428
Reviewed-by: Janne Koskinen
|
| |\ \
| | |/
| |/|
| | |
| | |
| | |
| | |
| | |
| | |
| | | |
4.6-integration
* '4.6' of scm.dev.nokia.troll.no:qt/oslo-staging-2:
Use 3x3 PMV matrices rather than 4x4 in the GL2 engine
Handle broken shaders better in the GL2 engine's shader manager
Add GLfloat[2][2] & GLfloat[3][3] uniform setters to QGLShaderProgram
Fix build with neon instructions enabled but not set in mkspec
|
| | |
| | |
| | |
| | | |
Reviewed-By: Samuel Rødal
|
| |\ \
| | | |
| | | |
| | | |
| | | |
| | | |
| | | | |
4.6-integration
* '4.6' of scm.dev.nokia.troll.no:qt/oslo-staging-1:
Memory leak when using QWidget::setWindowIcon() in Carbon.
|
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | | |
The icon was not released when destroying the window.
Task-number: QTBUG-6973
Reviewed-by: Richard Moe Gustavsen
|
| |\ \ \
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | | |
4.6-integration
* '4.6' of scm.dev.nokia.troll.no:qt/qt-s60-public:
Added more specific clean targets for Symbian builds
Fixed incorrect headers.
Daylight savings time for Symbian.
Tool for launching symbian apps on the phone from windows command line
Fixes to winscw def files
Fixing compile error on armcc
|
| | |\ \ \
| | | | |/
| | | |/|
| | | | |
| | | | | |
Conflicts:
src/gui/image/qpixmapfilter.cpp
|
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | | |
armcc has issues with templated static inline functions, have to
remove "static" keyword
Reviewed-by: sroedal
|
| |\ \ \ \
| | |_|/ /
| |/| | /
| | | |/
| | |/|
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | | |
4.6-integration
* '4.6' of scm.dev.nokia.troll.no:qt/oslo-staging-1:
Updated WebKit from /home/shausman/src/webkit/trunk to qtwebkit/qtwebkit-4.6 ( de77f8ee69c434bde9306c8f407ee2e443a00188 )
Drag and drop icon not updated correctly in Cocoa.
Adding missing file.
Warn when calling QFileInfo::absolutePath() on an improper object.
update harfbuzz to 2b78f0d78ad3075fd1657d1260b31219e1a5155
Fixing a problem with xmlpatterns, where code from tools/xmlpatterns was being included by src/xmlpatterns.
Fix for WinCE compilation of QAbstractSpinBox.
|
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | | |
QDragMoveEvent is compressed using the answer rect in QCocoaView. The
result of the last sendEvent is saved, so that we dont have to generate
a new event always. This saved result was not updated correctly when the
event was ignored.
Task-number: QTBUG-5186
Reviewed-by: Richard Moe Gustavsen
|
| | |/ |
|
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | | |
Currently non-touch devices lose edit focus if window switch
happens. I.e. in cases when screensaver activates, an incoming call
occurs, a global notification is shown...
With this fix, edit focus remain active, until user removes the
focus explicitly.
Task-number: 4792
Reviewed-by: axis
|
| |/
| |
| |
| |
| |
| | |
Removed static keywords from offending functions.
Reviewed-by: axis
|
| |\
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | | |
4.6-integration
* '4.6' of scm.dev.nokia.troll.no:qt/qt-s60-public:
Fixing compile issue on Windows CE
Fixed two incorrect signal connections.
Switched two files to BSD license.
|
| | |\
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | | |
4.6-integration
* '4.6' of scm.dev.nokia.troll.no:qt/qt-s60-public:
Fixing compile issue on Windows CE
Fixed two incorrect signal connections.
Switched two files to BSD license.
|
| | | |
| | | |
| | | |
| | | | |
Reviewed-by: TrustMe
|
| | | |
| | | |
| | | |
| | | | |
RevBy: Friedemann Kleint
|
| |\ \ \
| | |/ /
| |/| |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | | |
4.6-integration
* '4.6' of scm.dev.nokia.troll.no:qt/oslo-staging-2:
Fixed QPixmap::load() to not modify referenced copies.
Fixes bug when using AnchorUnderMouse for GraphicsView transformation.
Make the layout{,AboutToBe}Changed signals in the QSortFilterProxyModel match its source.
Make sure mappings are created for columns when indexes newly become parents.
NEON configure detection and initial blend function implementations.
Optimize QThreadStorage with QVector
Add Q_OBJECT to QBalloonTip so it can be intreospected by styles.
|
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | | |
This is a bad regression from 4.5. QPixmap::load() would modify all
references to the same QPixmap object.
Task-number: QTBUG-6840
Reviewed-by: Kim
|
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | | |
We now automatically enable mouse tracking on the viewport of the
GraphicsView when setting AnchorUnderMouse as transformationAnchor or
resizeAnchor.
Autotest included.
Task-number: QTBUG-6835
Reviewed-by: bnilsen
|
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | | |
match its source.
Merge-request: 2266
Reviewed-by: Olivier Goffart
|
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | | |
Also move the modeltest related tests to the modeltest subdirectory
Merge-request: 2262
Reviewed-by: Olivier Goffart <ogoffart@trolltech.com>
|
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | | |
Adds new NEON configure test and -no-neon configure option. NEON
implementations can also be turned off by setting the QT_NO_NEON
environment variable.
Performance improvements (in frames per second):
- Blending ARGB32 on RGB32/ARGB32, mostly opaque: 71 %
- Blending ARGB32 on RGB32/ARGB32, no opaque pixels: 108 %
- Blending ARGB32 on RGB32/ARGB32, with 0.5 opacity: 158 %
- Blending RGB32 on RGB32/ARGB32, with 0.5 opacity: 189 %
Task-number: QTBUG-6684
Reviewed-by: Gunnar Sletta
Reviewed-by: Paul Olav Tvete
|
| | |/
| | |
| | |
| | | |
Reviewed-by: jbache
|
| |\ \
| | |/
| |/|
| | |
| | |
| | |
| | |
| | |
| | | |
4.6-integration
* '4.6' of scm.dev.nokia.troll.no:qt/qt-multimedia-team:
Check if the scene exists before attempting to set its focus item.
The "audioinput" multimedia example locks up the audio input/output
no audiodevices found using QAudioDeviceInfo::availableDevices on Ubuntu
|
| | |
| | |
| | |
| | |
| | |
| | |
| | | |
Prevents crashing when an item involved in the scope chain is set to
be visible but it isn't part of a scene.
Reviewed-by: Alexis Menard
|
| |\ \
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | | |
4.6-integration
* '4.6' of scm.dev.nokia.troll.no:qt/qt-s60-public:
WeatherInfo now shows Oslo info upon launch instead of blank screen
Fixed QCoeFepInputContext::widgetDestroyed
|
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | | |
Calling SetFocus twice here was obsolete and caused intermittent panics.
Replaced them with proper queueInputCapabilitiesChanged call.
Task-number: QTBUG-6519
Reviewed-by: axis
|
| |\ \ \
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | | |
4.6-integration
* '4.6' of scm.dev.nokia.troll.no:qt/oslo-staging-1:
doc: Added discussion on connecting signals that have default arg values.
Stack overflow when closing a Color panel in Cocoa.
|
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | | |
The QCocoaColorPanelDelegate was going into an infinite recrusion in this
particular case. The patch guards the delegate from calling accept() or
reject() more than once.
Task-number: QTBUG-6636
Reviewed-by: Richard Moe Gustavsen
|
| |\ \ \ \
| | |/ / / |
|
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | | |
After commit d0d0fdb8e46351b4ab8492de31e5363ef6662b57, timers are
normally run at idle priority. This makes it possible for the X11
handler to starve timers indefinitely. Fix this by enforcing one
normal priority pass of the timer source after we have processed all
X11 events.
This has the added benefit of keeping animation timers smooth and
consistent, which is the intention of this change.
Reviewed-by: Jens Bache-Wiig
|
| | |\ \ \ |
|
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | | |
We don't need to flip the y-coordinate of window- and view-local coordinates
because they are flipped already.
Reviewed-by: Prasanth
|
| | | | | |
| | | | | |
| | | | | |
| | | | | | |
Reviewed-by: trustme
|
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | | |
The mac stlye disables the blinking cursor when there is a selection in
the line edit. The cursor is not shown back when this selection is
removed (either by mouse or key press events).
This patch watches the selection changed signal from the line control
and updates the cursor status accordingly.
Task-number: QTBUG-6378
Reviewed-by: Olivier Goffart
|
| | |\ \ \ \
| | | |/ / / |
|
| | | |\ \ \
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | | |
Conflicts:
mkspecs/macx-g++40/qplatformdefs.h
|
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | | |
[NSFontManager setTarget] is not available on 10.4.
Rev-by: Richard Moe Gustavsen
|
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | | |
backport of 64d38ba23b4acc46fdb9145f1953315573e3f8dc
Reviewed-by: Anders Bakken<anders.bakken@nokia.com>
|
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | | |
Previously copy and paste from PDFs made by Qt would paste garbage
into the target document, and searching was not possible. The bug
happened because the internal buffer would open its data stream in
truncate mode rather than append mode, thereby losing content, and
producing a slightly corrupted PDF.
Task: QTBUG-4912
Task: QTBUG-3661
RevBy: Trond Kjernåsen
(cherry picked from commit f7ee0c9efcb6cb36a95f49bc998524e25480f8ba)
|
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | | |
This happened when inserting the gap over a place holder item.
Task-number: QTBUG-6107
Reviewed-by: Gabi
|