| Commit message (Collapse) | Author | Age | Files | Lines |
|
|
|
|
|
|
|
|
|
|
|
|
|
|
| |
stuck anymore
When using this flag the child of the widget which is embedded is becoming
a top level QWidget. So a right click on a text edit trigger the context
menu to be top level. When creating this top level context menu we are
grabbing the mouse but we were never releasing it when the menu was hidden.
The patch check if the widget uses the Qt::BypassGraphicsProxyWidget and
ungrab the mouse. The patch also fix a bug when positioning the QMenu, it was
for the same reason.
Task-number:QTBUG-7254
Reviewed-by:brad
|
|
|
|
|
|
|
|
|
| |
The Qt::WA_Moved was not being set during the move event as notified
by the window manager. This is a behavior change for 4.7, but we think
it's more user friendly than the previous behavior.
Reviewed-by: mbm
Task-number: QTBUG-9991
|
|
|
|
| |
Reviewed-by: Martin Jones
|
|\
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| | |
* '4.7' of scm.dev.nokia.troll.no:qt/qt-qml: (147 commits)
doc fixes
Don't test XmlListModel examples on platforms without QtXmlPatterns
More error output for QML_IMPORT_TRACE=1
Fix declarative examples autotest, avoid using native separators
Doc: update Rectangle smooth painting screenshot.
Add some TextInput properties and methods
Remove GraphicsObjectContainer from the documentation.
import Qt 4.6 -> import Qt 4.7
Move documentation code to snippet.
Test fix.
Fix test
Fix test on QWS.
Fix PathView crash.
Make bindings dump more useful
Improve font value type documentation.
coding conventions
Doc fixes
Warning
Read Maemo orientation at startup
Exclude gestures from examples autotest
...
|
| |
| |
| |
| | |
Apply the ~QObject QDeclarativeData logic to ~QWidget
|
|\ \
| |/
|/|
| |
| |
| |
| | |
Conflicts:
qmake/generators/symbian/symmake.cpp
src/gui/image/qimage.cpp
src/openvg/qwindowsurface_vgegl.cpp
|
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| | |
This change includes a fix for QTBUG-4887 and other exception safety
problems found while testing it.
The QTBUG-4887 fix is to qimage.cpp. QImage doesn't throw exceptions on
failure like a proper class should, instead it tries to fail "nice".
What happens here is that setAlphaChannel would crash on OOM as after
the convertToFormat call, d could be NULL. This new version checks the
result of the conversion before using it.
The other fixes are all cases where exceptions were thrown from
destructors. I added code to the test app to help debug these cases,
and I fixed all the problems I found.
With these changes, tst_exceptionsafety_objects runs and passes on the
Symbian emulator.
Reviewed-by: Shane Kearns
|
| |
| |
| |
| |
| |
| |
| |
| | |
This should prevent window managers from ever sending a WM_TAKE_FOCUS
message to those windows (useful for IM windows like virtual keyboards,
notification banners, etc.)
Reviewed-by: bhughes
|
|\ \
| |/
| |
| |
| | |
Conflicts:
qmake/generators/symbian/symmake_abld.cpp
|
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| | |
This also fixed the issue where an input panel would not be requested
by the widget, because it thought it was being focused over and over,
instead of focused, and then clicked (focus followed by click is
default input panel popup behavior on Symbian).
AutoTest: Included and passed
RevBy: yoann
RevBy: Jan-Arve
|
|\ \
| |/
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| | |
Conflicts:
configure.exe
examples/multimedia/audioinput/audioinput.cpp
src/corelib/io/qfsfileengine.cpp
src/gui/egl/qegl_wince.cpp
src/gui/egl/qeglproperties.cpp
src/gui/egl/qeglproperties_p.h
src/gui/embedded/directfb.pri
src/gui/kernel/qapplication_win.cpp
src/gui/painting/qdrawutil.cpp
src/opengl/qgl_p.h
src/sql/drivers/odbc/qsql_odbc.cpp
src/sql/drivers/odbc/qsql_odbc.h
tests/auto/auto.pro
tests/auto/qgl/tst_qgl.cpp
translations/assistant_adp_ru.ts
|
| |
| |
| |
| | |
Reviewed-by: cduclos
|
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| | |
Before doing anything we need to make sure that we don't leave anything
in a non-consistent state. When hiding a widget we need to make sure that
no mouse_down events are active, because the mouse_up event will never be
received by a hidden widget or one of its descendants. The solution is
simple, before going through with this we check if there are any
mouse_down events in progress, if so we check if it is related to this
widget or not. If so, we just reset the mouse_down and then we continue.
In X11 and Windows we send a mouse_release event, however we don't do that
here because we were already ignoring that from before. I.e. Carbon did
not send the mouse release event, so we will not send the mouse release
event. There are two ways to interpret this:
1. If we don't send the mouse release event, the widget might get into an
inconsistent state, i.e. it might be waiting for a release event that
will never arrive.
2. If we send the mouse release event, then the widget might decide to
trigger an action that is not supposed to trigger because it is not visible.
Task-number: QTBUG-8604
Reviewed-by: denis
|
| |\
| | |
| | |
| | |
| | |
| | |
| | |
| | | |
4.6-integration
* '4.6' of scm.dev.nokia.troll.no:qt/oslo-staging-1:
Remove unwanted code after c027f0ae1967ec1d64cb2c9679c8b57f18faf7f5
ActiveQt Internet Explorer component causes Desktop Icons to flicker.
|
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | | |
This happens only if IE is embedded in an frameless window. The repaint
caused by calling EnableModeless() is making the desktop icons flicker.
This repaint generated via ActiveQt will be ignored by QtGui. This is
done by checking if the window style is already in the required state
or not.
Task-number: QTBUG-8355
Reviewed-by: Denis
|
|\ \ \
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | | |
4.7-integration
* '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1: (63 commits)
doc: Fixed some qdoc errors.
Setting ImhHiddenText for NoEcho line edits is not 100% correct, but still way better than fully visible text.
Allow building documentation without all of Qt
Added a documentation for the new enum value in gesture api.
Remove the OBJECTS_DIR variable assignment from some projets in Qt.
Fix compile
qmake/MinGw: Link statically for Qt Creator to be able to detect it.
Enable two fast path for blend_tiled_rgb565
Avoid QString reallocation for smallcaps fonts in Itemizer::generate()
Make QLabel::text a reloadable property
remove non wifi interfaces from being handled.
Disable auto-uppercasing and predictive text for password line edits.
Avoid QString reallocation in QTextEngine::itemize()
Remove the Qt 4.7 #if guards that were needed for 4.6
Always redraw the complete control when an input event comes in.
Make sure not to crash if createStandardContextMenu() returns 0 (e.g. on Maemo5)
Fix compilation: include QString in order to use QString.
Fix compile
Block the Maemo5 window attribute values from being assigned to something else on other platforms.
be more verbose when warning about incompatible libraries
...
|
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | | |
This allows to switch certain attributes on or off without copy/pasting
lots of code. Used to switch off mutually exclusive attributes, e.g. the
Mac*Size attributes, or Maemo's portrait/landscape attributes.
Reviewed-by: Robert Griebl
|
| | | |
| | | |
| | | |
| | | |
| | | |
| | | | |
Fix for some corner cases observed on Maemo 5
Reviewed-by: Robert Griebl
|
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | | |
This commit makes alien widgets opt in on a
per-widget basis on Mac, set the Qt::WA_NativeWindow
flag when creating the widget to enable. Setting
this flag on widgets that have native child or sibling
NSViews is not supported.
The main use case for alien widgets on Mac is to
improve performance for applications that have complex
user interfaces. Qt can handle thousands of widgets
per window, while Cocoa is designed to use a smaller
number of NSViews in combination with NSCells and
custom control implementations. This commit moves
us in the direction of having a few main NSViews with
"leaf" qwidgets implemented as a custom control.
|
|/ / / |
|
|\ \ \
| |/ /
| | |
| | |
| | |
| | | |
Conflicts:
qmake/generators/symbian/initprojectdeploy_symbian.cpp
qmake/generators/symbian/symmake_abld.h
|
| |/
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| | |
The logic used in this commit is partially taken from sliders.
This commit makes it possible to interact (change row or column)
in itemview even itemview does not have editFocus. Interacting without
editFocus is enabled when it is not possible to keypad navigate to
reuqested direction. In addition if keypad navigation to any direction is
not possible (i.e there is only one listwidget on screen), there is no
sense to add "done" softkey to get out of edit focus.
Task-number: QTBUG-4802
Reviewed-by: Alessandro Portale
|
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| | |
QCocoaView has two "back" pointers ot its owning QWidget
and the corresponding QWidgetPrivate. The lifetime of the
QCocoaView might be longer and that of the QWidget if Cocoa
itself holds references to it. In addition accessing a
QWidget that is being destroyed is not safe.
Set both pack pointers to NULL in ~QWidget. This prevents
following stale pointers in the QCocoaView callbacks. This
also means that we'll see the NULL pointers, add gurads for
that.
|
|\ \
| |/
| |
| |
| | |
Conflicts:
qmake/generators/symbian/symmake.cpp
|
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| | |
Softkeys need to be updated also when Qt activewindow is set to NULL,
this is needed that usecase where last Qt widget is closed works
correctly. I.e. closed widget softkeys has to be removed, and replaced
by default "Exit" softkey. Earlier only window activation or widget
focusIn event caused softkey update.
In addition IsDisplayingMenuOrDialog does not work correctly under all
circumstances. Sometimes when menu is being launched the Qt gets
focusChanged event before the menu is actually shown, but menu CBA is
already created. This is fixed by checking that we update CBA only when
AppUi CB is the current one. This assumption works as long as Qt uses
only the CBA created by S60 application framwork and does not create
other CEikButtonGroupContainer instances.
Task-number: QTBUG-6115
Reviewed-by: Sami Merila
|
|\ \
| |/ |
|
| |\
| | |
| | |
| | |
| | |
| | |
| | | |
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
|
| | |
| | |
| | |
| | |
| | |
| | | |
backport of 64d38ba23b4acc46fdb9145f1953315573e3f8dc
Reviewed-by: Anders Bakken<anders.bakken@nokia.com>
|
|\ \ \
| |/ /
| | |
| | |
| | |
| | | |
Conflicts:
src/gui/kernel/qcocoapanel_mac.mm
src/gui/kernel/qcocoasharedwindowmethods_mac_p.h
|
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | | |
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
|
| |\ \
| | | |
| | | |
| | | |
| | | | |
Conflicts:
dist/changes-4.6.2
|
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | | |
This fixes the qmlviewer "sluggish animations and lost
mouse events" issue by making sure we don't block and
wait for for the screen refresh when flushing the
backing store to the screen.
NB: This commit fixes build issues found in f5f62c0bed.
Review: msorvig
Details:
- Don't force repaints, flush the backingstore in response
to a Cocoa paint/display events only.
- Flush once per window.
- Get the CGContext from the window (don't create a new one)
- Don't call CGContextiFlush on the context.
|
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | | |
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
|
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | | |
The window surface must be deleted while the window is valid because on
some graphics systems a notifcation is sent to the window when the
surface is released.
This fix is also an optmization as we no longer process any backing
store requests while deleting the top-level. Previously it would
handle requests from the window itself and all its children.
Task-number: QT-2513
Reviewed-by: jbarron
|
| |/ /
| | |
| | |
| | |
| | |
| | |
| | | |
Now we check that and skip it from the tab list. Auto-test included.
Reviewed-by: leo
Task-number: QTBUG-7532
|
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | | |
This reverts commit 424eabac69df3234006669a69ca0ec9653e4ce63.
The commit changed behavior of WA_QuitOnClose when WA_DontShowOnScreen
was used, but WA_DontShowOnScreen should only have visual effects.
Reviewed-by: Bjørn Erik Nilsen <bjorn.nilsen@nokia.com>
|
|\ \ \
| |/ /
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | | |
Conflicts:
src/gui/kernel/qeventdispatcher_mac.mm
src/gui/kernel/qt_cocoa_helpers_mac.mm
src/gui/widgets/qmenu_mac.mm
tests/auto/qgraphicswidget/tst_qgraphicswidget.cpp
tools/assistant/tools/assistant/centralwidget.cpp
tools/linguist/lupdate/main.cpp
|
| |\ \
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | | |
4.6-integration
* '4.6' of scm.dev.nokia.troll.no:qt/oslo-staging-1:
Doc: Fixed broken link.
Doc: Added a warning about the Accelerated Graphics Driver example.
Doc: Fixed installation information for Qt for Embedded Linux.
fix copy-paste error
minor optimization
Autotest: add a test for allowing hostnames ending in dot
Fix QUrl::toAce for domains with dot at end
Fix NSCFNumber autorelease warning on Mac.
Add a reference to adjustSize() from the size property
Fix the parallel build of QtWebKit
|
| | | |
| | | |
| | | |
| | | |
| | | | |
Task-number: QTBUG-7401
Reviewed-by: TrustMe
|
|\ \ \ \
| |/ / /
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | | |
Conflicts:
doc/src/deployment/deployment.qdoc
doc/src/getting-started/installation.qdoc
examples/assistant/simpletextviewer/findfiledialog.cpp
examples/assistant/simpletextviewer/findfiledialog.h
examples/assistant/simpletextviewer/mainwindow.cpp
examples/webkit/fancybrowser/main.cpp
src/corelib/global/qglobal.h
src/gui/dialogs/qfiledialog_win.cpp
src/plugins/qpluginbase.pri
src/qbase.pri
tests/auto/selftests/expected_cmptest.txt
tests/auto/selftests/expected_crashes_3.txt
tests/auto/selftests/expected_longstring.txt
tests/auto/selftests/expected_maxwarnings.txt
tests/auto/selftests/expected_skip.txt
tools/assistant/compat/config.cpp
tools/assistant/compat/config.h
tools/assistant/compat/docuparser.cpp
tools/assistant/compat/docuparser.h
tools/assistant/compat/fontsettingsdialog.cpp
tools/assistant/compat/helpdialog.cpp
tools/assistant/compat/helpdialog.h
tools/assistant/compat/helpdialog.ui
tools/assistant/compat/helpwindow.cpp
tools/assistant/compat/helpwindow.h
tools/assistant/compat/index.cpp
tools/assistant/compat/index.h
tools/assistant/compat/lib/qassistantclient.cpp
tools/assistant/compat/lib/qassistantclient.h
tools/assistant/compat/main.cpp
tools/assistant/compat/mainwindow.cpp
tools/assistant/compat/mainwindow.h
tools/assistant/compat/mainwindow.ui
tools/assistant/compat/profile.cpp
tools/assistant/compat/profile.h
tools/assistant/compat/tabbedbrowser.cpp
tools/assistant/compat/tabbedbrowser.h
tools/assistant/compat/tabbedbrowser.ui
tools/assistant/compat/topicchooser.cpp
tools/assistant/compat/topicchooser.ui
tools/assistant/lib/qhelpsearchquerywidget.cpp
tools/assistant/tools/assistant/centralwidget.cpp
tools/assistant/tools/assistant/doc/assistant.qdocconf
tools/assistant/tools/assistant/helpviewer.cpp
tools/linguist/lupdate/main.cpp
tools/qdoc3/test/assistant.qdocconf
tools/qdoc3/test/designer.qdocconf
tools/qdoc3/test/linguist.qdocconf
tools/qdoc3/test/qmake.qdocconf
tools/qdoc3/test/qt-build-docs.qdocconf
tools/qdoc3/test/qt.qdocconf
|
| | | |
| | | |
| | | |
| | | | |
Reviewed-by: Sami Merila
|
| |/ /
| | |
| | |
| | |
| | |
| | |
| | | |
If Avkon components support transparency then dialog background is transparent
enabling rounded corners.
Reviewed-by: Sami Merila
|
| | |
| | |
| | |
| | |
| | |
| | |
| | | |
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
|
| | |
| | |
| | |
| | | |
Task-number: QTBUG-6810
|
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | | |
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
|
| |\ \
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | | |
qt-integration
* '4.6' of scm.dev.nokia.troll.no:qt/oslo-staging-2:
Export QGLShareRegister because qgl_share_reg() is exported
Fix upside down PVR compressed textures.
Make sure a context is current when loading compressed textures.
Fix possible off-by-one inconsistency against system look and feel when
Fixes broken graphics effect auto tests.
Doc: Explicitly mention that QWidget/QGraphicsItem takes ownership of effects.
Remove id property from QGraphicsObject
Minor fixes to softkey dimming support (commit 245c9cc0).
FEP returns the wrong foreground color in GetFormatOfFepInlineText
|
| | | | |
|
| |\ \ \
| | |/ /
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | | |
qt-integration
* '4.6' of scm.dev.nokia.troll.no:qt/oslo-staging-2:
Fix GL_BGRA formats under OpenGL/ES systems
Compilation fix
Assert in designer while drag & dropping items from a QListWidget
Fixed memory leaks when removing a QGraphicsEffect from a QGraphicsItem or QWidget
Fix the toolbars docking
Added dimming support for disabled softkeys in Symbian.
Remove compilation warning from S60pixelMetrics on ARM
Button and LineEdit/TextEdit theme colors are incorrect
QS60Style: Overwrites correct stylehint color values
MMP_RULES overriding qmake variables now warns user
Switched S60 QDesktopServices implementation to CDocumentHandler based.
Fixed "...QString::QString(const char *)... is deprecated" warning.
Unnecessary symbian version checks in sqldrivers.pro
QS60Style: Always store changed theme palette
|