| Commit message (Collapse) | Author | Age | Files | Lines |
|
|
|
| |
Reviewed-by: Trust Me
|
|
|
|
|
|
|
| |
I removed a line as an optimization a while ago. Luckily, the
autotest cought a failure doing so. So we put the line back in.
Reviewed-by: Prasanth
|
|\
| |
| |
| |
| |
| |
| |
| | |
4.6-integration
* '4.6' of scm.dev.nokia.troll.no:qt/oslo-staging-1:
doc: Added discussion on connecting signals that have default arg values.
Stack overflow when closing a Color panel in Cocoa.
|
| |
| |
| |
| |
| |
| |
| |
| |
| | |
The QCocoaColorPanelDelegate was going into an infinite recrusion in this
particular case. The patch guards the delegate from calling accept() or
reject() more than once.
Task-number: QTBUG-6636
Reviewed-by: Richard Moe Gustavsen
|
|\ \
| |/ |
|
| |\
| | |
| | |
| | |
| | | |
Conflicts:
mkspecs/macx-g++40/qplatformdefs.h
|
| | |
| | |
| | |
| | |
| | |
| | | |
[NSFontManager setTarget] is not available on 10.4.
Rev-by: Richard Moe Gustavsen
|
|\ \ \
| |/ / |
|
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | | |
qfontdialog_mac.mm needs to handle exceptions thrown by Cocoa,
even if Qt is configured with if -no-exceptions.
This ads a bit of qmake logic for the benefit of a single file,
but I would like to keep -no-exceptions working. The savings
are significant (around 10-15%).
Revby: Richard Moe Gustavsen
|
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | | |
The crash occured since d->cancelAction is child of d->cancelButton,
which is essentially same as d->cancel pointer. Due to parent/child
relationship, deleting d->cancel deleted also chilren including
cancelAction. Then explicitly deleting already deleted
d->cancelAction (dangling pointer) caused KERN-EXEC 3 crash.
There is no need to delete d->cancelAction since it is deleted via
parent/child relationship.
Task-number: QTBUG-6109
Reviewed-by: Miikka Heikkinen
|
| |\ \ |
|
| | | |
| | | |
| | | |
| | | | |
Reviewed-by: denis
|
| |/ /
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | | |
If you passed in a QFont with a family name that did not resolve to
QFontDialog::getFont(), it would not select any font in the panel,
and it would always return the default font, regardless of what you
actually selected in the dialog. This was because it would try to
resolve the requested family name, rather than the actual family name
of the initial font. That in turn caused the NSFont* returned by the
system to be null, which, when set on the font manager, caused the
manager to always return 0 for selectedFont.
Task-number: QTBUG-6071
Reviewed-by: Trond
|
| | |
| | |
| | |
| | |
| | |
| | | |
The line removed in the patch is done so as a result of
change 639b9c0286f0f2d5e50121df8d4125f029074510. That change
made the interrupt do an extra round in the event dispatcher.
|
| | |
| | |
| | |
| | | |
Over src/ tools/ examples/ and demos/
|
| | |
| | |
| | |
| | | |
Reviewed-by: prasanth
|
| |\ \ |
|
| | |\ \ |
|
| | |\ \ \
| | | | | |
| | | | | |
| | | | | |
| | | | | | |
Conflicts:
src/gui/painting/qblendfunctions.cpp
|
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | | |
Basically, QFileDialog on Desktop performs heavy event handling tweaks
on the lineedit and listview to make them ultra keyboard friendly.
We added many "anti"-hacks for Keypadnavigation to restore the native
behavior of the widgets. The result is pure unmaintainability.
(I admit that most of these "anti"-hacks were my fault, since I
participated in some and reviewed all of them)
This commit has results in the same native behavior for Keypad
navigation but without having the #ifdefs inside the event handling
switches.
Only one of these switch-#ifdefs was there before and still is.
embeddedlinux and wince should still be fine and without unintended
behavioural changes compared to Qt 4.5, since the
Qt::NavigationModeKeypadTabOrder case stays unchanged.
Reviewed-by: axis
Reviewed-by: Sami Merila
modified: src/gui/dialogs/qfiledialog.cpp
|
| |\ \ \ \ \
| | | |_|/ /
| | |/| | |
| | | | | |
| | | | | | |
Conflicts:
dist/changes-4.6.0
|
| | | |/ /
| | |/| |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | | |
QPrintPreviewWidget wasn't following the Qt API naming convention of
*Count()/set*Count(). Introduce proper function, and obsolete the old.
Removed all usage of the old function in Qt.
Reviewed-by: Andreas Aardal Hanssen
|
| | |\ \ \
| | | |/ / |
|
| | |\ \ \ |
|
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | | |
The reason was that we did not handle the color space of the selected
color correctly. When selection from the system palette, the color
points to an index rather than e.g. RGB directly. This patch closes
the gap.
Another, a bit more evil, crash comes when trying to click on
'SelectedMenuItemColor' from the 'Developer' palette. The exact
same behaviour occurs when testing a native cocoa app in xcode
directly. So, to handle this as gracefully as possible, we sourround
the 'run modal' call with try-catch, and makes sure that we don't
quit the dialog until the user actually tells it to.
Bugreport to Apple created (bugreport.apple.com): 7364080
Task-number: QTBUG-4578
Reviewed-by: Prasanth
|
| | |_|/ /
| |/| | |
| | | | |
| | | | |
| | | | | |
Task-number: QTBUG-5547
Reviewed-by: Kim
|
| |\ \ \ \
| | |_|/ /
| |/| | /
| | | |/
| | |/|
| | | | |
Conflicts:
tests/auto/qsqlquery/tst_qsqlquery.cpp
tests/auto/qtextlayout/tst_qtextlayout.cpp
|
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | | |
Running an open file dialog, for example with QFileDialog::getOpenFileName() can lead to a freeze if the user selects a folder, then selects a file in the parent folder and finally confirms the open dialog.
Merge-request: 1327
Reviewed-by: Richard Moe Gustavsen <richard.gustavsen@nokia.com>
|
| | | |
| | | |
| | | |
| | | | |
Reviewed-by: Trust Me
|
| |\ \ \
| | | |/
| | |/|
| | | |
| | | |
| | | | |
Conflicts:
dist/changes-4.6.0
src/gui/kernel/qevent.h
|
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | | |
For some reason, Cocoa tells us twize whenever a selection
change occurs in the native file dialog. This patch inserts
a check that the selection actually changed before emitting
any signals
Rev-By: Prasanth
|
| |\ \ \ |
|
| | |\ \ \
| | | |/ / |
|
| | | | |
| | | | |
| | | | |
| | | | | |
Reviewed-by: tom
|
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | | |
Reviewed-by: tom
Squash me with Fix THREAD and TOOLBAR a6e785b4ff9ec9cd48
|
| |\ \ \ \
| | | |/ /
| | |/| | |
|
| | |/ /
| | | |
| | | |
| | | | |
Reviewed-by: Trond
|
| |/ /
| | |
| | |
| | |
| | |
| | |
| | |
| | | |
Made it possible to navigate out of QFileDialog details view using
keypad navigation.
Task-number: QTBUG-4793
Reviewed-by: Alessandro Portale
|
| | |
| | |
| | |
| | | |
Reviewed-by: Denis Dzyubenko
|
| | |
| | |
| | |
| | | |
Amending the previous merge request
|
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | | |
shouldShowFileName() can be called with an empty filename, but must not
create and use a QFileInfo("") since that has known undefined behavior.
So just return NO right away for empty filenames.
Merge-request: 1765
Reviewed-by: Richard Moe Gustavsen <richard.gustavsen@nokia.com>
|
|/ /
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| | |
Currently if we launch QMessageBox::aboutQt(), the dialog grows
too large to fit into any kind of device display.
To fix this, we have added a QTextEdit instead of QLabel into
QMessageBox. QTextEdit automatically adds scrollbars to its content,
if the text won't fit into the designated area.
This change causes error QTBUG-6853. This is due to that QTextEdit
does not support activating external links.
Task-number: QTBUG-3232
Reviewed-by: Alessandro Portale
|
| |
| |
| |
| |
| |
| |
| | |
This will result in a warning if the path entered doesn't exist,
which is the behavior of native applications.
Reviewed-by: Prasanth
|
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| | |
Softkeys have a QAction that is related to some action widget.
The initial state of the action was set according the state of action
widget (enabled/disabled). Now, if action widget's state changes,
the softkey's action remain in the initial state.
This was fixed by removing the enable/disable from the QAction and
instead use the real state of action widget when handling the
command of softkey.
Task-number: QTBUG-4619
Reviewed-by: Janne Anttila
|
| |
| |
| |
| | |
ifdef out QCocoaPrintPanelDelegate.
|
| |
| |
| |
| |
| |
| |
| |
| |
| | |
The native filedialog will not exit if it is told to
hide. To remedy this, we just add an extra interrupt call
so to inform the event dispatcher that it needs to return
the the event loop to check if it has been told to quit
Rev-By: olivier
|
| |
| |
| |
| | |
Rev-By: olivier
|
| |
| |
| |
| |
| |
| |
| |
| |
| | |
When we select save as PDF in the print dialog, we get a new
PMPrintSession in the printInfo object, while our stored
one is deleted, so we update the pointer to be on the safe
side
Reviewed-by: msorvig
|
| |
| |
| |
| |
| |
| | |
Added the missing defines
Reviewed-by: Denis
|
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| | |
This code was kind of dead anyway because
- On X11 and Windows, most of the widgets have the StrongFocus FocusPolicy
- On Mac, e->modifiers always contains KeypadModifier for arrows, so the
code is never reached on mac with real applications
Morever, QAbstractButton already have a more complex handling of arrow keys.
And the code breaks the QButtonGroup arrowKeyNavigation test on Mac (as when
the test system simulates events, the KeyPadModifier is not set)
Reviewed-by: mbm
Reviewed-by: Paul
|