| Commit message (Collapse) | Author | Age | Files | Lines |
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
| |
Instead of using traditional dropdown menus, use popup menu, like
native side does.
Related to https://qtrequirements.europe.nokia.com/browse/QT-2274
Popup is positioned according to S60 popup position rules:
- in portrait at the bottom, with square popup (dimension is
screen width minus border)
- in landscape, centered on Y-axis, on X-axis to the right
border (with LeftToRight UI direction)
Background behind popup is dimmed.
Popup has automatic scrollbar if content does not fit into the popup.
Popup background graphic is S60 dialog graphic.
Task-number: QT-2274
Reviewed-by: Alessandro Portale
|
|
|
|
|
|
|
|
|
|
|
|
|
|
| |
This change is done to enable QMenuBar usage and related "Options"
softkey also on other than QMainWindow objects. For example with this
change it is possible to create menubar and set it to QLayout by using
setMenuBar, and it will then be usable via "Options" softkey.
This functionality makes it easy to use different menus for different
views in QStackedWidget.
Task-number: QT-2275 (Not yet finished, but related)
Reviewed-by: Sami Merila
Reviewed-by: Alessandro Portale
|
|
|
|
|
|
|
|
|
|
| |
Don't recreate the menu handles on every rebuild.
Now, we clear the menu before rebuilding.
Also, we have to clear the menu before destroying the menu bar handle.
Otherwise, DestroyWindow kills our menu handles.
Task-number: QTBUG-8754
Reviewed-by: thartman
|
|
|
|
|
|
|
|
| |
QLineEditPrivate::_q_selectionChanged() did not take into account
whether the widget had focus.
Reviewed-by: Olivier
Task-number: QTBUG-8634
|
|
|
|
| |
Reviewed-by: mauricek
|
|
|
|
|
| |
Task-number: QTBUG-7921
Reviewed-by: ogoffart
|
|\
| |
| |
| |
| |
| |
| | |
4.6-integration
* '4.6' of scm.dev.nokia.troll.no:qt/qt-s60-public:
Fixed crash in Symbian when having empty QMenu in menubar.
|
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| | |
Typically cascade menus in Symbian/S60 are created from resources.
When cascade menus are defined in resources the RestoreMenuL is
responsible for instantiating the cascade menu item array and items.
In Qt for Symbian the menus need to be created dynamically from
QActions, that's why RestoreMenuL is reimplemeted in Qt for Symbian
to dynamically init the menu pane content. Adding a first dynamic
item to cascase menu pane creates the CEikMenuPane internal item array.
In case where empty QMenu was added to QMenubar, the item array for
cascade menupane was never constructed. Then later on CEikMenuPane code
assumes that item array exist. To avoid access violation crash we now
create the item array manually when building submenu.
Task-number: QTBUG-4897
Reviewed-by: Jason Barron
|
|/
|
|
|
|
|
|
|
|
|
| |
The problem here is caused by the fix to QTBUG-6200. For this fix we
removed the lines that deleted the item because the iterator might be
invalid at that point. However, we still need to delete the iterator. The
solution is to not use the iterator and ask the hash to delete the item,
since the remove function will not crash if the item is invalid.
Task-number: QTBUG-8633
Reviewed-by: Prasanth
|
|
|
|
|
|
|
|
| |
See original commit (b461da1040c32d6690870290d6716a3b5cb7e9e9)
for more information.
Task-number: QTBUG-6220
Reviewed-By: TrustMe
|
|
|
|
|
|
|
|
|
|
|
|
|
|
| |
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
|
|
|
|
|
|
|
|
|
| |
The commit 0568fb9f428a84a344baaa5c53395db4b99f082c introduced this
regression. Make sure that we have text in the lineedit before showing
the cursor.
Task-number: QTBUG-7826
Reviewed-by: Olivier Goffart
|
|\
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| | |
4.6-integration
* '4.6' of scm.dev.nokia.troll.no:qt/oslo-staging-2:
Always use display() in QEglContext, so initialization can occur
Fixed a regression in dockwidgets that would jump when toplevel resized
Stabilize QGraphicsView benchmarks.
Remove platform dependent code from QGraphicsView benchmark.
Compiler warnings in QGraphicsView benchmark.
Stabilize QGraphicsScene benchmarks.
Compiler warning, unusable variable in tst_QGraphicsScene benchmark.
Documented behavior of blur effect radius and drop shadow offset.
Fixed autotest failure in tst_QPainter::drawEllipse on Maemo.
|
| |
| |
| |
| |
| |
| |
| |
| | |
This was reproducible when the main window doesn't contain a central
widget.
Task-number: QTBUG-8107
Reviewed-by: ogoffart
|
| |
| |
| |
| |
| | |
Task-number: QTBUG-6785
Reviewed-by: TrustMe
|
|/
|
|
|
|
|
|
|
|
|
| |
This commit adds support for dynamic i.e. runtime localization of S60
softkeys. Note that translations are not provided yet with qt.sis
(QTBUG-4919), meaning that localization does not actually happen unless
application developer provides its own translation (including translation
for softkeys).
Task-number: QTBUG-6785
Reviewed-by: Jason Barron
|
|\
| |
| |
| |
| |
| |
| |
| |
| |
| |
| | |
4.6-integration
* '4.6' of scm.dev.nokia.troll.no:qt/oslo-staging-1:
Fix the WebKit build
Blinking cursors are 2 pixels wide on Mac OS X/Cocoa.
Fixed compilation with QT_NO_WHEELEVENT
Take into account the solaris-cc-64-stlport mkspec
Updated WebKit from /home/shausman/src/webkit/trunk to qtwebkit/qtwebkit-4.6 ( ffae5e11181a3961193fa21ea405851cad714d4b )
|
| |
| |
| |
| | |
Reviewed-by: Prasanth
|
|\ \
| |/
|/|
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| | |
4.6-integration
* '4.6' of scm.dev.nokia.troll.no:qt/oslo-staging-2:
Make generate uid3 (symbian) work on 64 bit host platform.
Updated the docs for QPainter::begin/endNativePainting()
Compile fix for network benchmarks.
Add a pixmap modification hook to blur pixmap filter cache
Delete benchmark examples (qtestlib-simple and qtwidgets).
Restructure tests/benchmarks directory.
Fixed QImagReader::setAutoDetectImageFormat() to work with plugins.
QLineEdit: regression: read-only line edits would eat shortcuts.
QGraphicsItem: Do not crash at exit if there is static QGraphicsItem.
Make QTextCodec reentrant.
|
| |
| |
| |
| |
| |
| |
| | |
Restore Qt 4.5 behaviour.
Task-number: QTBUG-7395
Reviewed-by: Thierry
|
| |
| |
| |
| |
| |
| |
| |
| |
| | |
Fixed a bad merge in the QAbstractSlider::wheelEvent.
Modified an autotest to follow a change in behavior - scrolling with a
horizontal mouse wheel to the "right" means increasing the value.
Reviewed-by: Richard Moe Gustavsen
|
|\ \
| |/
|/|
| |
| |
| |
| |
| |
| |
| |
| |
| | |
4.6-integration
* '4.6' of scm.dev.nokia.troll.no:qt/oslo-staging-1:
Fixes scrolling horizontally with a mouse wheel over sliders.
Doc: Clarified ownership of custom buttons added to a QDialogButtonBox.
Updated WebKit from /home/shausman/src/webkit/trunk to qtwebkit/qtwebkit-4.6 ( da5d96a26e80162027bc95ce7e5725fe4b277ff7 )
A fix for accidently reused variable names in nested iterations.
Iain's changes for 4.6.2
Doc: Fixed typo.
|
| |
| |
| |
| |
| |
| |
| |
| |
| | |
When scrolling horizontally over sliders the slider should go to the right,
which means the value of the slider should increase. However in Qt scrolling
with a mouse wheel horizontally means the delta value is negative, which is
wrong. So changed the delta to be inversed.
Reviewed-by: Richard Moe Gustavsen
|
| |\ |
|
| | |
| | |
| | |
| | |
| | | |
Reviewed-by: Trust Me
Suggested-by: Robert Griebl
|
|\ \ \
| | |/
| |/|
| | |
| | | |
Conflicts:
dist/changes-4.6.2
|
| | |
| | |
| | |
| | |
| | |
| | |
| | | |
The problem is out of scope and will not be fixed.
Task-number:QTBUG-4377
Reviewed-by:Trust Me
|
|\ \ \
| |/ /
|/| |
| | |
| | |
| | |
| | | |
Manual resolve of conflict in changes-4.6.2 in staging-2.
Conflicts:
dist/changes-4.6.2
|
| | |
| | |
| | |
| | | |
This reverts part of commit d53315d30b38352db11063096ee3867a40bdc234.
|
| | | |
|
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | | |
horizontal scrollbar"
This reverts commit 46a3e518b3070cf7cb4cbbb2cb58254454cf169d.
This shown to cause more problem than it solved
Also update the changelog
Reviewed-by: Thierry
|
| |\ \
| | |/
| |/|
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | | |
4.6-integration
* '4.6' of scm.dev.nokia.troll.no:qt/oslo-staging-2: (22 commits)
Make DSFLIP_ONSYNC part of the default flip flags.
Fixed a failure in tst_qgl.
4.6.2 changes
Avoids a possible crash when saving the state of a main window
Implemented QGifHandler::imageCount().
Fixed compilation of the GL2 engine for OpenGL ES 2.
fix whitespace
Document that QModelIndex::child does not work for the root item
Fixed missing textures in the boxes demo.
Fix QTBUG_7714_fullUpdateDiscardingOpacityUpdate2 autotest in qws-linux
Assert failure when setting a widget focus proxy as its successor in tab order
Fixed garbled 3D Qt logo in the overpainting example.
fix crash in Phonon::DS9 backend
Don't crash when running Qt on KDE with Oxygen style.
Fixes missing update when setting opacity on an item that had opacity 0.0
Avoids missing opacity updates by not propagating the ignoreOpacity flag
Cleanup in graphicsitem autotest
Adds convenience functions QGraphicsItemPrivate::isOpacityNull
Fixed a crash when QPixmaps are destroyed after the ~QApplication.
Fix GL texture leaks when pixmaps are deleted
...
|
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | | |
The crash could appear when saving the state of the main window in
response to the visibilityChanged of the dock widgets.
Task-number: QTBUG-7838
Reviewed-by: ogoffart
|
|\ \ \
| |/ / |
|
| |/
| |
| |
| |
| |
| |
| | |
On the mac, toplevel windows should not have a frame.
This patch simply removes the frame on mac only.
Reviewed-by: trond
|
| |
| |
| |
| |
| |
| |
| |
| |
| | |
When the line edit was refactored into a line control this regression
was introduced. This regression was introduced by change
fb7d86cf23227302d48db279ec589221d11a1f6a.
Task-number: QTBUG-4789
Reviewed-by: Alan Alpert
|
| |
| |
| |
| |
| |
| |
| |
| | |
This patch closes the menu bar if it's open when it gets
destroyed
Task-number: QTBUG-6597
Reviewed-by: cduclos
|
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| | |
The reason is that the test first creates a menu bar with an exit item
The exit item gets merged into the appmenu (together with a QAction)
Then we destroy the menu bar, but leave the exit item in the appmenu untouched.
Then we create a new menubar _without_ an exit item
macUpdateMenubar will then, at one point, try to access the old exit item's
QAction, wich is destroyed a long time ago; crash!
This patch will make sure we clear out all actions in the menu bars appmenu
when the menubar gets destroyed.
Reviewed-by: Prasanth
|
| |\ |
|
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | | |
The crash happens while processing a paint message received by the
NSToolbar after the corresponding QToolbar has been destroyed. So while
cleaning up the toolbar, the view needs to be detached from the custom
toolbar item.
Task-number: QTBUG-7305
Reviewed-by: Carlos Manuel Duclos Vergara
|
| |/
| |
| |
| | |
Task-number: QTBUG-7640
|
|/
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
| |
Implemented features:
Softkey Merging:
Widget can set only one softkey and set flag that rest of the softkeys
shall be taken from parent.
Priority Handling:
If multiple sokftkeys with same role are set, the highest priority
action gets displayed.
Custom Softkey Menu:
By setting QMenu to QAction and assigning a softkey role for that
action, the native menubar will be displayed when sofkey is clicked.
Softkey Image:
Initial code for implementing sofkey image support, the final
implementation is still pending legal acceptance to use
eiksoftkeyimage.h header file which is under EPL license.
Task-number: QTBUG-7315
Review-By: Sami Merila
Review-By: Jason Barron
|
|
|
|
|
|
|
|
| |
The QCocoaToolBarDelegate is not released when destroying the
QMainWindowLayout.
Task-number: QTBUG-7307
Reviewed-by: Prasanth Ullattil
|
|\ |
|
| |\
| | |
| | |
| | |
| | | |
Conflicts:
dist/changes-4.6.1
|
| | |\ |
|
| | | |
| | | |
| | | |
| | | | |
Reviewed-by: Pierre Rossi
|
| | |/
| |/|
| | |
| | | |
symbian headers on Linux are lowercase and this should work on Windows too.
|
| |\ \
| | |/
| | |
| | |
| | | |
Conflicts:
dist/changes-4.6.1
|
| | |\
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | | |
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.
|