| Commit message (Collapse) | Author | Age | Files | Lines |
|---|
| |\ |
|
| | |\
| | |
| | |
| | |
| | |
| | |
| | | |
Conflicts:
src/corelib/kernel/qobject.cpp
src/corelib/kernel/qobject_p.h
src/network/access/qhttpnetworkconnection.cpp
|
| | | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | | |
if one specify more than one parameter in font-family,
e.g., font-family: Verdana, Arial
Qt should fallback on the second font if the first cannot be found.
QFont::setFamily handle the case when the family name contains a comas,
so we do not need to handle that specially in the css parser code.
Task-number: 252311
Reviewed-by: Thomas Zander
|
| | | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | | |
According to the documentation, QCalendarWidget::setDateTextFormat() should
reset the format if the date is not valid.
New tests included for the formating of this widget.
Task-number: 252943
Reviewed-by: Olivier
|
| | | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | | |
When compiling the QWizard on a Windows system where
QT_NO_STYLE_WINDOWSVISTA is not set and running the app
on an old system that has no Vista support, the app would
crash in the paint event of the Vista Back button. In this
scenario, the Vista Back button is not needed (i.e. the
regular Back button next to the Next button is used), so
the fix is simply to avoid instanciating it altogether.
Reviewed-by: janarve
Task-number: 252662
|
| | | |
| | |
| | |
| | |
| | | |
Task-number: 253619
Reviewed-by: Paul
|
| | | |
| | |
| | |
| | |
| | |
| | |
| | |
| | | |
When the end point of a line in a path is clipped, only closed paths
should have the closing line.
Task-number: 253663
Reviewed-by: Samuel
|
| | | |\ |
|
| | | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | | |
Seems like we were not using the correct functions for setting
the max/min size on a cocoa window. The version we used before included
the unified toolbar, which is wrong. The new one does not.
Task-number: 252642
Reviewed-by: Trenton Schulz
|
| | | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | | |
to include info on Cocoa.
Task-number: 252658
Reviewed-by: Trenton Schulz
|
| |\ \ \ \ |
|
| | | | | | |
|
| | | | | | |
|
| | | | | | |
|
| | | | | | |
|
| | | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | | |
QGraphicsProxyWidgets.
This is still work-in-progress.
|
| | | | | | |
|
| | | | | |
| | | | |
| | | | |
| | | | | |
spontaneous flag is preserved.
|
| | | | | | |
|
| | | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | | |
QGestureRecognizer *must* be the same object for a gesture sequence
(i.e. GestureStarted, GestureUpdated and GestureFinished should use the
same object)
|
| | | | | | |
|
| |\ \ \ \ \
| |/ / / /
|/| / / /
| |/ / / |
|
| | | | |
| | | |
| | | |
| | | |
| | | | |
the Q_GUI_EXPORT macro have been removed, but we still need to export
the classes for the test
|
| | | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | | |
If padding, margin border are set on an menu item with stylesheet,
no space appeared between the text and the shortcut.
Fix that by adding the 12px space, same as in QCommonStyle equivalent
function
Note that this patch also remove unused code, since the variable with
and height were not used.
example to reproduce the bug: the following stylesheet on a mainwindow
that contains a menu with one action with a shortcut
QMenu::item { border: 1px solid red; }
Task-number: 252610
Reveiwed-by: jbache
|
| | | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | | |
The fix for Task 177022 broke the fix for Task 163334.
This commit fixes the regression.
Reviewed-by: janarve
|
| | | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | | |
This commit add a new API to add/find/remove pixmaps into QPixmapCache.
This new extension is based on a key that the cache give you during
the insertion. This key is internally a int which makes all operations
in the cache much more faster that the string approach.
Auto-tests has been extended as well and a benchmark has been added to
compare both approach. I also depecrate the find method for the
string API to have a method pointer based and not reference based like
the Qt policy says.
Reviewed-by: bnilsen
Reviewed-by: andreas
Followed-deeply-by: trond
|
| | | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | | |
QStyleOptionGraphicsItem extends QStyleOption with three values:
1) matrix, 2) levelOfDetail, 3) exposedRect, and they all
involve expensive QTranform operations when calculated. We
pass style option(s) to drawItems() and paint(), but the
extended values are usually not in use. We can therefore gain
quite some nice speedup by making them opt-in with the
QGraphicsItem::ItemUsesExtendedStyleOption flag.
Additionally, QStyleOptionGraphicsItem::levelOfDetail has been
obsoleted, and a new function QStyleOptionGraphicsItem::
levelOfDetailFromTransform(const QTransform &) has been added.
Me and Andreas don't consider this change to be too controversial
even though it changes the behavior.
Auto tests still pass.
Reviewed-by: Andreas
|
| | |\ \ \
| | | |/
| | |/|
| | | |
| | | | |
Conflicts:
tools/macdeployqt/shared/shared.cpp
|
| | | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | | |
QColor::toCmyk() converted the color to RGB and then to CMYK. If the color
was already in CMYK, this conversion change it.
The color is now returned directly if it is in CMYK
Reviewed-by: Ariya
Task-number: 253625
|
| | | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | | |
Some text drawn with OpenType fonts where cut off by a pixel or two
under certain circumstances. This adds an additional 2 pixel pad margin
to the glyph cache entries. The padding behaves slightly different
when ClearType is enabled/disabled, hence the general 2 pixel padding.
Task-number: 246196
Reviewed-by: Samuel
|
| | | | |
| | | |
| | | |
| | | |
| | | |
| | | | |
Need the proper types.
Reviewed-by: Andy
|
| | | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | | |
view was disabled.
A bug in Commit d5c018f7b014ab794e49d6e1f24e02233555847d prevented any
widget from having focus when QT_NO_GRAPHICSVIEW was defined.
This patch fixes the bug.
Reviewed-by: bnilsen
Task-number: 249589
|
| | | |\ \ |
|
| | | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | | |
QGraphicsItem::deviceTransform() returns the item-to-device transform,
provided with the device-to-scene transform, and combining it with the
item's scene transform. This function is meant to handle items that
enable ItemIgnoresTransformations, but it happened to not work properly
for items that _don't_ enable that flag. Unfortunately this bug is
hard to work around for users from the outside, as it requires you to
check if the item or any ancestor enables ItemIgnoresTransformations.
The fix also removes unnecessary branchs inside QGV so that we use the
same function for all items.
Reviewed-by: bnilsen
|
| | | |/ /
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | | |
If two urls were added to the sidebar that only differed in how they
referenced the added url (i.e. /foo/bar/. and /foo/bar) then only one
entry should appear.
Task-number: 253532
Reviewed-by: Alexis
|
| | | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | | |
Seems like some old legacy code was left behind when sheets behaved as
application modal. This is not the case anymore, so this patch just
removes the special case code for enforcing the old behaviour, and let
carbon do the correct thing instead.
Task-number: 252379
Reviewed-by: Trenton Schulz
|
| | | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | | |
The WinCE build was failing due to a spelling error in an #ifdef
directive.
Reviewed-by: Trust Me
|
| | | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | | |
QColor::toCmyk() converted the color to RGB and then to CMYK. If the color
was already in CMYK, this conversion change it.
The color is now returned directly if it is in CMYK
Reviewed-by: Ariya
Task-number: 253625
|
| | | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | | |
Motif style was incorrectly adjusting it's size in sizeFromConents.
This is wrong and prevents the function from overriding the
huge minimum size on the widget. PM_SplitterWidth already
ensures the proper default size for the splitter.
Task-number: 194542
Reviewed-by: ogoffart
|
| | | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | | |
When showing or hiding spinbox buttons we did not update the
child line edit geometry. This would on windows basically mean that
the buttons would not show up as they were completely covered by the
edit.
Task-number: 235747
Reviewed-by: ogoffart
|
| | | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | | |
Then you can actually influence it's palette.
Task-number: 253495
Reviewed-by: Jens Bache-Wiig
|
| | | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | | |
This feature was only intended for QScrollBar and was incorrectly
inherited by QSlider. The only supported platform that use this
feature seems to be Windows so instead of doing a nasty qobject cast
in the styling it makes more sense to remove the functionality
from QSlider entirely.
Task-number: 245681
Reviewed-by: ogoffart
|
| | | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | | |
While the delegate is somewhat abusing the ToolbarSeparator here,
we should make sure we draw something for small heights as well.
It seems microsoft requires us to allocate a few more pixels for the
separator to actually be visible.
Task-number: 249192
Reviewed-by: ogoffart
|
| | | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | | |
The bug report came from the Declarative UI project as part of Kinetic.
In FxFlickable the mouse is explicitly grabbed inside the mouse press
event handler, and it's (explicitly) released in the release handler.
When doing this, lastMouseGrabber is 0, and the double-click is delivered
as a press. The fix is to not convert the double-click to a press if the
receiver is the first and only mouse grabber (i.e., lastMouseGrabber is
0).
The fix isn't entirely correct, as it can in theory allow an item to
receive a double-click event as the first received event. This seems
to only be possible in the case of using explicit mouse grabbing in
combinations with the press and release event handlers so it's quite
a corner case.
Reviewed-by: Alexis
|
| | | | |
| | | |
| | | |
| | | |
| | | |
| | | | |
In 8cd19116ae81c99fe28fbf91aa7f4c1c08163fe0 we changed viewItems to
always contains the index to the columns 0, even if this columns is
hidden. So this code and comment are now useless.
|
| | | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | | |
So now QToolButton:pressed {text-decoration: underline} will works
The change in QCommonStyle is to make it consistant with the setFont few
lines later.
Reveiwed-by: jbache
|
| | | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | | |
While lupdate ignores ifdefs, it cannot handle ifdefs inside the
translate statement itself.
Task-number: 188337
Reviewed-by: janarve
|
| |\ \ \ \
| |/ / / |
|
| | | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | | |
Seems to work correctly in Cocoa, but we need to handle this special
case in Carbon ourselves.
Task-number: 253324
Reviewed-by: Richard Moe Gustavsen
|
| | |\ \ \
| | |/ /
| | | |
| | | |
| | | | |
Conflicts:
tests/auto/qgraphicsview/tst_qgraphicsview.cpp
|
