| Commit message (Collapse) | Author | Age | Files | Lines |
|
|
|
|
|
|
|
|
|
|
|
|
|
|
| |
The two major points were:
- Replacing "s60" with "symbian" in all event handling functions,
since there is nothing S60-specific about them.
- Replace the Symbian event types with the encapsulating
QSymbianEvent container. This allows us to cope with more types of
events in the future without having to add new virtual functions.
AutoTest: QWidget passed
Task: QT-1156
RevBy: Jason Barron
RevBy: Shane Kearns
RevBy: Sami Merila
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
| |
We should not create a QAction instance at program startup,
that is before QApplication was initialized. One reason not
to do that is that internal fonts are prematurely initialized
without QApplication::qt_is_gui_used set to true, which leads
to wrong font Dpis in qt_defaultDpiX().
This issue was detected due to the failure in tst_QTextLayout,
cases: testDefaultTabs, testTabs, testMultilineTab,
testRightTab, testTabsInAlignedParag, testCenteredTab,
testDelimiterTab, testMultiTab and tabsForRtl.
Fix: create a Q_GLOBAL_STATIC_WITH_ARGS for that QAction
instance.
Reviewed-by: Liang QI
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
| |
The reason for the crash was the following: When we make menu entries
in Qt, we assign each item an arbitrary command ID. This is because
Symbian usually puts the items in a resource file and refers to them
by ID, but we need to be dynamic. These command IDs are also assigned
to cascading menu items (sub menus). When we then get a callback in
RestoreMenuL with one of submenu IDs, we used to ask Symbian to
construct the menu items for them, but Symbian doesn't know about
them.
Fixed by avoiding call into S60 code if the ID belongs to Qt.
Also put a cap on the number of menu items. It's very unlikely that
anyone will reach it, but it's better to have an actual check.
Task: QT-646
AutoTest: Manual testing went fine
RevBy: mread
|
| |
|
| |
|
|
|
|
|
|
| |
These should not be exported anymore after commit c13b97f2.
RevBy: Jason Barron
|
|
|
|
|
|
|
|
|
| |
In S60 softkeys and menu items do not support key accelerators (i.e.
CTRL+X). Therefore, removing the accelerator characters from both softkey
and menu item texts.
Related to task QT-1505 "Make Qt dialogs look native"
Reviewed by Jason Barron
|
|
|
|
| |
The resource compiler still generates files that don't have the LPGL header.
|
|
|
|
| |
Reviewed-by: Trust Me
|
|
|
|
| |
Reviewed-by: Trust Me
|
|
|
|
| |
Reviewed-by: Trust Me
|
|
|
|
| |
Reviewed-by: Jason Barron
|
|
|
|
| |
RevBy: Trust me
|
|
|
|
| |
RevBy: Trust me
|
| |
|
|
|
|
|
| |
Contains some smaller fixes and renaming of macros. Looks big,
but isn't scary at all ;)
|
|
|
|
|
|
|
|
|
|
|
|
|
|
| |
This is more a cleanup of the usage of Q_WS_S60 vs. Q_OS_SYMBIAN than
anything else. One of the side effects of this work was that it was
relatively little work to get QtGui compiling when Q_WS_S60 is not
defined.
Based on this we introduce two new configure options that control S60
integration. Currently the -no-s60 option will not work entirely
because the 's60main' module has not yet been refactored and still has
a dependancy on the S60 libraries.
Reviewed-by: axis <qt-info@nokia.com>
|
| |
|
|
|
|
|
|
|
|
|
|
|
| |
Hold a QPointer to the widget with the context menu. After the menu
pops up, the focussed widget looses focus and may be deleted (like
it happens in this case with the item editor). Testing for isNull()
instead of crashing.
It would be great to not even add the "Action" entry to the system menu
but in that moment we don't know that the current focuswidget will
soon disappear. That's still a Todo.
|
|\ |
|
| |
| |
| |
| |
| |
| |
| |
| | |
Squashed commit of the branch haralds-haralds-qt-s60-topics/topic/exceptions,
which also contains the full history.
Rev-By: Harald Fernengel
Rev-By: Ralf Engels
|
| | |
|
| | |
|
| |
| |
| |
| | |
new improved softkey interface in QWidget
|
| |
| |
| |
| |
| | |
failure. Context menu will be enabled again once the QAction SoftKeyRole
implementation is in state where context menu can be properly supported
|
|\ \
| |/
| |
| |
| |
| |
| | |
softkeys
Conflicts:
src/gui/kernel/qapplication_s60.cpp
|
| |\ |
|
| | | |
|
| |/
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| | |
inside QtGui, we do not need to export those QMenu[Bar]::symbianCommands
through our public API, anymore.
This commit moved the code of QMenuBar::symbianCommands to
QMenuBarPrivate::symbianCommands and made that one static.
QMenu[Private]::symbianCommands was apparently unused -> deleted.
RevBy: Jason Barron
RevvBy: Markku Luukkainen
|
| |
| |
| |
| | |
is instantiated better
|
| |
| |
| |
| | |
is not inside a QMainWindow.
|
| | |
|
| |
| |
| |
| |
| | |
relied on context menus can be implemented concurrently while
making the internals of context menu implementation cleaner.
|
| | |
|
| |
| |
| |
| | |
now on the menu softkey will be set by the brand new softkey stack.
|
|\ \
| |/
| |
| |
| |
| |
| | |
softkeys
Conflicts:
src/gui/widgets/qmenu_symbian.cpp
|
| |
| |
| |
| | |
the example applications
|
| |\ |
|
| | |\ |
|
| | |\ \
| | | | |
| | | | |
| | | | |
| | | | | |
Conflicts:
src/gui/widgets/qmenu_symbian.cpp
|
| | | | | |
|
| | |_|/
| |/| |
| | | |
| | | | |
Fixes a bug when setting a new menubar to QMainWindow
|
| | |/
| |/| |
|
|/ / |
|
| | |
|
|/ |
|
|
|