| Commit message (Collapse) | Author | Age | Files | Lines |
|---|
| |
|
|
|
|
|
|
|
|
|
| |
Some of the internal part names of QS60Style do not match the real
theme item names, making automated tool use to make "theme blob"
for QCreator simulator manual work.
Renamed the parts to match native side names.
Task-number: QTBUG-11053
Reviewed-by: Alessandro Portale
|
| |
|
|
|
|
|
|
|
|
|
|
| |
QComboMenuDelegate claims that all combobox menu items should be
checkable even if they aren't. In all the other styles, it has been
circumvented in the style code that this particular setting from
QComboMenuDelegate is ignored. :)
Adding the same workaround to QS60Style as well.
Task-number: QTBUG-11322
Reviewed-by: Alessandro Portale
|
| |\
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| | |
Conflicts:
src/3rdparty/webkit/VERSION
src/3rdparty/webkit/WebCore/ChangeLog
src/3rdparty/webkit/WebKit/qt/Api/qwebpage.cpp
src/3rdparty/webkit/WebKit/qt/ChangeLog
src/gui/painting/qpainter.cpp
src/gui/painting/qtextureglyphcache.cpp
src/opengl/gl2paintengineex/qpaintengineex_opengl2.cpp
src/opengl/gl2paintengineex/qtextureglyphcache_gl_p.h
src/s60installs/bwins/QtGuiu.def
src/s60installs/eabi/QtCoreu.def
src/s60installs/eabi/QtGuiu.def
src/s60installs/eabi/QtNetworku.def
src/s60installs/eabi/QtOpenVGu.def
tests/auto/qfontmetrics/tst_qfontmetrics.cpp
tools/linguist/lupdate/main.cpp
|
| | |
| |
| |
| | |
Reviewed-by: Olivier
|
| | |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| | |
These were currently never themed but used a fake gradient
to mimick ClearLooks. I had to add a workaround for the
case where you were using custom QItemDelegates since this
could result in styled background on tree branches but
flat items.
Task-number: QTBUG-11209
Reviewed-by: thorbjorn
|
| | |
| |
| |
| | |
Reviewed-by: ogoffart
|
| | |
| |
| |
| |
| | |
Task-number: QTBUG-10758
Reviewed-by: ogoffart
|
| |\ \
| | |
| | |
| | |
| | | |
Conflicts:
src/gui/styles/qmacstyle_mac.mm
|
| | | |
| | |
| | |
| | | |
... as instructed by olivier
|
| | | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | | |
qstylehelper_p.h now includes qstringbuilder.h
This triggers a gcc 4.0.1 bug when doing addition or % on annonymous enum
- include qstylehelper_p.h last to avoid errors in 3rd party header
- explicitly cast enums to int in qwindowsstyle.cpp
Reviewed-by: Thierry
|
| | | |
| | |
| | |
| | | |
Reviewed-by: Richard Moe Gustavsen
|
| | | |
| | |
| | |
| | |
| | |
| | |
| | |
| | | |
This commit is related to 49a6f4a7d87def3816cebf0115ddadf43e9c4d01 and
contains all the files that were modified. The previous commit contained
only the newly added file.
Reviewed-by: jbache
|
| | | |
| | |
| | |
| | |
| | |
| | |
| | |
| | | |
When fixing qtbug-10401 I introduced some extra symbols in the public
API. This commit fixes that and moves those symbols to QMacStylePrivate
instead.
Reviewed-by: jbache
|
| | | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | | |
These fixes are neccessary and requested by Qt Creator and
should go into 4.7.0. The fixes involved is:
- positioning of disclosure arrow in treeviews
- spacing between icon and text label
- added 2 pixel spacing between item view items
Note that native cocoa views tend to use 3 pixel spacing.
We considered this and decided on leaving it at 2 which is what
you see in finder list views, XCode among other places.
It also makes the change a bit less radical.
Reviewed-by:cduclos
Task-number:QTBUG-10190
|
| |\ \ \ |
|
| | |/ /
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | | |
The problem is the "rounding" of buttons in OSX. To achieve this we
add some padding to the buttons, therefore creating an inner rect for
the widget. The common hitButton(...) method found in QAbstractButton
just checks the normal rect of the widget. What this patch does is to
reimplement hitButton(...) in QPushButton, but only for the Mac case.
In this reimplemented method I calculate the inner rect and check if
the hit point is inside that rect or not.
Task-number: QTBUG-10401
Reviewed-by: Richard Moe Gustavsen
|
| |/ / |
|
| |\ \
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | | |
into 4.7-integration
* 'qt-4.7-from-4.6' of scm.dev.nokia.troll.no:qt/qt-integration: (69 commits)
re-add overriding of tool paths to configure
fix regexp
Support linked fonts (.ltt) from standard font locations.
fix path separators in install targets for MinGW+sh
fix QMAKE_QMAKE path separator under mingw+sh in the qmake spec
define qtPrepareTool() function and use it throughout
QS60Style: In S60 3.x and 5.0 Qt itemviews behaviour is not nativelike
QNAM HTTP: And one more testcase
QNetworkAccessManager: Backends were tried in wrong order
Fix QUrl::isValid if the host contains invalid caracter.
Fix anomaly demo control strip icon placement
QUrl: parsing of host name with an undercore.
Fixed race condition compiling xmlpatterns tests.
Remove qdbusserver from tests/auto/dbus.pro
QNAM HTTP: Preemptive anti crash if() statement
QNAM HTTP: More testcases
Fixing compiling issues.
Remove garbage test.
OpenVG blending modes from VG_KHR_advanced_blending extension
Fix spurious mouse click when dismissing a native menu
...
|
| | |\ \
| | |/
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | | |
Conflicts:
demos/demos.pro
mkspecs/features/resources.prf
mkspecs/features/uic.prf
src/corelib/io/qurl.cpp
src/corelib/tools/qlocale_symbian.cpp
src/gui/graphicsview/qgraphicsscene.cpp
src/gui/graphicsview/qgraphicswidget_p.cpp
src/gui/graphicsview/qgraphicswidget_p.h
src/gui/util/qsystemtrayicon_win.cpp
src/multimedia/audio/qaudioinput.cpp
tests/auto/qhostinfo/qhostinfo.pro
|
| | | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | | |
Currently style defines QStyle::SH_ItemView_ActivateItemOnSingleClick,
which leads to itemview item activation only occur on double-click
(or tap). The item selection work native-like on Sym^3.
As a correction, style needs to check the passed styleoption and
check whether or not the state "Selected" is on. In these cases,
the itemactivation can proceed.
Task-number: QTBUG-10697
Reviewed-by: Miikka Heikkinen
|
| | | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | | |
Due to incorrect braces in the if-within-if, QS60Style decided to use
QCommonStyle for styling focus frame into QPushButton when button had
*any* kind of stylesheet.
Corrected the braces.
Task-number: QTBUG-10549
Reviewed-by: Alessandro Portale
|
| | | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | | |
QS60Style tries to rotate branch graphics around the x-axis, when
it is running in RtoL UI direction. This makes the "L-shaped" branch
indicators to point to too high at the item view item.
Branch indicators should be mirrored across the x-axis to make
them look fine.
Task-number: QTBUG-9844
Reviewed-by: Alessandro Portale
|
| | | |
| | |
| | |
| | |
| | |
| | |
| | | |
Fix whitespace, remove unneeded code, break very long lines to
two rows.
Reviewed-by: Alessandro Portale
|
| | | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | | |
When pushbutton contains standardIcon or non-modified text, it should
be of same size.
As a fix, style now checking default text height for icon pushbuttons
and if the icon is smaller than text height, style will make button
to match text height content.
Task-number: QT-2179
Reviewed-by: Alessandro Portale
|
| | | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | | |
QS60Style prefers to use widget and calls its down() API. The value
is not true unless tool button has been set down programmatically.
Thus, we should rely on State_Sunken as well.
As a fix, style asks from both the widget and checks the state before
drawing button raised/pressed.
Task-number: QTBUG-10487
Reviewed-by: Alessandro Portale
|
| | | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | | |
Sometime back slider graphic in the QS60Style was changed to use the
"new" slider graphic available in 5th Edition and newer SDKs (the
old SDKs still use the slider graphic). However, at that time nobody
noticed that the new slider has different size than the old one in the
Nokia LAF document.
To fix the sliders, updated the pixel metrics calculation rules to
use the new slider LAF data. Also fixed a grpahic start and end
part rounding to match native look.
Task-number: QTBUG-10454
Reviewed-by: Alessandro Portale
|
| | | |\
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | | |
4.6-integration
* '4.6' of scm.dev.nokia.troll.no:qt/qt-s60-public:
QS60Style: QCalendarWidget draws only one-digit dates
Add spectrum analyzer demo app
|
| | | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | | |
Due to largish pixel metrics values for text margins, content does not
fit into QCalendarWidget date-cells.
To fix this, the failing pixel metric values are halved for
QTableViews and its derivatives. This matches native margins almost
perfectly (depending on native layout 1-2 pixel offset).
Task-number: QTBUG-10417
Reviewed-by: Alessandro Portale
|
| | | |/
| | |
| | |
| | |
| | | |
Task-number: QTBUG-7364
Reviewed-by: thartman
|
| | | | |
|
| |/ /
| |
| |
| |
| |
| |
| |
| |
| | |
This re-apply commit c8d2e18c4b431870560f324a17f20904bb47ae68
from Jens that was reverted in b0f4dab4 because it did not compile.
Added the missing include to make it compile on mac
Task-number: QTBUG-9850
|
| |\ \
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | | |
4.7-integration
* '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-2: (35 commits)
Avoid running animation when loopCount == 0
Set the pictures for the examples of multitouch
Compile fix on Windows.
Remove an unnecessary assert.
Documentation for the Pad Navigator Example.
New Pad Nagivator example implementation.
Skip definition of wintab functions in case of QT_NO_TABLETEVENT.
Made curve tesselation be dynamically adjusted based on transform.
Modified QPainter and QPixmap benchmarks to use raster pixmaps.
Stabilize tst_QWidgetAction::visibilityUpdate
Fix compiler warning in QT_REQUIRE_VERSION
Stabilize tst_QColumnView::parentCurrentIndex
Really fix tst_QDockWidget::taskQTBUG_9758_undockedGeometry on Linux
Fix typos in Elastic Nodes example documentation.
Made paint engine texture drawing work in GL ES 2 and updated docs.
Opt out of visual-config size checks with extension
Fix off-by-one in text layouts and widget size hints on Mac
Stabilize tst_QDockWidget::taskQTBUG_9758_undockedGeometry
Mark QFileDialog::Options as a Q_FLAGS
fix tst_QDockWidget::taskQTBUG_9758_undockedGeometry on Linux
...
|
| | |\ \
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | | |
4.7-integration
* '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-2: (33 commits)
Compile fix on Windows.
Remove an unnecessary assert.
Documentation for the Pad Navigator Example.
New Pad Nagivator example implementation.
Skip definition of wintab functions in case of QT_NO_TABLETEVENT.
Made curve tesselation be dynamically adjusted based on transform.
Modified QPainter and QPixmap benchmarks to use raster pixmaps.
Stabilize tst_QWidgetAction::visibilityUpdate
Fix compiler warning in QT_REQUIRE_VERSION
Stabilize tst_QColumnView::parentCurrentIndex
Really fix tst_QDockWidget::taskQTBUG_9758_undockedGeometry on Linux
Fix typos in Elastic Nodes example documentation.
Made paint engine texture drawing work in GL ES 2 and updated docs.
Opt out of visual-config size checks with extension
Fix off-by-one in text layouts and widget size hints on Mac
Stabilize tst_QDockWidget::taskQTBUG_9758_undockedGeometry
Mark QFileDialog::Options as a Q_FLAGS
fix tst_QDockWidget::taskQTBUG_9758_undockedGeometry on Linux
Fixed scrolling bugs in widget graphics effect backend.
Fixed source pixmap bug in widget graphics effect backend.
...
|
| | | |\ \ |
|
| | | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | | |
The mac font engine was made to return fractional values. This has
exposed a few bugs where the rounded height of the font was used for
text layouts and widget size hints. Since a fractional part of the
font's height also creates pixels, rounding the height down in these
cases is always wrong.
The biggest culprit was QScriptLine::height. This is used to lay out
text lines and returning a fractional height created problems all
over the place. Rather than ceil the number in all places where it
is used, we simply return a ceiled value for the line's height.
In 4.6, this value would be qRound(ascent)+qRound(descent)+1,
which would in some cases cause the previous and current line to
overlap by one pixel. By ceiling the sum of the two, we guarantee
that the text line contains the complete bounds of the font.
A note about the removal of the code that gets the font metrics for
QSmallFont: The condition would never be true since this is inside
a branch which is only evaluated if fontIsSet is true.
Task-number: QTBUG-9971
Reviewed-by: Gunnar
|
| |\ \ \ \ \
| |/ / / /
|/| | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | | |
4.7-integration
* '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1: (158 commits)
qdoc: Yet another revision of the top doc page.
Doc: Update on web template
Added QDateTime::msecsTo()
Doc: Fixed tables and images for the new docs
qdoc: Yet another revision of the top doc page.
Revert "Improve QUrl handling of local file paths"
Revert "[QNAM FTP] Check for the "ftp" scheme case-insensitively"
Revert "QUrl::fromLocalFile: fix silly mistake: it's fromNativeSeparators, not to"
Revert "Use QUrl::isLocalFile and fix the scheme checking in local URLs."
qdoc: Another revision of the top doc page.
Doc correction to css
Doc: Updates to the html template and javascript
tst_SuiteTest: Fix a meaningless switch statement
My 4.7.0 changelog entries.
qdoc: Fixed annotated list generation to use <td>, not <th>.
Doc: Tuning search script
qdoc: Reorganized examples panel.
Doc: Chages to search feature, css and table order
QtDeclarative: avoid waiting for a network load on URIs with empty schemes.
QtDeclarative: RFC 3986 requires schemes to be considered case-insensitively
...
|
| | |\ \ \ \
| | |_|/ /
| |/| | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | | |
4.7-integration
* '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1: (132 commits)
Make QCompleter cope with restricted screen real estate (mobile devices)
Don't initialize Wintab if QT_NO_TABLETEVENT is defined.
QDBusXmlGenerator: get the true name from QMetaType for the return type
Add missing newline to static XML snippet
Fix compilation in C++0x mode (narrowing of constants)
My changelog entries for core and network
Doc: updating html and search feature
my changelog
Doc - mention vcsubdirs as a possible value for TEMPLATE
doc: Second attempt to begin reorganizing the top doc page.
Fix syntax error in configure script
fix qmake project file following msvc2010 addition
remove extraneous return statement
cosmetics: change enum value
isOnActiveSpace is available from 10.6.
QTcpServer: Fix documentation for previous commit
Keep support for maximum pending connections in derived QTcpServer
[QNAM FTP] Check for the "ftp" scheme case-insensitively
Use QUrl::isLocalFile and fix the scheme checking in local URLs.
Improve QUrl handling of local file paths
...
|
| | | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | | |
Removes unused code from gkt and cleanlooks.
Reviewed-by: Trust Me
|
| | | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | | |
Sliders that draw groove decorations did not invert appearance
correctly in vertical or rtl cases. With this fix we will
flip the rectangles of the respective decorations and tell
gtk if we are using an rtl widget or not.
Task-number: QTBUG-8986
Reviewed-yb: thorbjorn
|
| | | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | | |
Pushing this to 4.7 as it is an easy fix and highly noticable
in the latest official release of Ubuntu.
Task-number: QTBUG-10396
Reviewed-by: thorbjorn
|
| | | |\ \ \
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | | |
4.7-integration
* '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1:
add static QChar::is(High|Low)Surrogate methods
Increase tooltip margin for cleanlooks+gtk
Fixes a crash in QGestureManager when unregistering recognizers.
Propagate LocaleChange event from application to widgets.
Support updating system locale data on Symbian
QMap: make sure we never access forward and backward through typed Node structs
Don't quote $COMPILER because it may contain flags
Unix configure: fix sed pattern extracting C and C++ flags from mkspec
qdoc: Added more API topics. Are these important?
Prevent accelerators from firing on X11 and QWS during a drag
|
| | | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | | |
While gtkstyle should really query the width/height
individually, this will help visually for now.
The current 1-pixel margin look quite ugly in
the Qt Creator editor at the moment.
Reviewed-by: mae
|
| |\ \ \ \ \ \
| |/ / / / /
|/| | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | | |
4.7-integration
* '4.7' of scm.dev.nokia.troll.no:qt/qt-s60-public:
Disable compiling of the plugin when extra package not found
Added missing UID3 for qsymbianbearer.dll.
Enabled previously disabled Qt features.
Fix includes so it compiles
Use lowercase includes so it compiles in Linux too
Fixed library dependency for Gnupoc.
Removed the --export_all_vtbl from linking.
Cleaned up the elf2e32 options a bit.
|
| | |\ \ \ \ \
| | |/ / / /
| |/| | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | | |
4.7-integration
* '4.7' of scm.dev.nokia.troll.no:qt/qt-s60-public:
Added missing UID3 for qsymbianbearer.dll.
Enabled previously disabled Qt features.
Fix includes so it compiles
Use lowercase includes so it compiles in Linux too
Fixed library dependency for Gnupoc.
Removed the --export_all_vtbl from linking.
Cleaned up the elf2e32 options a bit.
|
| | | | | | | |
|
| | | |/ / / |
|
| |\ \ \ \ \
| |/ / / /
|/| | | /
| | |_|/
| |/| | |
Conflicts:
translations/translations.pri
|
| | | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | | |
QS60Style did check if the tab icon size was larger than pixel metric
for default tab icon size. If it was, then it reset the icon size to
match pixel metric. It was impossible to set large icon to tab widget.
As a fix, this check was removed from style.
Task-number: QTBUG-3102
Reviewed-by: Jason Barron
|
| | | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | | |
Normally Qt uses scrollbuttons together at right (for LeftToRight UI)
side of the horizontal QTabBar; for vertical tab bar, scrollbuttons are
displayed below/above the widget.
Using QTabBar's scroll buttons with touch device that has capacitive
screen, is somewhat hard as the touch area for either of the scroll
buttons is somewhat smallish. So user is experiencing frequent wrong
taps. Making the touch area larger, would make the tabbar tab shape
area smaller, so it isn't a very good solution.
Therefore, when QS60Style is in use, QTabWidget draws the scrollbuttons
on either side of the QTabBar.
Task-number: QT-3104
Reviewed-by: Alessandro Portale
|
| |\ \ \ \
| |_|/ /
|/| | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | | |
4.7-integration
* '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-2:
Fix project file generation for MSVC 2010
Fix wrong translation and clip for the raster paint-engine on Mac
Return the correct library name in qt_gl_library_name for GLES*
qmake: remove useless evaluation of variables from VS project generators
Fix QT_NO_LIBRARY
Documentation for the Elastic Nodes example.
qmake: fix duplicate linker options in VS project files
Ensured that WA_InputMethodEnabled was set before FocusInEvent was sent.
qmake: fix duplicate compiler options in VS project files
Documentation for the Drag and Drop Robot example.
Fix crash in styles example when running with opengl graphicssystem
Fixed the sizehint for cols/rows in qtableview
QUrl: parsing of host name with an undercore.
Null pointer check
Revert "Try to use multisampled opengl graphicssystem on all platforms"
A small mistake when comparing the flag.
Add unit tests covering most of QVector's API.
Fix crash when CoreText fails to shape text for us
Fix crash when using opengl graphicssystem on desktop
Revert "Revert "Implement heightForWidth support for QTabWidget and QStackedLayout.""
|
