| Commit message (Collapse) | Author | Age | Files | Lines |
|\
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| | |
src/3rdparty/* is left untouched and not merged from 4.6. The corresponding
changes in Harfbuzz and WebKit are already in the 4.6 staging areas.
Conflicts:
src/3rdparty/webkit/VERSION
src/3rdparty/webkit/WebCore/ChangeLog
src/3rdparty/webkit/WebKit/qt/ChangeLog
src/3rdparty/webkit/WebKit/qt/tests/qgraphicswebview/tst_qgraphicswebview.cpp
src/3rdparty/webkit/WebKit/qt/tests/qwebview/tst_qwebview.cpp
src/3rdparty/webkit/WebKit/qt/tests/qwebview/tst_qwebview.qrc
tests/auto/qtextlayout/tst_qtextlayout.cpp
tests/auto/qwidgetaction/tst_qwidgetaction.cpp
|
| | |
|
| | |
|
| | |
|
|\ \
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | | |
4.7-integration
* '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1: (55 commits)
Fix symbian-abld build failure with bearer plugins
remove certificate bundle
make QSslSocket::systemCaCertificates() use system certs
Adjusted RegExp in QSslCertificate::fromPath()
Fix QSystemTrayIcon::supportsMessages() on Windows
Use NIM_SETVERSION to get the latest behavior
Cleanup obsolete stuff
doc: Added DITA XML generator
Fixed a broken merge.
Changed the way we detect touch screen on Windows.
Fixed error deploying qsymbianbearer.qtplugin on Symbian.
Revert "Attempt to fix build failure on Symbian."
Attempt to fix build failure on Symbian.
Replaced redundant "!contains" scopes in "contains(A, B) {...} !contains(A, B) {...}" constructions with "else"
Updated leading whitespace to make indentation more consistent
Updated project files so it is now possible to use "-system-zlib" configuration option on Windows and Symbian platforms.
make postgresql support sensitive to PSQL_LIBS
support for cross building Qt for MinGW (win32-g++) on Unix
use "win32-g++*" scope to match all MinGW makespecs
Demos: Fix compilation with namespace.
...
|
| |\ \
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | | |
4.7-integration
* '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1: (29 commits)
I10n: Update German translations for 4.7.0
Fix a freetype link failure.
Fix configure test for DirectFB
Split Symbian bearer plugin into three platform specfic plugins
Doc: Fixed whitespace in the other configuration file for zh_CN.
Doc: Fixed whitespace in the Simplified Chinese doc configuration.
Unbreak Linux build when qendian.h is included before qglobal.h
Revert accidental commit of irrelevant stuff. Silly mondays..
Unbreak Linux build when qendian.h is included before qglobal.h
Fix QApplication/QWidget to really take ownership of input contexts
Added setting a hotspot on standard gestures
Fixed GestureOverride event delivery in GraphicsView.
add check-ts target to auto-asses translation completeness
qt_ja_JP.ts => qt_ja.ts
Fix incorrect \since tag
XQuery test suite (and others): remove p4 dependency
add docu about pixmaps being invalidated on qapp destruction
remove somewhat misleading warning about x11 pixmap leak
Disabled item view items use incorrect background color
Update the mkspec for linux-icc: don't use jump tables in shlibs
...
|
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | | |
* src/gui/kernel/[qapplication|qwidget].cpp,
tests/auto/qapplication/tst_[qapplication|qwidget].cpp (setInputContext):
The documentation for [QApplication|QWidget]::setInputContext claims that the
[QApplication|QWidget] instance would take ownership. This commit fixes the
setter to also reparent the input context. Furthermore, the crappy test for
this setter was improved.
Reviewed-by: Denis Dzyubenko <denis.dzyubenko@nokia.com>
|
|/ / /
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | | |
Problem was that we didn't take the children's effective mask
into account when checking whether a point was inside or not.
This commit is also an optimization since we no longer check the point
against the widget's rect twice. Furthermore, unnecessary
QRegion operations are completely avoided in the common case.
Auto tests included.
Task-number: QTBUG-7150
Reviewed-by: paul
|
|\ \ \
| |/ /
|/| /
| |/
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| | |
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
|
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| | |
* When a native window becomes completely invisible, the reference count
of the top-level widget's backing store is decremented.
* When a previously invisible native window becomes either partially or
fully visible:
- If the top-level widget has a backing store, its reference count
is incremented.
- Otherwise, the top-level widget creates a backing store with an
initial reference count of 1.
Task-number: QTBUG-8697
Reviewed-by: Jason Barron
|
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| | |
On Symbian, the top-level widget's backing store must be destroyed when
it is no longer required, in order to conserve memory. The criteria
for destroying the backing store is when neither the TLW nor any of
its native descendents (which share the backing store) are visible.
In order to implement this requirement, a count must be kept of the
number of native widgets which are using the TLW's backing store.
This patch provides the mechanism for maintaining this count, and for
destroying the backing store when the count is decremented to zero.
No calls to either the increment nor decrement functions are made,
however, by this code included in this patch; this code will be added
to only the Symbian backend by a subsequent patch.
Task-number: QTBUG-8697
Reviewed-by: Bjørn Erik Nilsen
Reviewed-by: Jason Barron
|
| |
| |
| |
| |
| | |
Task-number: QTBUG-8697
Reviewed-by: Jason Barron
|
| |
| |
| |
| |
| |
| |
| | |
Added #ifdef QT_BUILD_INTERNAL for autotests which rely on AUTOTEST_EXPORT
symbols (only available in internal developer configurations)
Reviewed-by: Liang Qi
|
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| | |
The reason turns out to be that we:
1. Half-way fake mouse events from QCursor::setPos
2. Don't fake mouse move upon mouse enter unless traking is on
The test failed when mouse trackin was on, so that we ended up
faking the same mouse move event twize (in QCursor::setPos and
mouseEnter). We now do a different implementation for setPos on
cocoa (so that native events will be generated), and always
fake a mouse move event from mouse enter to make tooltips (and
other event filters) work
Reviewed-by: MortenS
|
| |
| |
| |
| |
| |
| |
| |
| |
| |
| | |
We need to skip the QWidget::setToolTip test for now since it fails
on Cocoa: The reason is that the test uses QCursor::setPos that ends
up faking a mouse move on mac (which triggers tooltips). And when
the mouse moves, a mouse enter event is delivered to the widget
through cocoa, which will also fake a mouse move event. Until we
know what the best solution is, we chose to skip this test
Reviewed-by: Richard Moe Gustavsen <richard.gustavsen@nokia.com>
|
|/
|
|
|
| |
Solaris linker complains if you don't. Plus it's the right
thing to do
|
|
|
|
|
|
|
|
|
|
|
|
|
| |
It seems that in Symbian we cannot restore Qt::WA_Moved and
Qt::WA_Resized attributes in setWindowState method to the same ones
what the attributes were when method was called. Thus we currently
make sure that Qt::WA_Moved and Qt::WA_Resized attributes are not
touched when normal window state is applied.
There is a new task QTBUG-8977 to sort out when those attributes
should be set and when not.
Reviewed-By: Sami Merila
|
|
|
|
|
|
|
|
|
|
| |
Widget attributes seems to be inconsistently set on different
platforms. There are two task to harmonize the attributes on different
platforms: QTBUG-8941 and QTBUG-8911
The tests were XFAIL:d in order that S60 integration is not blocked.
Reviewed-by: Jason Barron
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
| |
QDialog::resize() also moved the dialog in Symbian. This occured since
adjustPosition was called as an result of resize and that method did
not check if dialog position was explicitly set.
In addition it was found that in Symbian WA_Resized and WA_Moved
attributes were basically set for almost all top-level widgets
by system. This was also fixed and a new auto test was introduced
to verify these attributes in all platforms. Windows platform also
suffers from bug in this area, and a separate task QTBUG-5897 for
it was created
Task-number: QTBUG-5897
Reviewed-by: Sami Merila
|
|
|
|
|
|
|
| |
Grabbing layered windows doesn't work on Vista and above, so instead we
need to grab the corresponding area of the desktop widget.
Reviewed-by: Samuel
|
|
|
|
|
|
|
|
|
|
| |
As of commit bc82db, show()ing a native child widget causes a panic
on Symbian. The panic code (WSERV-10) indicates that Activate() is
being called on an already-active graphics context.
This test case reproduces the defect.
Task-number: QTBUG-7960
|
|\
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| | |
4.6-integration
* '4.6' of scm.dev.nokia.troll.no:qt/qt-s60-public:
Fixed casual crash in initializeDb (Symbian)
Fixed a bug where text would disappear in password fields.
Fixed sendEvent call.
Removed useless member variable and replaced with var on the stack.
Fixed indentation.
Fix to S60 softkey pressed down image.
Whitespace/tab fixes.
s60 application loses normalGeometry when returning from fullscreen
Fixing 'softvfp+vfpv2' compiling issue for Tb9.2
|
| |
| |
| |
| | |
Reviewed-by: Trust me
|
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| | |
Problem description: normalGeomerty lost during showFullScreen
1. Reported problen was due on void QSymbianControl::PositionChanged()
over write top->normaGeometry on every position change. As fix
top->normalGeometry is moved to new rect:s top left only when
widget windowState == 0.
2. Also made some new qwidget auto tests. Refactored s60 side
setWindowState to be more readable. Minimized window state now
hides window decoration.
QApplication & QWidget autotest run on emulator and tested on
s60 5.0 hw using attached application.
http://bugreports.qt.nokia.com/browse/QTBUG-6231
Task-number:QTBUG-6231
Merge-request: 2256
Reviewed-by: Jani Hautakangas <ext-jani.hautakangas@nokia.com>
|
|/
|
|
|
|
|
| |
Now we check that and skip it from the tab list. Auto-test included.
Reviewed-by: leo
Task-number: QTBUG-7532
|
|
|
|
|
|
| |
We can't call QCOMPARE from within a nested function, because the
return statement will just exit that function.
VERIFY_COLOR can't be turned into a function this way.
|
|
|
|
| |
Reviewed-by: Trust Me
|
|
|
|
|
|
|
|
|
|
|
|
| |
Happens for example if a DockWidget is undocked and has a child
whith the WA_StaticContents attribute.
The parent does not change (so newParent is false) but still, the
top level widget change. So staticWidget need to be moved to the
new backingstore.
Reviewed-by: Benjamin Poulain
Task-number: QTBUG-6883
|
|
|
|
|
|
|
|
|
|
|
|
|
|
| |
QWidget
with setGraphicsEffect(0).
The effect was not deleted in that case, problem solved for both QGraphicsItem
and QWidget.
Autotest included.
Task-number: QTBUG-5917
Reviewed-by: bnilsen
|
|
|
|
|
|
|
|
|
|
| |
In Symbian we save memory by deleting widget backingstore from
non-visible windows. 12-key FEP is fullscreen and causes the
backing store to be deleted but still continues to scroll the view
to show current caret position in focused lineedit control.
Task-number: QTBUG-5922
Reviewed-by: Jason Barron
|
|
|
|
|
| |
Task-number: QTBUG-5804
Reviewed-by: denis
|
|
|
|
|
|
|
|
|
| |
When enabling/disabling a widget or changing its InputMethodEnabled attribute,
use the focus proxy widget's input context for reset and for setting the focus
widget on the input context.
Task-number: QTBUG-5781
Reviewed-by: Denis
|
|
|
|
|
| |
Task-number: QTBUG-5396
Reviewed-by: axis
|
|\
| |
| |
| |
| | |
Conflicts:
src/gui/effects/qgraphicseffect.cpp
|
| |
| |
| |
| |
| |
| |
| |
| |
| | |
This broke after commit: a8e2a457bb7d2fc377c1c65b6a4172974919e055
(Add a new event type, WinIdChange). The first thing that happens in
show() is that the top-level is created, and hence we send WinIdChange.
We therefore have to add this event to list of expected events.
Reviewed-by: TrustMe
|
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| | |
The opaque children cache was clipped to all the ancestors up to the
top-level, which means whenever a widget changes geometry all the
children must be invalidated. However, the bug was that we didn't
invalidate the children, and that is of course slow so we don't want
to do it either. A better solution is to only clip the children cache to the
widget itself (widget->rect() instead of widget->clipRect()), and we can
perfectly do this because the region we subtract the opaque children from is
already inside the clipRect().
Auto-test included.
Task-number: QTBUG-4245 (related to)
|
|/ |
|
|
|
|
|
|
|
|
|
|
|
|
|
| |
The test (see 02fbfdbd) previously asserted that changing the parent
of a native widget caused a WinIdChange event on Symbian, but not on
other platforms. The test now asserts that:
1. Changing the parent of a native widget causes a WinIdChange
event on all platforms.
2. Changing the grandparent of a native widget causes a WinIdChange
event only on Symbian.
Reviewed-by: Paul Olav Tvete
|
|\ |
|
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| | |
A QPointer was set to point to a QWidget by one of its children, during its
deletion. This happens during the child deletion, and after the call to
QObject::clearGuards(), which means that the QPointer becomes a dangling one.
The fix ensures that qt_x11_enforce_cursor will not be called with a
being-deleted QWidget. The included auto-test doesn't test anything, except
that it doesn't crash.
Reviewed-by: Olivier
|
| | |
|
| |
| |
| |
| |
| |
| | |
WinIdChangeEventWidget::event didn't return a value in all codepaths.
Reviewed-by: thartman
|
|\ \
| |/ |
|
| | |
|
|/
|
|
|
|
|
|
|
|
|
|
|
| |
1. Added a new test step, winIdChangeEvent, to test that
QWidget::setWinId correctly sends WinIdChange events.
2. The persistentWinId test step check the following assertion:
re-parenting a native widget causes its own winId to change, but not
those of its (native) descendents. This assertion is not true for
Symbian, so this test step has been replaced, on Symbian, by
reparentCausesChildWinIdChange, which checks the inverse assumption,
i.e. that the native descendents' winIds also change.
Reviewed-by: Bjoern Erik Nilsen
|
|\ |
|
| | |
|
|/
|
|
|
|
| |
Currently Windows has no proper cursor support.
Reviewed-by: Thomas Hartmann
|
| |
|
| |
|