| Commit message (Collapse) | Author | Age | Files | Lines |
|---|
| |
|
|
|
| |
Merge-request: 2356
Reviewed-by: Thierry Bastian <thierry.bastian@nokia.com>
|
| |
|
|
|
| |
Merge-request: 2357
Reviewed-by: Thierry Bastian <thierry.bastian@nokia.com>
|
| |
|
|
|
| |
Merge-request: 2358
Reviewed-by: Thierry Bastian <thierry.bastian@nokia.com>
|
| | |
|
| |
|
|
|
| |
Reviewed-by: Eskil
Task: http://bugreports.qt.nokia.com/browse/QTBUG-7596
|
| |
|
|
|
|
|
|
|
| |
Since we know that x1 and y1 are between the bounds, and than x2 and
y2 are bigger, we only need to check the upper bound for x2 and y2
This gives 5% speedup on a trace from the QML samegame demo.
Reviewed-by: Samuel Rødal
|
| | |
|
| |
|
|
|
|
|
|
| |
It could happen that it was called with empty selectionrange
Now we check to see if the selection ranges are empty
Task-number: QTBUG-9507
Reviewed-by: gabi
|
| |\
| |
| |
| |
| | |
Conflicts:
src/3rdparty/phonon/ds9/mediaobject.cpp
|
| | |\
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | | |
4.7-integration
* '4.7' of scm.dev.nokia.troll.no:qt/qt-s60-public:
Fix build error in QtGui armv5 udeb
Updated qtbench to build against modified QStaticText API
Make compiling / linking a non-qt app work too on symbian/gcce
When on Symbian use smaller files.
Fixing the missing "\\"
The cmd line arguments have not been delegated properly.
Clear QFontCache TLS content before nullifying TLS pointer.
Add --download option to runonphone
Implement download support to TRK Launcher
Fix library creation on symbian/gcce
Update Symbian def files for 4.7
Various fixes for symbian/gcce building.
Make encoding clear
Fix 'make sis' working on symbian makefile based system again.
Make shipped symbian scripts available from the build-dir bin dir.
|
| | | |\
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | | |
4.7-integration
* '4.7' of scm.dev.nokia.troll.no:qt/qt-s60-public:
Fix build error in QtGui armv5 udeb
Updated qtbench to build against modified QStaticText API
Make compiling / linking a non-qt app work too on symbian/gcce
When on Symbian use smaller files.
Fixing the missing "\\"
The cmd line arguments have not been delegated properly.
Clear QFontCache TLS content before nullifying TLS pointer.
Add --download option to runonphone
Implement download support to TRK Launcher
Fix library creation on symbian/gcce
Update Symbian def files for 4.7
Various fixes for symbian/gcce building.
Make encoding clear
Fix 'make sis' working on symbian makefile based system again.
Make shipped symbian scripts available from the build-dir bin dir.
|
| | | | |
| | | |
| | | |
| | | |
| | | |
| | | | |
Typo in the .pro file was causing the linker flags to never be set.
Reviewed-by: Trust Me
|
| | | | |\ |
|
| | | | | |
| | | | |
| | | | |
| | | | | |
Reviewed-by: Trust Me
|
| | | | | |
| | | | |
| | | | |
| | | | | |
Reviewed-by: Thiago Macieira
|
| | | | | |\
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | | |
4.7-integration
* '4.7' of scm.dev.nokia.troll.no:qt/qt-s60-public:
Fix 'make sis' working on symbian makefile based system again.
Make shipped symbian scripts available from the build-dir bin dir.
|
| | | | | | |\
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | | |
4.7-integration
* '4.7' of scm.dev.nokia.troll.no:qt/qt-s60-public:
Fix 'make sis' working on symbian makefile based system again.
Make shipped symbian scripts available from the build-dir bin dir.
|
| | | | | | | |\
| | | | | | | |
| | | | | | | |
| | | | | | | |
| | | | | | | |
| | | | | | | |
| | | | | | | |
| | | | | | | | |
4.7-integration
* '4.7' of scm.dev.nokia.troll.no:qt/qt-s60-public:
Fix 'make sis' working on symbian makefile based system again.
Make shipped symbian scripts available from the build-dir bin dir.
|
| | | | | | | | |
| | | | | | | |
| | | | | | | |
| | | | | | | | |
Only use EPOCROOT as the source for libs on symbian-abld|symbian-sbsv2
|
| | | | | | | | |
| | | | | | | |
| | | | | | | |
| | | | | | | |
| | | | | | | |
| | | | | | | |
| | | | | | | |
| | | | | | | | |
If not cleared server handles are left open causing
Font Server to Panic with KErrInUse in Symbian.
Task-number: QTBUG-9565
Reviewed-by: Simon Hausmann
|
| | |\ \ \ \ \ \ \
| | |/ / / / / /
| |/| | | | | |
| | | | | | | |
| | | | | | | |
| | | | | | | |
| | | | | | | |
| | | | | | | | |
4.7-integration
* '4.7' of scm.dev.nokia.troll.no:qt/qt-multimedia-staging:
Reimplemented event() and sceneEvent() in video item, for BC.
Fix Phonon build with mingw.
|
| | | | | | | | |
| | | | | | | |
| | | | | | | |
| | | | | | | | |
Reviewed-by: Andrew den Exter
|
| | | |\ \ \ \ \ \
| | | |_|/ / / /
| | |/| | | | |
| | | | | | | |
| | | | | | | |
| | | | | | | |
| | | | | | | | |
4.7-integration
* '4.7' of scm.dev.nokia.troll.no:qt/qt-multimedia-staging:
Fix Phonon build with mingw.
|
| | | | | | | | |
| | | | | | | |
| | | | | | | |
| | | | | | | |
| | | | | | | |
| | | | | | | | |
Don't include comdef.h unless building with MSVC.
Reviewed-by: Jason McDonald
|
| |\ \ \ \ \ \ \ \ |
|
| | |\ \ \ \ \ \ \ \
| | |/ / / / / / /
| |/| | | | | | |
| | | | | | | | |
| | | | | | | | |
| | | | | | | | |
| | | | | | | | |
| | | | | | | | |
| | | | | | | | |
| | | | | | | | |
| | | | | | | | |
| | | | | | | | |
| | | | | | | | |
| | | | | | | | |
| | | | | | | | |
| | | | | | | | |
| | | | | | | | |
| | | | | | | | |
| | | | | | | | |
| | | | | | | | |
| | | | | | | | |
| | | | | | | | |
| | | | | | | | |
| | | | | | | | |
| | | | | | | | |
| | | | | | | | |
| | | | | | | | | |
4.7-integration
* '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-2: (27 commits)
Fix the doc for QFrame::frameStyle
Don't use texture-from-pixmap if the target isn't GL_TEXTURE_2D
Add runtime check for GLX >= 1.3 before using glXCreatePixmap
QDrawHelper: Reduce code duplications
Improve matching X11 VisualIDs to EGL configs
Remove obsolete function set_winapp_name()
Speedup fetchTransformedBilinear in the fast_matrix case
Allow y-interted pixmaps for brushes in GL2 paint engine
Build fix for mingw
Fix build with mingw (64 bit)
Make configure.exe compatible with mingw 64
Adjust indentation
e-Ink support cleanup
Tweak the display update IOCTL calls
Support 8-Track e-Ink devices
Get stride from LinuxFB instead of calculating it ourselves.
Use DIR_SEPARATOR when setting up variables for RCC and UIC in features.
Fixed bug in QPainterPath::intersected().
Fix compile error with QT_NO_ANIMATION
O(n^2) to O(n) optimization in QTreeWidget::selectedItems()
...
|
| | | | | | | | | |
| | | | | | | | |
| | | | | | | | |
| | | | | | | | |
| | | | | | | | |
| | | | | | | | | |
The default is QFrame::Plain (and not QFrame::NoFrame)
Task-number: QTBUG-9728
|
| | | | | | | | | |
| | | | | | | | |
| | | | | | | | |
| | | | | | | | |
| | | | | | | | | |
Task-number: QTBUG-8546
Reviewed-By: TrustMe
|
| | | | | | | | | |
| | | | | | | | |
| | | | | | | | |
| | | | | | | | |
| | | | | | | | | |
Task-number: QTBUG-9084
Reviewed-By: TrustMe
|
| | | | | | | | | |
| | | | | | | | |
| | | | | | | | |
| | | | | | | | |
| | | | | | | | |
| | | | | | | | |
| | | | | | | | | |
And apply same optimisation as in 6a9e6f4780f5fc3aaf34f93c85de575f81c91e48
for duplicated code
Reviewed-by: Samuel Rødal
|
| | | | | | | | | |
| | | | | | | | |
| | | | | | | | |
| | | | | | | | |
| | | | | | | | |
| | | | | | | | |
| | | | | | | | |
| | | | | | | | | |
Use the individual channel sizes to match rather than the combined
per-pixel sizes.
Task-number: QTBUG-9444
Reviewed-By: Trond
|
| | |\ \ \ \ \ \ \ \ |
|
| | | | | | | | | | |
| | | | | | | | | |
| | | | | | | | | |
| | | | | | | | | |
| | | | | | | | | |
| | | | | | | | | |
| | | | | | | | | |
| | | | | | | | | |
| | | | | | | | | |
| | | | | | | | | |
| | | | | | | | | |
| | | | | | | | | |
| | | | | | | | | |
| | | | | | | | | |
| | | | | | | | | |
| | | | | | | | | |
| | | | | | | | | |
| | | | | | | | | |
| | | | | | | | | |
| | | | | | | | | |
| | | | | | | | | |
| | | | | | | | | |
| | | | | | | | | |
| | | | | | | | | |
| | | | | | | | | |
| | | | | | | | | |
| | | | | | | | | |
| | | | | | | | | |
| | | | | | | | | |
| | | | | | | | | | |
In 4.5, changing the prototype of the (custom) global object used
to "Just Work"(tm).
In the JSC-based back-end, the built-in global object acts as a
proxy if a custom global object is set, because JSC doesn't (yet,
anyway) provide a way to replace the global object.
To complicate this further, we also have a proxy to the original
global object (that bypasses the custom global object proxying (!)).
This is so that properties of the original global object can
still be accessed with the QtScript C++ API when a custom global
object has been set.
Unfortunately, JSObject::prototype()/setPrototype() are not virtual,
meaning that a change of prototype in the source object is not
reflected in the proxy or vice versa.
Work around this for now by syncing the prototype at the appropriate
places (QScriptEngine::setGlobalObject(), QScriptValue::setPrototype()).
This fixes all except the case when a prototype is set from JS,
since such a write doesn't go through our public C++ API. But this
case can be detected and handled by the global object's
JSObject::put() reimplementation. Created a separate report for that
issue: QTBUG-9737.
Task-number: QTBUG-7066
Reviewed-by: Jedrzej Nowacki
|
| | | | | | | | | | |
| | | | | | | | | |
| | | | | | | | | |
| | | | | | | | | |
| | | | | | | | | |
| | | | | | | | | |
| | | | | | | | | |
| | | | | | | | | | |
( 14feb62c96ffe2c37e3e2fdac4e370fdbc76ef62 )
Changes in WebKit/qt since the last update:
* r51006 -- https://bugs.webkit.org/show_bug.cgi?id=31475 -- Crash in StringHash::equal due to unaligned string data
|
| | |\ \ \ \ \ \ \ \ \
| | |/ / / / / / / /
| | | | / / / / / /
| | |_|/ / / / / /
| |/| | | | | | | |
Conflicts:
src/multimedia/audio/qaudioinput_win32_p.h
|
| | | | | | | | | |
| | | | | | | | |
| | | | | | | | |
| | | | | | | | |
| | | | | | | | |
| | | | | | | | |
| | | | | | | | |
| | | | | | | | | |
Increased default buffer size and period size for windows.
11025monoS16LE was choppy, needed bigger periods.
Task-number:QTBUG-9101
Reviewed-by:Derick Hawcroft
|
| | | | | | | | | |
| | | | | | | | |
| | | | | | | | |
| | | | | | | | |
| | | | | | | | |
| | | | | | | | |
| | | | | | | | | |
record from different soundcards
Task-number:QTBUG-9221
Reviewed-by:Andrew den Exter
|
| | | |\ \ \ \ \ \ \ |
|
| | | | |\ \ \ \ \ \ \
| | | | | | | | | | |
| | | | | | | | | | |
| | | | | | | | | | |
| | | | | | | | | | |
| | | | | | | | | | |
| | | | | | | | | | | |
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 ( e3dc4ef2b801d91e115c54f833fa7766d392ceda )
|
| | | | | | | | | | | |
| | | | | | | | | | |
| | | | | | | | | | |
| | | | | | | | | | |
| | | | | | | | | | |
| | | | | | | | | | |
| | | | | | | | | | |
| | | | | | | | | | | |
( e3dc4ef2b801d91e115c54f833fa7766d392ceda )
Changes in WebKit/qt since the last update:
* r51006 -- https://bugs.webkit.org/show_bug.cgi?id=31475 -- Crash in StringHash::equal due to unaligned string data
|
| | | | |\ \ \ \ \ \ \ \
| | | | | | | | | | | |
| | | | | | | | | | | |
| | | | | | | | | | | |
| | | | | | | | | | | |
| | | | | | | | | | | |
| | | | | | | | | | | | |
4.6-integration
* '4.6' of scm.dev.nokia.troll.no:qt/oslo-staging-2:
Fix crash for multiscript text in QTextEngine::boundingBox()
|
| | | | | | | | | | | | |
| | | | | | | | | | | |
| | | | | | | | | | | |
| | | | | | | | | | | |
| | | | | | | | | | | |
| | | | | | | | | | | |
| | | | | | | | | | | |
| | | | | | | | | | | |
| | | | | | | | | | | |
| | | | | | | | | | | |
| | | | | | | | | | | |
| | | | | | | | | | | | |
The logClusters pointer is already adjusted for the item, so it should
be indexed relative to the item, hence from 0 to itemLength-1. Adding
pos to the index would give us a random value for all script items > 0.
Thus this would sometimes crash for text that spanned several scripts,
since we would sometimes get a value back which was outside the bounds
of the glyph array.
Task-number: QTBUG-9374
Reviewed-by: Samuel
|
| | | | |\ \ \ \ \ \ \ \ \
| | | | | | | | | | | | |
| | | | | | | | | | | | |
| | | | | | | | | | | | |
| | | | | | | | | | | | |
| | | | | | | | | | | | |
| | | | | | | | | | | | | |
4.6-integration
* '4.6' of scm.dev.nokia.troll.no:qt/qt-s60-public:
Fixed modal dialog not to have automatic "Exit" right softkey in S60.
|
| | | | | | | | | | | | | |
| | | | | | | | | | | | |
| | | | | | | | | | | | |
| | | | | | | | | | | | |
| | | | | | | | | | | | |
| | | | | | | | | | | | |
| | | | | | | | | | | | |
| | | | | | | | | | | | |
| | | | | | | | | | | | |
| | | | | | | | | | | | |
| | | | | | | | | | | | | |
During softkey refactoring this piece of code get changes, but the
changed code did not work correctly if window had no softkey actions.
Switched back to old way where softkey source is stored to variable,
and windowType is asked from stored variable. If softkey source is
dialog or popup, "Exit" is not added automatically to RSK.
Task-number: QT-2203
Reviewed-by: Sami Merila
|
| | | |/ / / / / / / / / /
| | | | | | | | | | | |
| | | | | | | | | | | |
| | | | | | | | | | | |
| | | | | | | | | | | |
| | | | | | | | | | | |
| | | | | | | | | | | |
| | | | | | | | | | | |
| | | | | | | | | | | | |
QtMultimedia backend for Windows
-Added 8000 as long as another frequency is available.
-options available changed from hard-coded to detected options.
Task-number:QTBUG-9100
Reviewed-by:Derick Hawcroft
|
| | | |/ / / / / / / / /
| | | | | | | | | | |
| | | | | | | | | | |
| | | | | | | | | | |
| | | | | | | | | | |
| | | | | | | | | | |
| | | | | | | | | | |
| | | | | | | | | | | |
Removed state change from close() function, should be set by caller
depending on context.
Task-number:QTBUG-9357
Reviewed-by:Dmytro Poplavskiy
|
| | | |\ \ \ \ \ \ \ \ \
| | | |_|/ / / / / / /
| | |/| | | | | | | |
| | | | | | | | | | |
| | | | | | | | | | |
| | | | | | | | | | |
| | | | | | | | | | | |
4.6-integration
* '4.6' of scm.dev.nokia.troll.no:qt/qt-s60-public:
Implementing QFontEngineS60::getSfntTableData()
|
| | | | | | | | | | | |
| | | | | | | | | | |
| | | | | | | | | | |
| | | | | | | | | | |
| | | | | | | | | | |
| | | | | | | | | | |
| | | | | | | | | | |
| | | | | | | | | | |
| | | | | | | | | | |
| | | | | | | | | | |
| | | | | | | | | | |
| | | | | | | | | | |
| | | | | | | | | | | |
That function was not yet implementing. Its absense caused some
Harfbuzz based shaping not to happen.
See Robert DeWolf's comment on task QTBUG-5857
Since QFontEngineS60 is private implementation and generally not
exported, no symbols need to be added to the .def files for this patch.
Task-number: QTBUG-5857
Reviewed-by: trustme
|
| | | | | | | | | | | |
| | | | | | | | | | |
| | | | | | | | | | |
| | | | | | | | | | |
| | | | | | | | | | | |
Merge-request: 544
Reviewed-by: Benjamin Poulain <benjamin.poulain@nokia.com>
|
| | | | | | | | | | | |
| | | | | | | | | | |
| | | | | | | | | | |
| | | | | | | | | | |
| | | | | | | | | | | |
Merge-request: 544
Reviewed-by: Benjamin Poulain <benjamin.poulain@nokia.com>
|
