| Commit message (Collapse) | Author | Age | Files | Lines |
|\
| |
| |
| |
| |
| |
| | |
Conflicts:
src/corelib/global/qfeatures.h
src/gui/painting/qtransform.cpp
util/scripts/make_qfeatures_dot_h
|
| |
| |
| |
| |
| |
| |
| |
| |
| |
| | |
This is not strange since we never did anything to limit a resize within
the max min boundries. This patch factores out the code that ensures
this into a private function that is called both as a reaction to a
resize event, but also if resize is done programatically.
Task-number: 251893
Reviewed-by: Trenton Schulz
|
| |
| |
| |
| | |
Reviewed-by: TrustMe
|
| |\ |
|
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | | |
Ideally we'd let raster pixmap data handle this but QPixmap::fromImage
creates a QPixmapData::PixmapType regardless of the bit depth of the
image so we have to handle this case.
Reviewed-by: Donald <qt-info@nokia.com>
|
| | |
| | |
| | |
| | | |
Reviewed-by: TrustMe
|
| | |
| | |
| | |
| | |
| | |
| | |
| | | |
Refactor two small things so that we don't get warnings when
QT_DIRECTFB_NO_(OPAQUEDETECTION|MOUSE|KEYBOARD) is defined
Reviewed-by: Shane McLaughlin <Shane.McLaughlin@trolltech.com>
|
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | | |
In the GTK+ file dialog filters are only represented by names such as
"All files", while the actual extensions are hidden.
You can create a filter without a name in Qt however so in this case
we have to fall back to showing the file extensions instead.
Task-number: 251928
Reviewed-by: rosch
|
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | | |
The Qt::NoFocusReason is used when Qt temporarily moves the focus to the
QMenuBar while switching from one widget to another.
While this did not result in a QFocusEvent, it did result in emitting
the QApplication::focusChanged signal. This in turn caused a slowness in
Qt Creator, since it wanted to update the current context and find
filter.
The fix here makes sure the focusChanged signal is not emitted when the
focus reason is Qt::NoFocusReason, since these focus changes are not
interesting for the application.
Reviewed-by: mae
|
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | | |
Certain compilers warns on this kind of code:
uchar *mem = ...;
(void**)(&mem)
dereferencing type punned pointer etc.
Since we had this for every call to Lock I put it all into a convenience
function. Also fix some issues where we memcpy'ed more bytes than
necessary (when stride != w * depth() / 8) and fix issue with
QDirectFBScreen::solidFill with pixelFormat == RGB32
Reviewed-by: Donald <qt-info@nokia.com>
|
| | |
| | |
| | |
| | |
| | |
| | |
| | | |
We never resize this surface anyway so it's not necessary. Make it
possible to enable with an option.
Reviewed-by: Donald <qt-info@nokia.com>
|
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | | |
We have code that assumes that m33 = 1 if the type is TxScale. Instead
of changing all that code it's better to just return TxProject as type
when m33 is different from 1.
Reviewed-by: Simon Hausmann
|
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | | |
This basically uses a workaround to hint to our gtk theme that we
do not want it to fill our line edit backgrouns with the background
brush. This was suggested by Benjamin berg. More information can be
found here: https://bugzilla.mozilla.org/show_bug.cgi?id=405421
Reviewed-by: Tor Arne
|
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | | |
When QPrinter::fullPage() was set, pageRect() returned the same as
paperRect(). Under Windows, there is always a non-printable area that
was not taken into account in the fullPage() case.
Task-number: 248881
Reviewed-by: Kim
|
| | |
| | |
| | |
| | | |
Reviewed-by: Thiago
|
| | |\ |
|
| | | |
| | | |
| | | |
| | | |
| | | | |
Task-number: 250971
Reviewed-by: Tom
|
| | |/
| | |
| | |
| | |
| | |
| | |
| | | |
Update the script, and update the generated file.
Reviewed-by: Thiago
Reviewed-by: Paul Olav Tvete
|
| | |
| | |
| | |
| | |
| | |
| | | |
We need to check if the engine is null before we do the thread test.
Reviewed-by: Thiago
|
| | |
| | |
| | |
| | | |
Reviewed-by: Thiago
|
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | | |
The problem is QUrl == operator is case sensitive. On Windows we don't
want double entries for C:\dev or c:\dev so i convert the url in lower
case and compare them (on Windows only) to avoid duplicate entries.
Task-number:226483
Reviewed-by:jasplin
|
| |/
| |
| |
| |
| |
| |
| |
| | |
`q' is 0 during construction of QSvgWidgetPrivate, thus each
QSvgWidget instance was creating a QSvgRenderer with no parent.
Acked-by: Thiago Macieira
Reviewed-by: Shane Bradley
|
| |\ |
|
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | | |
Without this patch Alt-modifiers doesn't work. The extra mappings are
needed for certain keys to work right on atleast one known DirectFB
implementation/hardware combination.
Reviewed-by: Donald <qt-info@nokia.com>
|
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | | |
`-developer-build'.
This was an undocumented hack to make it easier for our autotest scripts
to detect crashes in unit tests. Going forward, it should not be
required.
Reviewed-by: Shane Bradley
Acked-by: Jesper Thomschütz
|
| | |
| | |
| | |
| | | |
Broken by a8d14ae567c7e847c6dbba644c36fbc6c6afc468
|
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | | |
The reason it failed was that we always expected the height property
of the BMP header to be double the height of the icon. The
kde_favicon.ico did not fulfill this requirement. We can fix that by
simply reading from the ICONDIR entry instead, since that has always
the correct height.
Task-number: 229829
Reviewed-by: alexis
|
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | | |
Basically we try to get the toggled look correct and we've shrunk the
size of the toolbar by a good 10 pixels. We still look a bit "off" for
toggled on Tiger, but frankely that look is a bit odd.
We are a bit taller than the pure Cocoa toolbar (2 px), but given that
we are embedding our QToolbar, that's probably the best we can do.
All-in-all, it looks much better.
|
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | | |
xorg.conf
Details: use device name previously found using x-atoms instead of a hardcoded one.
RevBy: Thiago Macieira
Task: 210132 (followup)
|
|\ \ \
| | |/
| |/|
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | | |
Conflicts:
src/gui/graphicsview/qgraphicsitem.cpp
tools/qdoc3/test/assistant.qdocconf
tools/qdoc3/test/designer.qdocconf
tools/qdoc3/test/linguist.qdocconf
tools/qdoc3/test/qmake.qdocconf
tools/qdoc3/test/qt-build-docs.qdocconf
tools/qdoc3/test/qt.qdocconf
|
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | | |
The line edit (to rename the file) contains a guard to avoid double
emit when the editing is finished but this flag was not set back properly
so it was making the line edit not usable afterwards.
Task-number: 251779
Reviewed-by: bnilsen
|
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | | |
into it."
This reverts commit 0985805ab3c7de5b15c115a98afb15944b6d93b9.
The Elastic Nodes example shows a black background for the cache pixmap
if the call to fill isn't there. Alexis and I both agree that it makes
no sense that we fill the pixmap with transparent pixels instead of
just drawing with QPainter::CompositionMode_Source, but since this
regression was introduced after 4.5.0 was released we must revert before
we investigate further.
Reviewed-by: Alexis
|
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | | |
This fixes a bug in 4.5.0 where cached items that call update() after
they have been moved or transformed failed to get a call to paint(),
so the last cache image was used to draw. The easiest way to reproduce
this bug is in the Elastic Nodes example. If you press, wait, then
release, the nodes will consistently move to sunken state, then back
to normal state. But if you click quickly while moving the mouse, the
nodes will stay sunken.
The bug was that the item was marked as dirty as a result of being moved,
and when the mouse button was released, the node item's call to update()
was discarded, as the item was "already dirty".
The fix is to allow invalidation of the cache even if the item is
marked as dirty.
Reviewed-by: bnilsen
|
| | |
| | |
| | |
| | |
| | |
| | | |
The #ifdef was typed wrong.
Reviewed-by: Prasanth Ullattil
|
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | | |
Previously we were calling two times itemChange on the parent to give
QGraphicsItem::ItemChildAddedChange. We don't need that. One is enough.
BT : yes
Task-number: BT
Reviewed-by: Andreas
|
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | | |
Setting a QPrinter to print to e.g. a PDF file and then passing the
QPrinter object to a QPrintDialog didn't update the printer combobox
and filename lineedit states correctly.
Task-number: 224728
Reviewed-by: Samuel
|
| | |
| | |
| | |
| | | |
Task-number: 251776
|
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | | |
QPainter inherits some properties from the widget, among other font and
pen. These are set in the painter's state in initFrom(), but in 4.5 we
forgot to call QPaintEngineEx::penChanged() to let an extended paint
engine know that the pen has changed. This caused the raster engine to
believe it could blit non-opaque text, due to the fast_text flag not
being correctly updated.
Task-number: 251534
Reviewed-by: Paul
|
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | | |
Use painter paths instead of rectangles for perspective transformed
rects, as the rectangles might have been clipped.
Task-number: 251485
Reviewed-by: Trond
|
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | | |
We can't remove an item in the sidebar if the bookmark is not valid
(i.e. link to a non existing directory). ItemViews doesn't allow you
to have disabled items and to select them at the same time, so i have
implemented a delegate that paint in gray if the bookmark is invalid.
So you can click on it and delete it.
Task-number: 251341
Reviewed-by: jasplin
|
| |/
| |
| |
| |
| |
| |
| |
| |
| |
| |
| | |
If the bookmark in the sidebar has an hidden parent and the QFileDialog
is set up to not show hidden files, then clicking on the bookmark move
the current dir to root (like if the bookmark was invalid) instead of
entering in the dir. The fix was to fetch the parent dir and the
bookmark dir when the user select it in the sidebar.
Task-number: 251321
Reviewed-by: jasplin
|
| | |
|
| |
| |
| |
| |
| |
| | |
RevBy: Simon Hausmann
Task: 247952
Details: Use pixelToPoint on the text-indent values.
|
| |
| |
| |
| |
| |
| | |
Task: 210132
RevBy: Bradley T. Hughes
Details:Make wacom detection use atoms instead of string compares
|
|\ \
| |/
| |
| |
| | |
Conflicts:
tests/auto/qaction/tst_qaction.cpp
|
| |
| |
| |
| | |
Signed-off-by: Thiago Macieira <thiago.macieira@nokia.com>
|
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| | |
Oxygen style was looking a bit broken when using 4.5 features such as
close buttons and icons. This was because it re-implements the
tabbartablabel primitive we needed to ensure spacing for the buttons.
We had to modify the way we draw tabs slightly to make it more backward
compatible so that oxygen get the same region as before and we ensure
space for it in the CE_TabBarTab case instead. Note that the drawback
to this approach is that the focus rect needs to be moved out of the
tablabel and into the CE_TabBarTab case so it covers the entire tab
which can potentially cause problems if people depend on the label to
draw the focus rect. However the new case is also more consistent with
how buttons draw their focus.
Task-number: 251635
Reviewed-by: nrc
|
| |
| |
| |
| |
| |
| |
| | |
Updated the project files and headers necessary for enabling this.
Reviewed-by: Thiago Macieira
Reviewed-by: Jens Bache-Wiig
|
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| | |
A disabled QShortcut should eat its key sequence even for complex
sequences like "Ctrl-E 1". For example, a line edit with such a
shortcut should not display 1 after typing "Ctrl-E" and then "1".
The patch achieves this essentially by moving more of the
decision making (of whether to eat the key secuence) from
shortcutmap.cpp to qhortcut.cpp.
Moreover, an invisible QAction should not eat any of its key sequences
(primary nor alternates). In the example above, the line edit
would display 1 when typing this sequence for an invisible action.
The patch achieves this by temporarily unregistering all of the
action's shortcuts while the action is invisible.
Reviewed-by: mariusSO
Task-number: 251246
|
| | |
|