| Commit message (Collapse) | Author | Age | Files | Lines |
|
|
|
|
|
|
|
|
|
|
| |
This reverts commit 705ebaea0d81c76c97e7230f0acbe85442981555.
For some strange reason, the change that we revert caused a lot
of problems; the menu bar stopped working, duplicating menu items
etc., and modality stopped working correctly. So there is only
one thing to do: revert.
Rev-By: msorvig
|
|
|
|
|
|
|
| |
It turns out that some of the code executed when synching then menu
bar was already implemented in the function that clears the menu bar.
So this patch makes the code a bit more compact, avoiding implementing
the same code twize.
|
|\ |
|
| |\
| | |
| | |
| | |
| | |
| | |
| | |
| | | |
4.6-integration
* '4.6' of scm.dev.nokia.troll.no:qt/qt-s60-public:
Fix for QTBUG-7267 Qs60Style::drawControl() does not align CE_ItemViewItem
Fix for QTBUG-6408 QFontEngineS60::QFontEngineS60 called hundreds of
|
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | | |
control element correctly if given widget is null.
Uses now alignment hint value given in style option.
Task-number: QTBUG-7267
Reviewed-by: Janne Koskinen
|
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | | |
times, taking up to 1ms each call.
Use S60->ScreenDevice() to get/release fonts instead of create a new
screen device each time.
Task-number: QTBUG-6408
Reviewed-by: Jason Barron
|
| |\ \
| | |/
| |/|
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | | |
4.6-integration
* '4.6' of scm.dev.nokia.troll.no:qt/oslo-staging-2:
Doc: the QTextDecoder need to be destroyed, reflect that in the example
added CONFIG += console to qlalr.pro
Add new benchmark for some qtext features.
Add texture glyph width cache default.
Update changes file
|
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | | |
For maemo6 need to increase the cache width to 1024 to avoid
text corruption using SGX 1.4.
Reviewed-by: Tom Cooksey
Reviewed-by: Harald Fernengel
|
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | | |
This is purely an optimization for fullscreen-only apps.
Task: QTBUG-6098
RevBy: Jason Barron
RevBy: mread
AutoTest: Included
|
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | | |
The error would happen because Qt would attempt to do focus handling
on the desktop widget which eventually resulted in an assert on the
Created status of the widget.
RevBy: Jani Hautakangas
AutoTest: Passed
|
| |\ \
| | |/
| |/|
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | | |
4.6-integration
* '4.6' of scm.dev.nokia.troll.no:qt/qt-s60-public:
Enable building with MSVC2008
Added mention of Symbian binary packages to INSTALL file
Fix for QTBUG-5870 QGraphicsProxyWidget does not show children on
Deploy sqlite3.sis instead of sqlite3.dll in Symbian
Separated "make run" and "make runonphone" targets
Added UIDs and icons to some webkit examples
Implemented node disconnection in Phonon MMF backend
Removed dead code from Phonon MMF backend
Re-emit prefinishMarkReached and aboutToFinish if rewound back past mark.
Implemented support for playlist handling in Phonon MMF backend
Mediaplayer: enqueue all entries from .ram file before starting playback
Changed call sequence of seeking in Phonon MMF backend, for streaming
Implemented buffer status notifications in Phonon MMF backend
Added support for streaming playback to Phonon MMF backend
Phonon MMF: leaves during object construction throw exceptions
Removed stale TODO comments from Phonon MMF backend
Symbian: More i18n strings work.
Fixed bug which caused Phonon backend error messages to be suppressed
Added error strings to Phonon MMF backend
|
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | | |
Symbian.
QS60PaintEngine returned wrong device in QPaintEngine::paintDevice().
Task-number: QTBUG-5870
Reviewed-by: Jason Barron
|
| |\ \
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | | |
4.6-integration
* '4.6' of scm.dev.nokia.troll.no:qt/oslo-staging-2:
Make sure the rect in QPixmap::copy() doesn't exceed the boundingRect.
Fix a painter warning
|
| | | |
| | | |
| | | |
| | | |
| | | | |
Task: http://bugreports.qt.nokia.com/browse/QTBUG-6303
Reviewed-by: Samuel
|
| | |/
| | |
| | |
| | |
| | |
| | |
| | |
| | | |
when using a treewidget with animations in a splitter and the tree is
collapsed, and then select an item in the tree that requires expanding,
it might end up trying to paint to an invalid pixmap
Reviewed-by: Gabi
|
| | |
| | |
| | |
| | |
| | |
| | |
| | | |
In Qt, we allow the menu bar to be enabled if we only have one
exec-ing dialog on screen. That way you can reach the quit menu item to
close down the application. But in order for this to work, some overhaul
of qmenu_mac.mm was need to teach it these rules.
|
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | | |
When creating a single dialog in the main function, and tell it
to exec, we run a modal dialog. But there is really no other
window on screen to be modal for. So in that case, since this is
a rather common pattern for Qt applications, we allow users to
quit the application from the dock. But this action is sendt as
an apple event. And and that point in time, cocoa has the the
apple event handler, and refuses to close down the application
because it detects a modal window.
Our solution is to install/overwrite the apple event handler for
kAEQuit _after_ cocoa has finished its own installation. But in
order to do this, we need to wait until [NSApplication run] has
started, otherwise it will not take effect. And that is what this
patch essentially does.
|
|\ \ \ |
|
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | | |
QFileSystemModel provides the same features as QDirModel but in a
efficient way so no need to keep QDirModel around.
This commit mark as obsolete QDirModel. Examples has been ported to
use QFileSystemModel instead. QCompleter also gain the support of
QFileSystemModel to complete nicely a line edit.
This commit also add a new signal in QFileSystemModel when the directory
is loaded, i.e. the thread has finished to read the current dir.
Task-number:QTBUG-3884
Reviewed-by:ogoffart
Reviewed-by:gabi
Reviewed-by:mbm
|
| |\ \ \
| | |/ /
| | | |
| | | |
| | | |
| | | |
| | | | |
Conflicts:
src/corelib/io/qfsfileengine.cpp
src/opengl/gl2paintengineex/qpaintengineex_opengl2.cpp
src/opengl/opengl.pro
|
| | |\ \
| | | |/
| | |/|
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | | |
4.6-integration
* '4.6' of scm.dev.nokia.troll.no:qt/qt-multimedia-team:
QAudioInput loses data on Maemo5/other linux platforms.
Fix warning in qfilesystemmodel_p.h
Frequency to SampleRate and channels to channelCount.
Added setChannelCount() to QAudioFormat.
|
| | | |\
| | | | |
| | | | |
| | | | |
| | | | | |
Conflicts:
examples/multimedia/audiodevices/audiodevices.cpp
|
| | | | |
| | | | |
| | | | |
| | | | | |
Reviewed-by: Rhys Weatherley
|
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | | |
QSet is a hash internally, using Iterator::begin while erasing elements
inside the set might create holes and then the complexity increase.
We now use the return value of erase (the next element) so the
complexity is linear.
For those who create/delete item in the polish event (BAD), _q_polishItem
might be slower than the normal call.
Task-number:QTBUG-6958
Reviewed-by:olivier
|
| | | |/
| | |/|
| | | |
| | | |
| | | | |
Task-number: QTBUG-7161
Reviewed-by: Daniel Pope
|
| | |\ \
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | | |
4.6-integration
* '4.6' of scm.dev.nokia.troll.no:qt/oslo-staging-2: (42 commits)
QBoxLayout::setGeometry would not respect the widget min/max width
Revert "QStyleSheetStyle: Fixed some text croped when having padding with native border."
Use QFile:rename when moving items in QFileystemModel.
Revert "Add GLfloat[2][2] & GLfloat[3][3] uniform setters to QGLShaderProgram"
Fix default filter selection when using HideNameFilterDetails option.
Don't write out fo:word-spacing if its the default value.
Improved initial startup time for a QGLWidget ontop of EGL/X11.
Document the QGraphicsView::IndirectPainting flag
Display broken symlinks in the filesystem model.
Fix typo in autotest testcase name.
Fixed a bug with distribution of spans.
Make unit test more robust
Compile with QT_NO_DOCKWIDGET
Removed temporary QGLWidget created during QGLWidget/X11 initialization.
Fix test: The bug is now fixed
Fix auto-test failure on Windows
QScript: Lookup the native setter from the prototype
Implement QScript::QObjectDelegate::getOwnPropertyDescriptor
fix compilation in GL2 paint engine for Windows
Move QGLTextureGlyphCache into it's own file
...
|
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | | |
When calling heightforWidth after a geometry change, the width actually used
could be outside the widget's width bounds. The height could then be smaller
than needed to fit the widget's contents resulting in a clipped widget being
drawn. Auto-test included.
Reviewed-by: Olivier
Task-number: QTBUG-7103
|
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | | |
native border."
This reverts commit 6e90192b599cee9b903177a0978198326f667613.
his change the behaviour a little bit. It is better to wait for Qt 4.7
Reviewed-by: jbache
|
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | | |
We got for free the recursive move if the directory that we move has
subdirectories. Unfortunately copying a directory to an another is
not easy in Qt so the copy still doesn't work if the directory contains
directories.
Task-number:QTBUG-5855
Reviewed-by:ogoffart
|
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | | |
When you have HideNameFilterDetails on, comparing the default filter
given in parameter for selectNameFilter has to be done with the striped
version of the filter, i.e. without the details.
Task-number:QTBUG-4842
Reviewed-by:gabriel
Reviewed-by:olivier
|
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | | |
the property fo:word-spacing is still not in an official ODF spec so
a strict schema check will fail in any doc that uses it. Lets make sure
we limit the writing of that property to only those usecases where the
property was really set by the user.
Task-number: QTBUG-5725
|
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | | |
And that the QGraphics{View,Scene}::drawItems function are now obsolete.
Reviewed-by: Alexis
|
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | | |
A broken symlink has a -1 size so we need to special case that.
Task-number:QTBUG-7119
Reviewed-by:olivier
|
| | | |\ \ |
|
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | | |
If a span required more size than the rows/columns it spanned, the
size of the span was not distributed to the rows it spanned. The
result was that the size hints of the layout was not correct,
causing the layout to be potentially smaller than the spanning item.
Task: QT-2261
Reviewed-by: Alexis
|
| | | | | |
| | | | | |
| | | | | |
| | | | | | |
Task-number: QTBUG-7133
|
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | | |
This option was simply not implemented at all so it didn't work.
Task-number:QTBUG-6558
Reviewed-by:ogoffart
|
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | | |
We should check for the fully opaque and fully transparent special
cases, like we do in the dedicated image blend functions.
Reveiewed-by: Gunnar Sletta
|
| | | | | | |
|
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | | |
Certain boards are not support StretchBlit very well. This patch enables
them to define QT_NO_DIRECTFB_STRETCHBLIT to fall back to the raster
engine for stretchblits.
Reviewed-by: Donald Carr <donald.carr@nokia.com>
|
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | | |
QX11PixmapData::transformed initializes a new QX11PixmapData object but
doesn't set its serial number.
Reviewed-by: Donald Carr <donald.carr@nokia.com>
|
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | | |
Task-number: QTBUG-7047
Reviewed-by: Benjamin Poulain
|
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | | |
The problem was that when the background cache was invalidated, it was
entirely recreated but only the exposed area of the view was repainted
in it, causing the cache to be partly empty in some cases. Now the
background cache is always fully repainted when it is invalidated.
Task-number: QTBUG-6935
Reviewed-by: ogoffart
|
| | | | | |
| | | | | |
| | | | | |
| | | | | | |
Task-number: QTBUG-6474
|
| | | | | |
| | | | | |
| | | | | |
| | | | | | |
Task-number: QTBUG-6637
|
| | |\ \ \ \ |
|
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | | |
When accessing the global input context from the QWidget destructor access it
directly instead of calling a helper function. Don't even bother to create an
input context if QApplication is being destroyed (just in case if the user is
calling the QApplication::inputContext manually from the destructor).
Task-number: QTBUG-7105
Reviewed-by: Simon Hausmann
|
| | |/ / / /
| | | | | |
| | | | | |
| | | | | | |
Task-number: QTBUG-6763
|
| | | | | |
| | | | | |
| | | | | |
| | | | | | |
Task-number: QTBUG-6810
|
| | | | | |
| | | | | |
| | | | | |
| | | | | | |
Task-number: QTBUG-7118
|