| Commit message (Collapse) | Author | Age | Files | Lines |
|---|
| |\
| |
| |
| |
| |
| | |
Conflicts:
src/gui/kernel/qcocoapanel_mac.mm
src/gui/kernel/qcocoasharedwindowmethods_mac_p.h
|
| | |
| |
| |
| |
| |
| |
| | |
Regression since b4d642e639eabde5d72a4
Task-number: QTBUG-7737
Reviewed-by: Gabriel
|
| |\ \
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | | |
master-integration
* 'master' of git@scm.dev.nokia.troll.no:qt/oslo-staging-2:
build fix for mingw
Build fix for MSVC2005 and older SDK
QStyleSheetStyle: Fixed some text croped when having padding with native border.
Remove obsolete code for unsupported platforms
Character spacing when drawing a QPicture to a high DPI device.
|
| | | |
| | |
| | |
| | |
| | |
| | |
| | |
| | | |
The native border width need to be taken into account in QRenderRule::boxRect()
Task-number: QTBUG-6855
Reviewed-by: Benjamin Poulain
(cherry picked from commit 6e90192b599cee9b903177a0978198326f667613)
|
| |\ \ \
| |/ /
|/| /
| |/
| |
| |
| |
| |
| |
| |
| | |
Conflicts:
bin/syncqt
doc/src/deployment/deployment.qdoc
src/corelib/io/qfsfileengine_win.cpp
src/corelib/xml/qxmlstream.cpp
src/opengl/gl2paintengineex/qpaintengineex_opengl2_p.h
tools/assistant/tools/assistant/centralwidget.cpp
tools/linguist/lupdate/main.cpp
|
| | |\
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | | |
4.6-integration
* '4.6' of scm.dev.nokia.troll.no:qt/oslo-staging-1:
QIODevice: Fix readAll()
Temporary hackiesh solution to prevent BOM in the xml data.
Fixed qxmlstream autotest when using shadow builds.
Attempt at readding the capital P headers for Phonon
Remove special Phonon processing from syncqt.
Use the lowercase/shortname.h headers for Phonon includes
Fixes a crash when setting focus on a widget with a focus proxy.
Update copyright year to 2010
doc: Clarified activeSubControls and subControls.
Remove warning "statement with no effect"
doc: Clarified that .lnk files are System files on Windows.
|
| | | |
| | |
| | |
| | | |
Reviewed-by: Trust Me
|
| |\ \ \
| |/ /
| | |
| | |
| | |
| | |
| | | |
Conflicts:
src/corelib/io/qfsfileengine.cpp
src/opengl/gl2paintengineex/qpaintengineex_opengl2.cpp
src/opengl/opengl.pro
|
| | |/
| |
| |
| |
| |
| |
| |
| |
| |
| | |
native border."
This reverts commit 6e90192b599cee9b903177a0978198326f667613.
his change the behaviour a little bit. It is better to wait for Qt 4.7
Reviewed-by: jbache
|
| |/
|
|
|
|
|
|
| |
This is because the light() color of the palette is used and it was
not modified.
Task-number: QTBUG-7216
Reviewed-by: jbache
|
| |
|
|
|
|
|
| |
The native border width need to be taken into account in QRenderRule::boxRect()
Task-number: QTBUG-6855
Reviewed-by: Benjamin Poulain
|
| |
|
|
|
|
|
|
|
|
|
|
|
|
|
|
| |
I am not sure why the code was there, but after some testing, it is better
to remove it:
- While painting the branch, we should not look at the ::item pseudo class
at all.
- Items specific stuff is drawn in PE_PanelItemViewItem, not PE_PanelItemViewRow
- Selection is handled his way by the native style. background-color is not for
selection and should not depends on SH_ItemView_ShowDecorationSelected
Reviewed-by: Thierry
Task-number: QTBUG-5228
Task-number: 258382
Task-number: QTBUG-4338
|
| |
|
|
|
|
|
|
|
|
|
|
| |
In Qt know the frame is drawn in PE_Widget with stylesheet. But the
QStyleOption passed by QWidgetPrivate::drawBackground is really simple
and doesn't contains frame information.
We need to rely on the widget itself to know if we should look for the
:no-frame pseudo element.
Reviewed-by: jbache
Task-number: 261110
|
| |
|
|
| |
Reviewed-by: Trust Me
|
| |
|
|
|
|
|
|
|
|
|
|
| |
Because we did not reiimplement SE_TabBarTabText to force the
parentstyle to call the virtual function back, we got the normal style
margins in addition to the one by the stylesheet.
Also added test for !hasNativeBorder to suport cases where we just
specify a border
Reviewed-by: jbache
Task-number: 196326
|
| |
|
|
| |
Reviewed-by: Trust Me
|
| | |
|
| | |
|
| |
|
|
|
|
|
|
|
|
|
|
|
|
|
| |
When specifying round corners with QStyleSheetStyle and no border-width
specified, the round corners were not rendered with antialiasing. Furthermore,
if border-width was set to 0, part of the border was rendered in discordance
with CSS3.
The background in now rendered directly instead of drawing a clipped
rectangle. The actual border width is checked before rendering.
A test has been added at tests/auto/uiloader/baseline/css_borderradius_allwidgets.ui
Task-number: 230362
Reviewed-by: olivier
|
| |
|
|
| |
Reviewed-by: Trust Me
|
| |
|
|
| |
Reviewed-by: Trust Me
|
| |
|
|
|
|
|
| |
The menu bar is currently broken with border-image,
fix is about to be commited
Task-number: 230363
|
| |
|
|
|
|
|
| |
If you only set the position, of the button without setting a geometry,
it did not work.
Task-number: 259226
|
| |
|
|
| |
when only setting a border with the stylesheet
|
| |
|
|
|
|
|
|
| |
Include change for spinbox, combobox, and menu.
Task-number: 255849
Tested-by: Pierre
Reviewed-by: jbache
|
| | |
|
| |
|
|
| |
and add some missing images required for a previous test
|
| |
|
|
|
| |
Task-number: 206494
Reviewed-by: Jens Bache-Wiig
|
| |
|
