| Commit message (Collapse) | Author | Age | Files | Lines |
|\
| |
| |
| |
| |
| | |
Conflicts:
mkspecs/common/symbian/symbian.conf
src/gui/kernel/qapplication_s60.cpp
|
| |
| |
| |
| | |
Reviewed-by: Sami Merila
|
| |
| |
| |
| |
| |
| |
| | |
If Avkon components support transparency then dialog background is transparent
enabling rounded corners.
Reviewed-by: Sami Merila
|
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| | |
The problem here was exiting the full screen mode. In Cocoa we don't
activate windows as we do in Carbon, therefore we were not exiting from
the full screen mode. This patch adds a check when hiding a window, if
the window is in full screen mode then we go through the list of top
level windows checking if there are any other visible and not-minimized
windows that are also in full screen mode. If none if found, the we exit
the full screen mode.
Task-number: QTBUG-7312
Reviewed-by: Prasanth
|
|\ \
| |/
| |
| |
| | |
Conflicts:
mkspecs/features/symbian/platform_paths.prf
|
| |\
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | | |
4.6-integration
* '4.6' of scm.dev.nokia.troll.no:qt/qt-s60-public:
1st attempt at USB serial port enumerator for linux
Corrected alphabetic order in the docs for events.
Implemented event filter functions for Symbian.
|
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | | |
Previously only the symbian specific event filters were called, but
now all filters in QApplication, QAbstractEventDispatcher and
QInputContext should be called.
Task: QT-2629
RevBy: Jason Barron
Autotest: Passed
|
| |\ \
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | | |
4.6-integration
* '4.6' of scm.dev.nokia.troll.no:qt/oslo-staging-2:
QGraphicsItem::hasFocus() performance regression.
Fix crashes in QByteArray
Move the labels a bit down so that they align better vertically with the field.
Add command to qmake to do symbian-uid generation
Fixed QBitmap::load to load into bitmap format again.
Fixed a crash under X11 when drawing QPixmaps to QGLPixelBuffers.
Text drawing is not fast currently
|
| | |/
| | |
| | |
| | |
| | |
| | |
| | | |
This was a "showstopper" for QFormLayout being used in Qt Creator.
Task-number: QT-958
Reviewed-by: Michael Goddard
|
| |/
| |
| |
| |
| | |
Enable the patch in my previous commit. (remove
"if 0")
|
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| | |
The crash happens when a QMainWindow with a native toolbar is reparented.
While re-parenting, the QToolBar triggers a new setParent() with the
MacWindowToolBarButtonHint. This messes up the internal state, hence the
crash. To avoid re-entering setParent() for the QMainWindow, this hint
is set depending on the unifiedTitleAndToolBarOnMac property.
This patch also fixes a related issue in Cocoa, we need to remove the
reused NSToolbar from the old window while recreating the QMainWindow.
Task-number: QTBUG-7162
Reviewed-by: Richard Moe Gustavsen
|
| |
| |
| |
| |
| |
| |
| |
| |
| |
| | |
pointer then it should not crash but warn instead.
Task: -
RevBy: Andreas
AutoTest: Included
Details: This also fixes availableGeometry() as well to warn under
the same circumstances.
|
| |
| |
| |
| |
| |
| |
| |
| |
| | |
On Symbian^4 systems where the window supports surface transparency, we
use this for the Qt::WA_TranslucentBackground flag instead of the
previous method.
Task-number: QT-2026
Reviewed-by: Iain
|
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| | |
Previously when an expose was received from WSERV, we simply called
BitBlt (for raster) or called flush on the window surface (for
anything else). This behavior differs from other platforms which call
syncBackingStore(). This difference means that we flush the backing
store without actually updating the content first. This works for most
cases because if there actually was new content, it would be updated
when the widget's UpdateRequest event was handled.
The problem arises when the backing store does not have the correct
content. This can happen if the backing store was deleted, but only
partially restored (see Task below). Another problem is with the OpenVG
graphics system which assumes that beginPaint() is called before
endPaint() is order to initialize the context and the surface size.
The fix is to call syncBackingStore() like the other platforms, but
introduce a bit field to prevent infinite recursion in the painting
pipeline.
Task-number: QTBUG-4921
Reviewed-by: axis
Reviewed-by: Gareth Stockwell
|
| |
| |
| |
| |
| |
| |
| |
| |
| | |
Complete the fix in f72165460d27860cabd51691f4d935fd74b50f80 by applying
the same fix to Symbian and QWS.
Task-number: QTBUG-7105
Reviewed-by: Alexis
Reviewed-by: Jason McDonald
|
| |\
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | | |
4.6-integration
* '4.6' of scm.dev.nokia.troll.no:qt/oslo-staging-1: (49 commits)
Reverted two commits that were pushed to the wrong branch.
Use the new QTextCodec api in the QXmlStreamWriter.
Added new functions to QTextCodec that accept ConversionFlags.
Fix passing of arguments to syncqt
doc: Fixed typos.
Fixes: Fix spinbox with NoButton style in QGtkStyle
doc: Explained parameter value defaults where appropriate.
Cocoa: Fix painting errors on QGLWidget resizing.
Fix broken QGLWidget::renderPixmap on Mac/Carbon
Fixes: Setting any style sheet breaks checkbox positioning
Fixes: MenuItem size fixes and missing separator with Gtk+
Autotest: add a test for QNAM's HTTP cache handling code
QNAM HTTP: just use the expirationDate in the code that validates the cache
QNAM HTTP: change the caching semantics to match documentation
QNAM HTTP: fix the caching algorithm from RFC 2616
Avoid repeatedly calling LookupAccountSid in QFSFileEngine::owner
improve readability a bit more
fix styling; improve readability
make it possible to retrieve name of the user who owns the file
Updated WebKit from /home/shausman/src/webkit/trunk to qtwebkit/qtwebkit-4.6 ( 99ccc1c3e4db5354246720f9b9aa3d282e64497d )
...
|
| | |
| | |
| | |
| | |
| | |
| | |
| | | |
Revby: Trond
We need to update the GL context syncronously during the resize
to prevent flicker. Use the existing MacGLWindowChange machinery
to do that.
|
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | | |
Moved the gestureManager pointer to a QApplicationPrivate to make sure if
QApplication object is destroyed, QGestureManager pointer is set to zero.
Task-number: QTBUG-7029
Reviewed-by: Thiago
|
| | |\
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | | |
4.6-integration
* '4.6' of scm.dev.nokia.troll.no:qt/oslo-staging-1:
QIODevice: Fix readAll()
Temporary hackiesh solution to prevent BOM in the xml data.
Fixed qxmlstream autotest when using shadow builds.
Attempt at readding the capital P headers for Phonon
Remove special Phonon processing from syncqt.
Use the lowercase/shortname.h headers for Phonon includes
Fixes a crash when setting focus on a widget with a focus proxy.
Update copyright year to 2010
doc: Clarified activeSubControls and subControls.
Remove warning "statement with no effect"
doc: Clarified that .lnk files are System files on Windows.
|
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | | |
When the focus proxy widget doesn't have InputMethodEnabled attribute set we
shouldn't try to set an input context on it.
Reviewed-by: Simon Hausmann
|
| | | |
| | | |
| | | |
| | | | |
Reviewed-by: Trust Me
|
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | | |
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/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
|
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | | |
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-6810
|
| |/
| |
| |
| |
| | |
Fix warning given by cocoa
(cherry picked from commit 875afab977005b03d307040fb3be15c7524a37ff)
|
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| | |
Happens for example if a DockWidget is undocked and has a child
whith the WA_StaticContents attribute.
The parent does not change (so newParent is false) but still, the
top level widget change. So staticWidget need to be moved to the
new backingstore.
Reviewed-by: Benjamin Poulain
Task-number: QTBUG-6883
|
| |\
| | |
| | |
| | |
| | |
| | |
| | | |
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/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
|
|\ \
| |/
| |
| |
| |
| | |
Conflicts:
configure
src/gui/text/qfontdatabase_s60.cpp
|
| |\ |
|
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | | |
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
|
| | |\ \
| | | |/ |
|
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | | |
Now we don't filter some events through the gesture manager and use QMap
instead of QHash, which seem to be a bit faster in our cases.
Reviewed-by: Olivier Goffart
|
| | |\ \
| | | |/ |
|
| | | |
| | | |
| | | |
| | | | |
Reviewed-by: Trust Me
|
| |\ \ \
| | | |/
| | |/|
| | | |
| | | | |
Conflicts:
src/s60installs/bwins/QtGuiu.def
|
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | | |
Use QWeakPointer to bail out early if a widget is deleted while we are
delivering/propagating a TouchBegin event.
In QGraphicsScene, we need to make sure that we clear the scene's
active touch points for items that are removed from the scene. This
allows us to detect when an item is removed during TouchBegin event
delivery/propagation. Unlike QWidget, propagation continues since we
use a hit-test instead of the item's hierarchy for propagation.
Task-number: QTBUG-6654
Reviewed-by: bnilsen
|
| |\ \ \
| | |/ /
| | | |
| | | |
| | | | |
Conflicts:
src/s60installs/bwins/QtGuiu.def
|
| | |\ \
| | | |/ |
|
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | | |
The QPlainTextEdit can change the scroll ranges while dragging the
scrollbar. This will eventualy call QWidget::raise(), on Cocoa it was
done by removing the NSView and adding it back. This causes problems
like resetting internal state while a mouseDragged was active on the
view. The fix we will now sort the views based on their Qt-z-order.
lower() & stackUnder() also fixed like this.
Reviewed-by: Denis
|
| | |\ \
| | | |/
| | |/| |
|