| Commit message (Collapse) | Author | Age | Files | Lines |
|
|
|
|
|
|
|
|
|
|
|
|
|
| |
When QLineControl was split out of QLineEdit, a regression was
introduced. When the layout direction was altered by a key press,
the layout direction of the QLineControl would be set, but not the
QLineEdit. This would in turn mean that QLineEdit would use the wrong
layout direction for its visual alignment. Patch is a small hack to
read back the layout direction from the control after it has been
set.
Task-number: QTBUG-11204
Reviewed-by: Trond
(cherry picked from commit d198186cdb18bbb9428ca51e8771cc4fd9563452)
|
|
|
|
|
|
|
|
|
|
|
| |
fullscreen on Mac OS X.
We are just enforcing what the documentation
recommended.
Task-number: QTBUG-13772
Reviewed-by: Samuel
(cherry picked from commit 5fd505cac71e97cf181c0d05867a77e640814fc6)
|
|
|
|
|
|
|
|
| |
That would happen because the loop to find the next action when
navigating with the keyboard was not good enough.
Task-number: QTBUG-11823
(cherry picked from commit 8ea60a39a8c4661db505a6dc1342e524ec2e460c)
|
|
|
|
|
|
|
|
|
|
| |
It could happen that a dock area could be too wide. The problem
was that we didn't really care whether or not the tab bar was visible.
We would always take its minimum sizehint into account.
Task-Number: QTBUG-10391
Reviewed-By: gabi
(cherry picked from commit 8f53bf1b99d32caaebe8cbd1d9bd3a7381821988)
|
|
|
|
|
|
|
|
|
|
|
| |
Only the leftmost tab was being correctly laid out after the move due
to a mistake in QTabBarPrivate::layoutTab().
Auto-test included.
Reviewed-by: Thierry
Task-number: QTBUG-10052
(cherry picked from commit 4743831d128dfad4ac9fbafa6e7544dbe7fb7ed2)
|
|
|
|
|
|
|
|
|
|
|
| |
We were scrolling horizontally even though the widget already fit the
visible area horizontally. And conversely for vertical scrolling.
Improves commit f1e92b2fdf6b6fd8aca0d05176c647dd68e21baa.
Reviewed-by: Thierry
Task-number: QTBUG-9425
(cherry picked from commit fa175f7c09e6e664f347ac9804b1a7db1d997ef2)
|
|
|
|
|
|
|
|
|
| |
It could happen (with MDI widgets) that the first actions would not be
visible.
Task-number: QTBUG-9560
Reviewed-by: gabi
(cherry picked from commit 864ace14e12cedd8e8f78841249e5309eb0a0795)
|
|
|
|
|
|
|
|
|
| |
We are now checking that the QAction is not related
to the About or Quit button on Mac OS X
Task-number: QTBUG-7540
Reviewed-by: Morten Sorvig
(cherry picked from commit c19cb39ddbfd93802bfe61ecaa4f737a1bd1c1bb)
|
|
|
|
|
|
|
|
|
|
| |
When a key event is delivered to widgets, we should accept the event if the
widget reacted to it in any way - if either the current item has changed or if
the widget scrolled.
Task-number: QTBUG-6444
Reviewed-by: Prasanth
(cherry picked from commit 77230f7ec9e78ec2d57629ea934ceb1d59eb391e)
|
|
|
|
| |
Reviewed-by: Trust Me
|
|
|
|
|
|
|
|
| |
The code was changed and changed the behaviour. This is
basically a kind of revert.
Reviewed-By: gabi
Task-Number: QTBUG-10735
|
| |
|
|
|
|
|
|
|
|
|
| |
Adding the same menu action object to n menu bars resulted in n
QAction::triggered() signals. Now, we're comparing the active window
with the parent HWND of the menu bar before triggering.
Task-number: QTBUG-10402
Reviewed-by: thartman
|
|
|
|
| |
Task-number: QTBUG-8393
|
|\
| |
| |
| |
| |
| |
| |
| | |
4.6-integration
* '4.6' of scm.dev.nokia.troll.no:qt/oslo-staging-2:
WinCE: QMenuBar::triggered(QAction*) was emitted too often
coding style changes in qmenu_wince.cpp
|
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| | |
Calling QMenuPrivate::activateAction instead of QAction::activate makes
use of the internal recursion guard and fixes this problem.
Also emitting QMenuBar::triggered in the command-in-menu-bar case will
QAction::activate do for us.
Task-number: QTBUG-10358
Reviewed-by: thartman
|
| | |
|
|/
|
|
|
|
|
|
|
| |
The issue was a regression in 4.5 since we introduced styling.
We now set the background role as the menuoption palette
when available.
Reviewed-by: ogoffart
Task-number: QTBUG-10403
|
|
|
|
|
|
|
|
|
|
|
|
|
|
| |
QComboBoxPrivateScroller calls eraserects for menu scroller areas,
expecting the style to fill the gaps. Unfortunately, the QS60Style
does not draw menu scrollers at all
(but they are functional when interacted with).
Therefore, these areas are now drawn as holes.
As a fix, the eraseRect call from provate class
QComboBoxPrivateScroller is removed when "s60 flag" is defined.
Task-number: QTBUG-10371
Reviewed-by: Janne Koskinen
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
| |
Normally Qt uses scrollbuttons together at right (for LeftToRight UI)
side of the horizontal QTabBar; for vertical tab bar, scrollbuttons are
displayed below/above the widget.
Using QTabBar's scroll buttons with touch device that has capacitive
screen, is somewhat hard as the touch area for either of the scroll
buttons is somewhat smallish. So user is experiencing frequent wrong
taps. Making the touch area larger, would make the tabbar tab shape
area smaller, so it isn't a very good solution.
Therefore, when QS60Style is in use, QTabWidget draws the scrollbuttons
on either side of the QTabBar.
Task-number: QT-3104
Reviewed-by: Alessandro Portale
|
|
|
|
|
|
|
|
|
| |
Symbian uses buffer of CEikMenuPaneItem::SData::ENominalTextLength
characters for menu item texts, so truncate any text that is longer
than that.
Task-number: QTBUG-10207
Reviewed-by: Janne Anttila
|
|
|
|
|
|
|
|
|
|
|
|
|
|
| |
This was another regression in QLineEdit introduced with the move to QLineControl
setCursorPosition clear the selection, and setSelection move the cursor position.
So the case where we want the position at the beginning of the selection need
to be handled separately (by doing the selection reverse)
This does not cover the case where the position is in the middle, or outside
the selection, but it is not possible to do.
Task-number: QTBUG-10019
Reviewed-by: jbache
|
|\
| |
| |
| |
| |
| |
| |
| |
| | |
4.6-integration
* '4.6' of scm.dev.nokia.troll.no:qt/oslo-staging-2:
QMenu: Behavior regression
Mac: Graphics View starving user events and sometimes crashes.
Fixed a crash on Windows 7 systems with invalid PrinterPorts entries.
|
| |
| |
| |
| |
| |
| |
| |
| | |
When opening a submenu, and then moving the mouse over the parent menu
margins, the submenu would close, whereas it didn't in 4.5.
Reviewed-by: Olivier
Task-number: QTBUG-9785
|
|/
|
|
|
|
|
|
|
|
|
|
|
| |
RVCT 4 is far more strict with regards to symbol visiblity that RVCT
2.2, and will hide symbols unless all references have default visibility
in the object files. Update the various places in Qt code where the
symbol visibility was set incorrectly for DLL-based platforms (those that
use __declspec(dllimport) and (dllexport).
Note: QtWebkit and QtScript are fixed in different commits.
Task-number: QTBUG-9903
Reviewed-by: Jason Barron
|
|
|
|
|
|
|
|
|
|
| |
This is partial fix to issue 9913.
Now combobox popup is correctly positioned with AVKON StaCon
(Combined Status and Control Pane). Popup is centered onscreen in
this case.
Task-number: QTBUG-9913
Reviewed-by: Janne Anttila
|
|
|
|
|
|
|
|
|
|
|
|
|
|
| |
SH_ScrollView_FrameOnlyAroundContents
- Since Qt 4.6.0, the frame is drawn by PE_Widget, but there we do not take
in account the scrollbar for the case where SH_ScrollView_FrameOnlyAroundContents
is true.
- We also reserved too much space for the border, as we included the
native border as well in the computation, so do not reserve additional
space by setting PM_ScrollView_ScrollBarSpacing to 0
Task-number: QTBUG-9821
Reviewed-by: jbache
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
| |
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
|
|\
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| | |
4.6-integration
* '4.6' of scm.dev.nokia.troll.no:qt/qt-s60-public:
Compile fix
Changed Symbian pkg files to deploy from under epoc32
Remove internal custom pixel metric enums
Hotfix to const usage in 262e98f9a29385f99cd6f768632264e0b621dc01
Fixed S60 softkey implementation to use popup/modal dialog softkeys.
Fixed 'fullsreen with softkeys' mode not to expand under softkey area.
Fixed left softkey regression caused by 7829fe15 in Symbian.
QS60Style: Housekeeping
Custom pixel metric values cannot be inquired from outside the class
Adding custom pixel metrics requires cleaning and rebuilding of QtGui
|
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| | |
Previously softkey implementation assumed that source for softkey
actions is focused widget or activewindow if there is no focused
widget. Since for example pop-up menu does not take focus immediately
in touch enabled devices, the underlying widget softkeys were visible
and usable when menu was open. This lead to problem that underlying
widget could be interacted via softkeys when popup menu was open.
For example as reported in QTBUG-8688, it was possible to close the
underlying filedialog from which the currently active context menu was
launched. It was also possible to open "Options" menu of underlying
widget when context menu was open, leading to situation where several
context menus could be launched via "Actions" item of "Options" menu.
This was reported as an issue: QTBUG-6167
In addition when user started navigating in context menu via keypad,
the menu got focus and softkeys changed to partially correct. Only
partially correct, since context menu "Select" action and "Options"
action had same priority and both associated to LSK. In addition the
context menu action "Cancel" associated to RSK was set to invisible,
meaning that it was also disabled and appeared in sofkeys as dimmed.
All of these issues were fixed by making making the popup and modal
dialogs highest priority softkey source. In case the focused widget
is inside popup or modal dialog it is being used as an initial softkey
source. In addition the softkeys created with
QSoftKeyManager::createAction or QSoftKeyManager::createKeyedAction are
now by default invisible i.e. not visible in context menu and have
special property set to make them still normally enabled in softkeys.
Task-number: QTBUG-6167
Task-number: QTBUG-8688
Task-number: QTBUG-9144
Reviewed-by: Sami Merila
|
|/
|
|
|
|
| |
We remove the group separator so the docs should reflect this.
Reviewed-by: Donald Carr <donald.carr@nokia.com>
|
|
|
|
|
|
|
|
|
| |
The problem here is that a pre-edit string won't be detected by
updateDisplayText(), so the control thinks nothing has changed when
a new pre-edit string is set.
Reviewed-By: Simon Hausmann
(cherry picked from commit 16f30906f6eea3e00351478555f153697a6e186d)
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
| |
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
|