| Commit message (Collapse) | Author | Age | Files | Lines |
|\
| |
| |
| |
| |
| |
| |
| |
| |
| | |
Conflicts:
src/3rdparty/webkit/VERSION
src/3rdparty/webkit/WebKit/qt/ChangeLog
src/gui/itemviews/qlistview.cpp
tests/auto/qlistview/tst_qlistview.cpp
tests/auto/qnetworkreply/test/test.pro
tests/auto/qsocks5socketengine/qsocks5socketengine.pro
|
| |\
| | |
| | |
| | |
| | |
| | |
| | | |
4.6-integration
* '4.6' of scm.dev.nokia.troll.no:qt/oslo-staging-1:
Updated WebKit from /home/shausman/src/webkit/trunk to qtwebkit/qtwebkit-4.6 ( d521d7d81e8f0297c94be9ebd8af67ee130d0edb )
|
| | |\
| | | |
| | | |
| | | |
| | | |
| | | |
| | | | |
4.6-integration
* '4.6' of scm.dev.nokia.troll.no:qt/oslo-staging-1:
Updated WebKit from /home/shausman/src/webkit/trunk to qtwebkit/qtwebkit-4.6 ( d521d7d81e8f0297c94be9ebd8af67ee130d0edb )
|
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | | |
( d521d7d81e8f0297c94be9ebd8af67ee130d0edb )
Changes in WebKit/qt since the last update:
++ b/WebKit/qt/ChangeLog
2010-07-27 Simon Hausmann <simon.hausmann@nokia.com>
Reviewed by Tor Arne Vestbø.
[Qt] Incorrect input method hints
https://bugs.webkit.org/show_bug.cgi?id=43037
Properly set or reset all input method hints when
activating input fields.
* WebCoreSupport/EditorClientQt.cpp:
(WebCore::EditorClientQt::setInputMethodState):
* tests/qwebview/tst_qwebview.cpp:
(tst_QWebView::focusInputTypes): Extended unit test to verify that we
reset hints.
|
| |\ \ \
| | |/ /
| |/| |
| | | |
| | | |
| | | |
| | | | |
4.6-integration
* '4.6' of scm.dev.nokia.troll.no:qt/oslo-staging-2:
Fix crash when all the items in a QListView are hidden
|
| | |/
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | | |
Calling QIconModeViewBase::initDynamicLayout() on the second and
successive segments would return QPoint(-1,-1), resulting in a
totally empty area rectangle for all the items while in
QIconModeViewBase::doDynamicLayout(). This rectangle is used to
initialize the BSP tree, and produces an arithmetic exception when
empty.
Furthermore, a rendering bug was also apparent when displaying the
first item of a segment while the last item of the previous segment
was hidden.
Auto-tests included.
Reviewed-by: Olivier
Task-number: QTBUG-12308
|
| |/
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| | |
Symbian's CFont::FontMaxAscent() returns in some cases an
incorrect value of 0. That usually happens (for some font sizes)
if a stroke based font is the main system font.
We were able to reproduce it on some S60 3.2 devices with a
chinese language pack installed.
This patch will test if CFont::FontMaxAscent() returns 0. And if
so, it alculates an ascent taht makes more sense.
Task-number: QTBUG-8013
Reviewed-by: Liang Qi
|
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| | |
If this is not done, later deletion of the backing store may cause
a crash. If the backing store is an EGL surface, its destruction
includes a call to eglDestroySurface(), which triggers an exception
if the window handle passed as a parameter is no longer valid.
Task-number: QTBUG-10643
Task-number: QTBUG-11376
Reviewed-by: Jason Barron
|
| |
| |
| |
| |
| |
| |
| | |
Trivial fix, valid formats have pixel format != Invalid, not ==.
Task-number: QTBUG-12337
Reviewed-by: Andrew den Exter
|
|\ \
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | | |
* '4.7' of scm.dev.nokia.troll.no:qt/qt-qml:
Remove warnings in photoviewer demo.
Uncomment code accidentally removed with 1937adaab5861ced44813c6a4b0bff1c3750ecd3
Fix image source
Don't emit movementEnded if mouse press is a continuation of a flick.
Avoid binding loop warnings
Append 'Example' to titles of example pages
Improvements to Modules docs
Component docs
Fixes for Dynamic Object Management docs. Also adds links to
Update Symbian emulator QtOpenVGu.def, QtNetworku.def, QtCoreu.def files for Qt 4.7 to be in sync between respective def files in Qt 4.6.3
|
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | | |
When the mouse is pressed the flick is stopped, but this may be a
continuation of a previous flick, in which case we don't want to
emit movementEnded since this can cause stutters in animations triggered
by movementEnded, for example.
Task-number: QTBUG-12492
Reviewed-by: Warwick Allison
|
| | |
| | |
| | |
| | | |
Task-number: QTBUG-12430
|
| | |
| | |
| | |
| | | |
Task-number: QTBUG-12447
|
| | |
| | |
| | |
| | |
| | |
| | | |
this page from other documentation.
Task-number: QTBUG-12446
|
| | |
| | |
| | |
| | |
| | |
| | |
| | | |
Qt 4.7 to be in sync between respective def files in Qt 4.6.3
Task-number: QTBUG-12468
Reviewed-by: Jason Barron
|
|\ \ \
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | | |
4.7-integration
* '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1:
Wrong geometery for QMainWindow with Unified toolbar on Cocoa.
Statically link to Qt based dependent librarys.
Add libgq version 0.4+0m6.
Add libconninet version 0.41+0m6.
|
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | | |
If a mainwindow is shown maximized (initially) with unified toolbar,
the top portion of the widget gets hidden underneath the native toolbar.
This is because while showing the window, the toolbar is resized. Which
causes the client area of the NSWindow to resize, we need to update the
frame of the NSView for QMainWindow based on this new size.
Task-number: QTBUG-10500
Reviewed-by: Denis
|
| |\ \ \
| | |/ / |
|
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | | |
Some of the library dependencies of the ICD Bearer Management plugin use
Qt. We include them in src/3rdparty and link against them statically to
avoid the circular build dependency. Libraries that do not use Qt are
still linked dynamically. The libraries which are statically linked are
libconninet and libgq-gconf.
Task-number: QTBUG-12354
|
| | | |
| | | |
| | | |
| | | |
| | | |
| | | | |
libgq is required by the ICD Bearer Management plugin.
Task-number: QTBUG-12354
|
| | | |
| | | |
| | | |
| | | |
| | | |
| | | | |
libconninet is required by the ICD Bearer Management plugin.
Task-number: QTBUG-12354
|
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | | |
The native border would be drawn over the one drawn by the QStyleSheetStyle
Regression since 68a498284e206e2bb000bc35331c966f3790f607
Reviewed-by: Gabriel
Task-number: QTBUG-10785
|
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | | |
When compiling for 64-bit with Visual Studio 2008, inline
assembly is not supported. Use intrisic instead.
Reviewed-by: Benjamin Poulain
|
|\ \ \ \
| |_|/ /
|/| | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | | |
4.7-integration
* '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-2:
Fix missing license header
Add test for getting a backtrace in QML
Doc: add link to new gettings started to index.html
Doc: Added new getting started document.
QtDeclarative: Give name to function bindings and signals.
|
| |/ /
| | |
| | |
| | |
| | |
| | |
| | |
| | | |
Currently, bindings and signals are annonymous javascript functions.
If one give them a name, a proper name is then shown in the javascript
debugger.
Reviewed-by: Aaron Kennedy
|
|\ \ \
| |/ /
|/| | |
|
| | |
| | |
| | |
| | | |
e51af0d74f8bb6ca6100d2338671d2d053bfed01
|
| | |
| | |
| | |
| | | |
7f9a8ebcfe86d3df428707888c3ab5fcd10226a4
|
| | |
| | |
| | |
| | | |
f84bb604d745c512db8d53410c5fec835309f85e
|
| | |
| | |
| | |
| | |
| | | |
The root cause is failing compilation test for SNAP when it shouldn't,
but it should still not result in compilation errors in code.
|
| | | |
|
| | |
| | |
| | |
| | | |
2f582953ecfc53f217317f58e4fc75b5b51a1126
|
|\ \ \
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | | |
4.7-integration
* '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1:
Adding missing image
Fix QT_NO_DATESTRING
Check the gesturemanager pointer before accessing it.
Added files that had been renamed.
Modified file/directory names and text to remove disallowed terminology.
Cherry pick fix for MOBILITY-1077 from Qt Mobility.
Fix typo in docs.
Cherry pick fix for MOBILITY-1145 from Qt Mobility.
Cherry pick fix for MOBILITY-1144 from Qt Mobility.
Fixed the following sub-tasks for QTBUG-12192
|
| |\ \ \
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | | |
4.7-integration
* '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1:
Fix QT_NO_DATESTRING
Check the gesturemanager pointer before accessing it.
Added files that had been renamed.
Modified file/directory names and text to remove disallowed terminology.
Cherry pick fix for MOBILITY-1077 from Qt Mobility.
Fix typo in docs.
Cherry pick fix for MOBILITY-1145 from Qt Mobility.
Cherry pick fix for MOBILITY-1144 from Qt Mobility.
Fixed the following sub-tasks for QTBUG-12192
|
| | | | |
| | | | |
| | | | |
| | | | |
| | | | | |
Merge-request: 730
Reviewed-by: Denis Dzyubenko <denis.dzyubenko@nokia.com>
|
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | | |
This fixes a crash when a static QWidget is destroyed after the QApplication
object.
Task-number: QTBUG-12025
Reviewed-by: Zeno Albisser
|
| | |\ \ \
| | | | | |
| | | | | |
| | | | | | |
into 4.7
|
| | | |\ \ \
| | | | |/ / |
|
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | | |
7ef45318255c5cf1f10508753c9a2c55fc2cb8c0
321bd8b7b54e34a983b1ba142af836cf3e153a66
|
| | | | | |
| | | | | |
| | | | | |
| | | | | | |
f17d8a5dbef076046ff504fecb1fd445c9b785ac
|
| | | | | |
| | | | | |
| | | | | |
| | | | | | |
426ff79e49d4abb659167541bb67846443b9707e
|
| | | | | | |
|
|\ \ \ \ \ \
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | | |
4.7-integration
* '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-2:
Don't run the QGL test on systems that does not have GL support.
Remove an useless assert from comp_func_SourceOver_sse2()
QScriptEngineAgent: recompile all the function when installing a debugger.
QScriptDeclarativeObject: we need to save the current stack pointer.
QScriptValue::objectId(): do not assert if the value is not a cell
Implement the composition mode "Plus" with SSE2
Clean the CompositionFunction tables of drawhelper
|
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | | |
The assert can never be true since const_alpha is unsigned. That
line was triggering a warning on GCC.
Reviewed-by: Olivier Goffart
|
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | | |
Recompile all the function is necessary to ger the debug opcode that
notifies us when the position changes.
The change in CollectorHeapIterator.h is nessesary to get it work as
Debugger::recompileAllJSFunctions uses LiveObjectIterator,
LiveObjectIterator initialied m_cell to -1 and to ++(*this) in its
constructor. But as m_cell is of type size_t (unsigned) then the
< comparison will always fail as it is an unsigned comparison.
This was already fixed upstream in r54672
Reviewed-by: Jedrzej Nowacki
|
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | | |
in DeclarativeObjectDelegate::put, else we cannot get a proper
backtrace in the debugger.
Reviewed-by: Kent Hansen
|
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | | |
JSC::JSValue::asCell asserts if it is not a cell
Reviewed-by: Jedrzej Nowacki
|
| |\ \ \ \ \ \
| | |/ / / / /
| |/| | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | | |
4.7-integration
* '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-2:
Implement the composition mode "Plus" with SSE2
Clean the CompositionFunction tables of drawhelper
|
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | | |
Implement the composition function for CompositionMode_Plus with SSE2.
The macro MIX() can be replaced by a single instruction add-saturate,
which increase the speed a lot (13 times faster on the blend
benchmark).
Reviewed-by: Olivier Goffart
Reviewed-by: Andreas Kling
|
| | | |/ / /
| | |/| | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | | |
Some instructions sets were defining partial table of composition
functions. To work around that, qInitDrawhelperAsm() was resetting
the composition function of QPainter::CompositionMode_Destination and
anything above QPainter::CompositionMode_Xor.
This was a problem because it makes it impossible to implement fast
path for those composition mode.
This patch export prototypes for the generic functions of each
composition mode. The specialized implementations now define a complete
table.
Reviewed-by: Andreas Kling
|