| Commit message (Collapse) | Author | Age | Files | Lines |
|---|
| |\ |
|
| | |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| | |
The QInputDialog with anything but QLineEdit as the input widget,
will show up as minimal size on device/emulator. Also, the dialog
looks bad since the widgets are deployed very close to the dialog
borders.
As a fix, layout will not get the size policy set on Symbian, but
the dialog itself is stretched to occupy screen width and thus, layout
grows to occupy the available size. Additionally, style will set layout
pixel metrics for dialogs larger than for other widgets, to avoid
the layout from putting widgets very close to dialog border.
Task-number: QTBUG-14331
Reviewed-by: Janne Anttila
|
| |\ \
| |/ |
|
| | |
| |
| |
| |
| | |
Task-number: QTBUG-10538
Reviewed-by: Trust Me
|
| |\ \
| |/ |
|
| | |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| | |
Currently tactile feedback is not given for QWidgets running on Symbian
even if the native side supports this (Sym^3 and 5th Edition devices).
This task adds support for QWidgets having QS60Style. The tactile
feedback has been implemented as a plugin that the style loads when
instantiating itself for touch devices. NOTE that the feedback
is NOT supported by the emulated style, nor is the plugin interface
public, so it cannot be used outside of style.
The implementation is simplistic, since we only want to provide
stop-gap solution until 4.8 when real Qt feedback implementation
is ready. The implementation will only give feedback for touch-down
events for visible, interactive and enabled widgets. Sliders and
scrollbars will use sensitive feedback (slightly less aggressive)
and all others will use basic feedback. Note that Sym^3 adds tens
of different feedback categories, which this plugin ignores
as we want to share the same implementation for Sym^3 and 5th ed.
In distributed Qt package there is no tactile feedback for 5th edition,
due to package creation limitations. Support can be added manually by
re-compiling Qt on top of 5th Edition SDK.
Task-number: QT-4037
Reviewed-by: Jani Hautakangas
Reviewed-by: Janne Koskinen
|
| |\ \
| | |
| | |
| | |
| | | |
Conflicts:
src/opengl/qwindowsurface_gl.cpp
|
| | |\ \
| | |/ |
|
| | | | |
|
| | |\ \
| | |/
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | | |
Conflicts:
demos/declarative/snake/snake.qml
qmake/generators/symbian/symbiancommon.cpp
src/network/access/qnetworkaccessmanager.cpp
src/s60installs/s60installs.pro
tests/auto/qitemselectionmodel/tst_qitemselectionmodel.cpp
tests/auto/qnetworkreply/tst_qnetworkreply.cpp
|
| | | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | | |
Theme text colors are incorrect for spinboxes and comboboxes, they
should have same theme colors as lineedit has, as they are using same
graphic for "editor" sub-control in them.
Task-number: QT-4176
Reviewed-by: Miikka Heikkinen
|
| | | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | | |
This is due to that QS60Style uses desktop area for a bounding rect
of combobox content to disallow it to grow outside of screen size.
Unfortunately with some recent changes to screensize handling in
desktop widget size makes the desktop resize to happen later than
when style is asked for combobox size. So, style returns invalid
QSize for combobox content size. As a fix, if the returned size
is invalid, ask it directly from QCommonStyle.
Task-number: QTBUG-14423
Reviewed-by: Janne Anttila
|
| | | |\ |
|
| | | |\ \ |
|
| | | | |\ \ |
|
| | | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | | |
In the repository, we should always use the No Commercial license
alongside the GNU Free Documentation License for documentation
files.
|
| |\ \ \ \ \ \
| |/ / / / /
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | | |
Conflicts:
src/gui/kernel/qapplication_win.cpp
src/gui/kernel/qwidget.cpp
src/gui/text/qfontengine_ft.cpp
|
| | |\ \ \ \ \
| | | |_|_|/
| | |/| | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | | |
Conflicts:
qmake/generators/win32/msbuild_objectmodel.cpp
qmake/generators/win32/msbuild_objectmodel.h
qmake/generators/win32/msvc_objectmodel.cpp
qmake/generators/win32/msvc_vcxproj.cpp
src/corelib/arch/qatomic_arm.h
tests/auto/qglthreads/tst_qglthreads.cpp
|
| | | |\ \ \ \
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | | |
4.7-integration
* '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1: (36 commits)
Fix failure on Windows after commit ccd3f66
tst_qtcpserver: Another attempt to reproduce QTBUG-14268
Fix crash when constructing QThreadStorage after global destructors have run
tst_qtcpsocket: Attempt to reproduce QTBUG-14268
Fixed a buffer overrun when pasting large data from non-Qt apps
Fix copying large data to non-Qt applications
fix regexp in "make custom command handling in vc(x)proj files sane"
qmake: Include -pthread when reducing duplicate library arguments
qmake: Ensure right library order when reducing duplicate libraries
rebuild configure.exe
make QMAKE_POST_LINK handling in nmake generator sane
make custom command handling in vc(x)proj files sane
Revert "QWorkspace: fix hardcoded min size overwriting the real min size"
QtScript/JavaScriptCore: Backport random number generator seeding fix
Fix performance regression in QUuid::createUuid()
Update japanese translations.
Ensure that the underline is only drawn when expected for an accel
Small improvement in the textedit demo
My changes for 4.7.1
QWorkspace: fix hardcoded min size overwriting the real min size
...
|
| | | | |\ \ \ \
| | | | |/ / /
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | | |
4.7-integration
* '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1: (32 commits)
Fixed a buffer overrun when pasting large data from non-Qt apps
Fix copying large data to non-Qt applications
fix regexp in "make custom command handling in vc(x)proj files sane"
qmake: Include -pthread when reducing duplicate library arguments
qmake: Ensure right library order when reducing duplicate libraries
rebuild configure.exe
make QMAKE_POST_LINK handling in nmake generator sane
make custom command handling in vc(x)proj files sane
Revert "QWorkspace: fix hardcoded min size overwriting the real min size"
QtScript/JavaScriptCore: Backport random number generator seeding fix
Fix performance regression in QUuid::createUuid()
Update japanese translations.
Ensure that the underline is only drawn when expected for an accel
Small improvement in the textedit demo
My changes for 4.7.1
QWorkspace: fix hardcoded min size overwriting the real min size
Doc: Fixing link titles and error color in search results
Doc: Implementing features to the search feature.
Setting the _NET_WM_STATE Atom only when its not already set
Fix focus appearance of tabwidget tabs with QGtkStyle
...
|
| | | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | | |
On Mac, the underline for an accel should not be drawn at all as this is
not part of the style guidelines. This ensures that it is not drawn.
Autotest included which required a change to drawItemText() to go via
the proxy as well so that the autotest would be useful too.
Task-number: QTBUG-14172
Reviewed-by: Richard
|
| | | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | | |
There was an issue with ubuntu Ambience theme since it requires
a custom tab style. This was not currently supported by
QGtkStyle.
Task-number: QTBUG-14161
Reviewed-by: thorbjorn
|
| | | | | | |/
| | | | |/|
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | | |
In Ubuntu 10.10 the unfocused selection background is different
from the focused one. Interestingly they use GTK_STATE_ACTIVE
for unfocused widgets. This was verified back to GTK 2.10 which is
the required minimum for QGtkStyle so it should be safe for
all other styles as well.
Task-number: QTBUG-13792
Reviewed-by: thorbjorn
|
| | | |/ / /
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | | |
Part of the fix for QTBUG-13553 incorrectly uses commonstyle to draw branch
highlight, when it should use QS60Style.
As a fix, commonstyle should not be used unless theme palette has been
tempered with.
Task-number: QTBUG-13699
Reviewed-by: Miikka Heikkinen
|
| | | |/ /
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | | |
In portrait orientation, QDateEdit's calendar popup (QCalendarWidget)
does not fit into screen.
As a fix, the pixel metric PM_FocusFrameHMargin, is reduced from
13 to 3 in qHD screens (640*360). Also, the explicit halving of
the pixel metric for QTableViews is removed.
The pixel metric resulted in 27 pixel text margins (2 * pm + 1)for
calendar widgets, which is clearly a bit too much.
Task-number: QTBUG-14126
Reviewed-by: Miikka Heikkinen
|
| |\ \ \ \
| |/ / /
| | | |
| | | |
| | | | |
Conflicts:
src/gui/painting/qpdf.cpp
|
| | |\ \ \
| | |/ /
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | | |
Conflicts:
doc/src/snippets/code/doc_src_qmake-manual.qdoc
src/corelib/arch/symbian/arch.pri
src/declarative/graphicsitems/qdeclarativeflickable.cpp
src/opengl/gl2paintengineex/qpaintengineex_opengl2.cpp
src/opengl/gl2paintengineex/qtextureglyphcache_gl.cpp
src/opengl/gl2paintengineex/qtextureglyphcache_gl_p.h
tests/auto/qfontmetrics/tst_qfontmetrics.cpp
|
| | | |\ \
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | | |
4.7-integration
* '4.7' of scm.dev.nokia.troll.no:qt/qt-s60-public:
Added support for unsigned smart installer package creation in Symbian
Fix QApplication::desktop()->availableGeometry() for Symbian
QS60Style: Possible NULL pointer use when drawing frame
|
| | | | |/
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | | |
QS60Style::drawControl casts QStyleOption pointer to QStyleOptionFrame,
yet never checks if the orginal pointer was NULL or not. The casted
pointer is then used to fetch palette information from style option.
Thus, this might lead to crash.
Reviewed-by: Miikka Heikkinen
|
| | | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | | |
Task-number: QTBUG-13636
Merge-request: 817
Reviewed-by: Jens Bache-Wiig <jens.bache-wiig@nokia.com>
|
| | | |/
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | | |
This issue affected windows XP style. The checked icon would get
incorrect border offsets before.
The fix was suggested by Jonathan Liu.
Reviewed-by:richard
Task-number: QTBUG-10796
|
| | |\ \
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | | |
scm.dev.nokia.troll.no:qt/qt-integration into master-integration
* 'qt-master-from-4.7' of scm.dev.nokia.troll.no:qt/qt-integration: (83 commits)
Add export to QDeclarativeBasePositioner
Fix assert when placing a .qml file inside $QTDIR/imports
Moved the partial deployment section to qbase.pri.
Made the Symbian menu close when switching native focus.
Document PropertyAnimation::targets property
Fix test.
QHostInfo: Fix a crash when a new request is pushed while resolving.
Updated WebKit to 6e15c3404d15a8ab72242152ec966e5e388161a2
Fix a compilation issue of tst_qsettings for win32-msvc.
fix RSS listing example
QML Debugging: Documentation fixes
dist/changes: QML Debugging changes
Updated changes-4.7.1.
Do not set DESTDIR to the current directory
Small fixes to Browser.qml
Fix dependency on the plugins rule for multimedia
More declarative autotests.
Fix example.
Assistant: Don't register internal doc when using custom collection.
Assistant: Move comment to the right place.
...
|
| | | |\ \
| | | |/
| | | |
| | | |
| | | |
| | | |
| | | |
| | | | |
Conflicts:
src/gui/painting/qrasterizer.cpp
src/network/access/qnetworkaccessmanager.cpp
tests/auto/qpainter/tst_qpainter.cpp
tools/assistant/tools/assistant/mainwindow.cpp
|
| | | | |
| | | |
| | | |
| | | | |
Reviewed-by: Thierry
|
| | |/ /
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | | |
Some pixmap based themes were affected by this issue since they
needed to resolve the palette against the widget and the lineedit
palette was already resolved. We now set the palette on the lineedit
when you modify the parent palette. You can still maintain a separate
palette on the lineedit, but you have to set it after the parent has
been set. We can remove some workarounds for plastique and vista style
due to this.
Task-number: QTBUG-5950
Reviewed-by: ogoffart
|
| |\ \ \
| |/ /
| | |
| | |
| | |
| | | |
Conflicts:
configure
src/corelib/global/qglobal.h
|
| | |\ \
| | |/
| | |
| | |
| | |
| | | |
Conflicts:
src/gui/painting/qtextureglyphcache_p.h
src/opengl/gl2paintengineex/qtextureglyphcache_gl.cpp
|
| | | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | | |
QS60Style tracks the pressed down state for itemviews
and some other widgets that required highlight pressed down graphics.
However, the implementation was faulty as it required that a
mouse release event occurs in another widget, instead of anywhere.
This partially fixes QTBUG-13759.
Task-number: QTBUG-13759
Reviewed-by: Jani Hautakangas
|
| | |\ \
| | |/
| | |
| | |
| | |
| | |
| | |
| | | |
Conflicts:
src/corelib/kernel/qobject.h
src/declarative/graphicsitems/qdeclarativeflickable.cpp
src/declarative/graphicsitems/qdeclarativeflickable_p_p.h
src/declarative/util/qdeclarativelistmodel.cpp
|
| | | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | | |
QS60Style currently skips drawing of checkbox for checkable itemviews.
It however reserves space for the checkbox in the itemview item row.
As a fix, also draw the checkbox.
Task-number: QTBUG-11150
Reviewed-by: Shane Kearns
|
| | | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | | |
QS60Style crashes when running a test application that modifies
active style AND application's palette. After switching to
other style, setting palette to application default, re-enabling the
style's palette and activating QS60Style, causes a crash. This is
due to that internal theme palette is tried to access, before it is
constructed.
Fixed by making sure that when theme palette is accessed, it is
not NULL.
Task-number: QTBUG-13553
Reviewed-by: Miikka Heikkinen
|
| | | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | | |
Currently QS60Style shows tick mark for listWidget with multiselection
capability only after two or more items are selected. This is fixed
so that selection indication is shown in multiselection itemviews
(all of them and not just list widget) irregardless of number of
selected items.
Also, if itemview loses focus with singleitem itemview, style now
still draws item highlight to it (with 50% transparency).
Task-number: QTBUG-12875, QTBUG-13072
Reviewed-by: Janne Anttila
|
| |\ \ \
| |/ /
| | |
| | |
| | |
| | |
| | | |
Conflicts:
configure
src/corelib/global/qglobal.h
src/corelib/tools/qsimd.cpp
|
| | |\ \
| | |/
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | | |
Conflicts:
bin/syncqt
demos/declarative/snake/content/snake.js
demos/declarative/snake/snake.qml
doc/src/development/qmake-manual.qdoc
src/corelib/plugin/plugin.pri
src/gui/kernel/qapplication_win.cpp
src/gui/kernel/qdesktopwidget_win.cpp
src/gui/painting/qdrawhelper.cpp
tests/auto/qdir/tst_qdir.cpp
tools/qdoc3/test/assistant.qdocconf
tools/qdoc3/test/designer.qdocconf
tools/qdoc3/test/linguist.qdocconf
|
| | | |\
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | | |
Conflicts:
qmake/Makefile.win32
src/corelib/io/qfsfileengine_win.cpp
src/corelib/kernel/qeventdispatcher_win.cpp
src/gui/dialogs/qfiledialog_win.cpp
src/gui/inputmethod/qcoefepinputcontext_s60.cpp
src/gui/text/qfontdatabase_win.cpp
src/gui/util/qsystemtrayicon_win.cpp
src/script/utils/qscriptdate.cpp
tests/auto/qinputcontext/tst_qinputcontext.cpp
tests/auto/qscriptengine/tst_qscriptengine.cpp
|
| | | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | | |
This was a security hole that has been there for a while, but the
public awareness have recently rised so the threat is more imminent
now.
The solution is to fix all places where we dynamically load system
libraries. More specifically, we now load all system libraries with
an absolute path that points to a library in the system directory
(usually c:\windows\system32).
We therefore introduce a small class named QSystemLibrary that only loads
libraries located in the system path. This shares some of the API with
QLibrary (in order to make the patch as small as possible).
We don't fix QLibrary due to risk of regressions. In
addition, applications can fix the code that calls QLibrary themselves.
The problem does not apply to Windows CE, since the search order is
documented as not searching in the current directory.
However, it touches some CE-specific code - therefore QSystemLibrary
is sometimes used on WinCE (however, it will just do a normal
LoadLibrary() since its safe anyway).
This change does not affect the testability plugin (it is not clearly
documented where that plugin is located, and the plugin should never
be used in production code anyway)
Loading OpenSSL libraries
The ssl libraries are handled specially, and searched in this order
(we cannot expect them to always be in the system folder):
1. Application path
2. System libraries path
3. Trying all paths inside the PATH environment variable
Task-number: QT-3825
Reviewed-by: Thiago Macieira
Reviewed-by: Peter Hartmann
|
| | | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | | |
QS60Style ignores Style_On state for QToolButton drawing.
This has been fixed, so that when toolbutton is "on", button is drawn
with pressed down graphics.
Task-number: QTBUG-13099
Reviewed-by: Alessandro Portale
|
| | | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | | |
Currently style leaks an animation object (QS60StyleAnimation) when
style is destroyed. To avoid this, animation object array is
deleted in the style's destructor.
Task-number: QTBUG-13145
Reviewed-by: mread
|
| | | |\ \
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | | |
4.7-integration
* '4.7' of scm.dev.nokia.troll.no:qt/qt-s60-public:
Fixed input context trying to squeeze content into a full widget.
Fixed a case where a newly created native widget would lose focus.
Cleaned up position tracking in the Symbian input methods.
Revert "Long-press shortcuts for symbols on QWERTY keyboard don't work"
Added catching of errors in timers.
QT_PLUGINS_BASE_DIR needs to be defined after load(qt_config)
QS60Style: Itemviews are drawn incorrectly
Fixed sporadically failing autotest on Symbian.
|
| | | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | | |
When running QS60Style on hardware, all the itemview items without
any special background (i.e. not "pressed", not "highlighted", not
"alternate") are drawn with "pressed button" graphics.
This is due that the internal drawing function gets called without
any enum value set and it seem to pick the second enumeration constant
from theme element list. The enumeration constant is not defined
to match to any integer value.
As a solution, style will not call the drawing function when theme
element is not defined.
Task-number: QTBUG-11601
Reviewed-by: Liang Qi
|
