| Commit message (Collapse) | Author | Age | Files | Lines |
|\
| |
| |
| |
| |
| | |
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
|
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | | |
QWidget
with setGraphicsEffect(0).
The effect was not deleted in that case, problem solved for both QGraphicsItem
and QWidget.
Autotest included.
Task-number: QTBUG-5917
Reviewed-by: bnilsen
|
| |\ \ \
| | |/ /
| | | |
| | | |
| | | |
| | | | |
Conflicts:
src/gui/kernel/qcocoapanel_mac.mm
src/gui/kernel/qcocoawindow_mac.mm
|
| | | |
| | | |
| | | |
| | | | |
RevBy: Trust me
|
| |/ /
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | | |
If the touch event comes from a touchpad it doesn't seem necessary to send fake
mouse events. At least on the platform that actually supports touchpad events
(i.e. Mac) native apps don't do that and the current implementation breaks
popup handling - since touch events are only sent by default if two or more
fingers touch the touchpad, we send fake MouseButtonPress when second finger is
pressed and MouseButtonRelease when the second finger is released - i.e. at the
same time when the system send scrollWheel events. This causes the active popup
to close when using two-finger scroll gesture.
Reviewed-by: Brad
|
| | |
| | |
| | |
| | | |
Reviewed-by: TrustMe
|
|\ \ \
| |/ /
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | | |
Conflicts:
doc/src/modules.qdoc
examples/assistant/simpletextviewer/findfiledialog.cpp
examples/webkit/fancybrowser/mainwindow.cpp
src/gui/widgets/qtabbar.cpp
src/gui/widgets/qtabbar_p.h
tests/auto/qpixmap/tst_qpixmap.cpp
tools/assistant/compat/helpdialog.cpp
tools/assistant/compat/tabbedbrowser.cpp
translations/translations.pri
|
| | |
| | |
| | |
| | |
| | | |
Task-number: QTBUG-5804
Reviewed-by: denis
|
| |\ \
| | | |
| | | |
| | | |
| | | | |
Conflicts:
configure.exe
|
| | | |
| | | |
| | | |
| | | | |
Task-number: QTBUG-5432
|
| |\ \ \
| | |/ / |
|
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | | |
When enabling/disabling a widget or changing its InputMethodEnabled attribute,
use the focus proxy widget's input context for reset and for setting the focus
widget on the input context.
Task-number: QTBUG-5781
Reviewed-by: Denis
|
| |\ \ \
| | |/ / |
|
| | | |
| | | |
| | | |
| | | | |
Reviewed-by: owolff
|
|\ \ \ \
| | |/ /
| |/| | |
|
| | | |
| | | |
| | | |
| | | | |
And not rely on random QT_USE_NAMESPACE being pulled in from *.moc files.
|
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | | |
* Get rid of QGraphicsEffectSource from the public API, instead add
convenience functions in QGraphicsEffect. This way we commit to less
API, and are free to introduce a customizable QGraphicsEffectSource
in a future release.
* Move PixmapPadMode into QGraphicsEffect and tweak the names of the
enum values.
* Make QGraphicsBlurEffect::BlurHint into a bit flag, for extensibility.
Reviewed-by: Bjørn Erik Nilsen
|
| | | |
| | | |
| | | |
| | | | |
Reviewed-by: Trust Me
|
| |/ /
|/| |
| | |
| | |
| | |
| | |
| | |
| | |
| | | |
Fixed bug where QPixmap::grabWidget() would return a pixmap of a
different size that the widget if the widget had not yet been shown or
resized. Updated the qpixmap autotest.
Task-number: QTBUG-4149
Reviewed-by: Trond
|
|\ \ \
| | | |
| | | |
| | | |
| | | | |
Conflicts:
src/corelib/tools/qscopedpointer.h
|
| | | |
| | | |
| | | |
| | | | |
And not rely on random QT_USE_NAMESPACE being pulled in from *.moc files.
|