| Commit message (Collapse) | Author | Age | Files | Lines |
|---|
| |
|
|
| |
Reviewed-by: trustme
|
| |
|
|
| |
Reviewed-by: Jeremy Katz
|
| |
|
|
|
|
|
| |
We should check whether we got the default argument or the empty string that
was provided by the user as toCurrencyString(123, QString(""))
Reviewed-by: Zeno Albisser
|
| |
|
|
|
|
|
|
|
|
|
|
|
| |
This changes the behavior as before we were returning the name that we read
from System Preferences -> Language which represents the language for UI
translation.
Now that we have QLocale::uiLanguages() we don't need a hack that returned UI
language as a locale name.
This essentially reverts adb6eea3a135707a220c0b1c1cf8266321af9309.
Reviewed-by: con
|
| |
|
|
| |
Reviewed-by: trustme
|
| |
|
|
|
|
| |
Task-number: QTBUG-17092
Reviewed-by: Zeno Albisser
Reviewed-by: Liang Qi
|
| |
|
|
|
|
| |
Task-number: QTBUG-18374
Reviewed-by: Olivier Goffart
Merge-request: 1157
|
| |
|
|
|
|
|
|
| |
...the private class is cheap anyway; and lazy construction lead to
problems like setting an empty default configuration would crash etc.
Reviewed-by: Markus Goetz
Task-number: QTBUG-17550
|
| |\ |
|
| | | |
|
| | |\
| | |
| | |
| | |
| | |
| | |
| | |
| | | |
master-integration
* 'master' of scm.dev.nokia.troll.no:qt/qt-earth-staging:
Skip failing tests
QDir: Fix absolute paths when using file engines
|
| | | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | | |
QFileSystemEntry doesn't know about paths as implemented by custom file
engines, such as is the case with resource files. In such cases, we need
to allow the engine to make the relative to absolute conversion.
Expanded QDir's test case to ensure resource paths are considered in
more places.
Task-number: QTBUG-17921
Reviewed-by: Prasanth Ullattil
|
| | |\ \
| | | |
| | | |
| | | |
| | | | |
Conflicts:
src/opengl/qwindowsurface_gl.cpp
|
| | | |\ \
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | | |
4.7-integration
* '4.7' of scm.dev.nokia.troll.no:qt/qt-s60-public:
Icon in QMessageBox::question is deformed on Symbian
Prevent crash when connecting signal in splitview
GraphicsViews: Focused widget is not visible after orientation change
GraphicsViews: Focused widget is not visible after orientation change
Add missing nullify for the s60 style's background pixmap pointer.
|
| | | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | | |
MessageBox icons are deformed on Qt/S60, since style creates all icons with 1:1
width:height ratio. Based on S60 documentation messagebox icons
are of 4:3 ratio. This is the same ratio between all the S60 releases.
Task-number: QTBUG-14953
Reviewed-by: Laszlo Agocs
|
| | | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | | |
If there is no focusitem when connecting a signal, splitview crashes.
This is caused by null pointer use. Prevent the crash by checking the
pointer.
Task-number: QTBUG-16572
Reviewed-by: Guoqing Zhang
|
| | | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | | |
Clean up previous fix a little bit, by merging if-statements.
Task-number: QTBUG-17576
Reviewed-by: Guoqing Zhang
|
| | | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | | |
If there is a graphicsview with input widget focused and splitview is
open, and we rotate the device from Portrait to Landscape
(or vice versa), the input widget is no longer visible in the
splitview rect. This only happens if there are scrollbars visible
in the view.
Reason is that the input widget is tried to ensure visibility for
before window surface is valid. In these cases, make the input widget
visibility re-location happen after window server indicates that the
view is now visible.
Task-number: QTBUG-17576
Reviewed-by: Guoqing Zhang
|
| | | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | | |
Qt apps would crash during orientation change without setting
m_background to null after deleting it.
Reviewed-by: Sami Merila
|
| | | |\ \ \
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | | |
4.7-integration
* '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1:
Fixes QT-4753
|
| | | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | | |
Invalid read in ICD plugin for bearer management.
Reviewed-by: Iiro Kause
|
| | | |\ \ \ \
| | | | |/ /
| | | |/| |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | | |
4.7-integration
* '4.7' of scm.dev.nokia.troll.no:qt/qt-s60-public:
Implement tiled image and pixmap drawing in VG paint engine.
Changed maximum heap size for qmlflickr on Symbian.
Change Symbian to use destroyed swap behaviour in GL
Remove useless profile reference.
|
| | | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | | |
The vgWritePixel-based "fallback" in drawImage can only be used when
the transformation is simple and no opacity is set. The tiled drawing
introduced here will serve as an additional fallback for the more
complex cases and will allow drawing large (12 Mpix or more) pixmaps
and images with transformation and semi-transparency even when the
complete image data would not fit into the GPU memory.
Task-number: QTBUG-18251
Reviewed-by: Jani Hautakangas
|
| | | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | | |
Destroyed swap behaviour is a little bit faster than
preserved swap with heavily animated UIs like QML.
Task-number: QTBUG-18270
Reviewed-by: Samuel Rødal
|
| | | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | | |
The profile has been empty since the plugin functionality was moved
into QtMultimedia itself (d73df73c556b0a225fdde7341549ed834bc691f4).
RevBy: Miikka Heikkinen
|
| | |\ \ \ \ \
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | | |
master-integration
* 'master' of scm.dev.nokia.troll.no:qt/oslo-staging-1: (48 commits)
Remove the use of the QtTest baseline feature I reverted
Revert "Add a feature to QTestLib to correct benchmark results."
Use the ARM version of UTF-8 detection in the Neon code
Update the data files for the QString benchmark test
Fix a bug in the SSE2 UTF-8 decoder.
Add ARM Neon versions of fromLatin1 and fromUtf8
Make this compile on Atom/Core2 (no SSE4) and on ARM (no SSE)
Add baselines and zeros to the benchmarks.
Add an UTF-8 conversion on trusted data and no BOM.
Make it easier to write a UTF-8 conversion on trusted data
Add the missing tests and 4-byte UTF-8 sequences
Improve the code and avoid unnecessary stores
Add an UTF-8 conversion optimised for ASCII using SSE2
Add an UTF-8 conversion code that is optimised for ASCII
Add a stateless copy of the Qt 4.7 UTF-8 codec.
Add UTF-8 code benchmarks
Improve a little more the core loop and propagate to the other code
Reduce the number of operations in the main loop
Add an SSE4 version using PMOVZXBW and PSRLDQ
Attempt to improve the epilog code
...
|
| | | | | | | |
| | | | | | |
| | | | | | |
| | | | | | | |
This reverts commit 3cc83349d9a07bcb7ae9c338bfdc355905a5a2f1.
|
| | | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | | |
Two special values are added to the measurement of benchmarks: a zero
and a comparison. The "zero" value is to be used when the test incurs
a non-negligible overhead just to run. The benchmark author should add
an "empty" run that measures basically the overhead and set it to
attribute QTest::Zero.
The "zero" value will be subtracted from any benchmark measurements
before reporting (currently the plain logger only). Note that all
benchmark types don't make sense, notably those already measurement
some kind of rate, like frames per second and bytes per second.
The "baseline" value is the comparison (with the "zero"
subtracted"). When the baseline is set, the library will instead
report the ratio between the benchmark and the baseline, in percentage
or a multiple (e.g. "75%" [of the time] or "10.0x" [faster]).
Adding measurements in "robes" left for future improvement.
This feature is not reviewed and will be reverted later.
|
| | | | | | | | |
|
| | | | | | | | |
|
| | | | | | | | |
|
| | | | | | | |
| | | | | | |
| | | | | | |
| | | | | | | |
Reviewed-by: Trust Me
|
| | | | | | | | |
|
| | | | | | | |
| | | | | | |
| | | | | | |
| | | | | | | |
Reviewed-by: Markus Goetz
|
| | | |\ \ \ \ \
| | | | | | | |
| | | | | | | |
| | | | | | | |
| | | | | | | | |
Conflicts:
src/gui/image/qpnghandler.cpp
|
| | | | | | | | |
| | | | | | | |
| | | | | | | |
| | | | | | | |
| | | | | | | | |
Merge-request: 1132
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com>
|
| | | |\ \ \ \ \ \ |
|
| | | | | | | | | |
| | | | | | | | |
| | | | | | | | |
| | | | | | | | | |
A proposol to speed up qHash(QString) and QVector.
|
| | |\ \ \ \ \ \ \ \
| | | | | | | | | |
| | | | | | | | | |
| | | | | | | | | |
| | | | | | | | | |
| | | | | | | | | |
| | | | | | | | | |
| | | | | | | | | |
| | | | | | | | | |
| | | | | | | | | |
| | | | | | | | | |
| | | | | | | | | |
| | | | | | | | | |
| | | | | | | | | |
| | | | | | | | | |
| | | | | | | | | |
| | | | | | | | | |
| | | | | | | | | |
| | | | | | | | | |
| | | | | | | | | |
| | | | | | | | | |
| | | | | | | | | |
| | | | | | | | | |
| | | | | | | | | |
| | | | | | | | | | |
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:
Fixed drawImage() not to attempt drawing null images on openvg.
QS60Style: Update placeholder texture to real one
Text bounding rect calculated incorrectly if non-top aligned.
Bump Qt version to 4.7.4
Return SV_S60_5_2 / SV_SF_3 for next gen Symbian platform.
Remove incorrect check in qpixmap autotest.
Change the pooled QGLPixmapData to be backed by QVolatileImage.
Started changes-4.7.4 file
Fix endianness detection with gcc 4.6 -flto -fwhole-program
remove redundand validateModes() call
Changed s60 style not to rely on QPixmapData::toNativeType().
Add missing bitmap locking to QVGPixmapData::fromNativeType.
Don't crash calling QTextDocument::blockBoundingRect on invalid block
Prepare fromSymbianCFbsBitmap autotest for 16 bpp format.
Fix writing to an attached property from script.
fixes/improvements for new QML right-to-left docs
Fix license headers in example code
Write Qt Quick 1.1 right-to-left documentation and examples
Doc fix - QtQuick 1.1 scheduling
|
| | | |\ \ \ \ \ \ \ \
| | | | |_|_|/ / / /
| | | |/| | | | | | |
|
| | | | |\ \ \ \ \ \ \
| | | | | | | | | | |
| | | | | | | | | | |
| | | | | | | | | | |
| | | | | | | | | | | |
* '4.7' of scm.dev.nokia.troll.no:qt/qt-qml:
Text bounding rect calculated incorrectly if non-top aligned.
|
| | | | | | | | | | | |
| | | | | | | | | | |
| | | | | | | | | | |
| | | | | | | | | | |
| | | | | | | | | | |
| | | | | | | | | | |
| | | | | | | | | | |
| | | | | | | | | | |
| | | | | | | | | | |
| | | | | | | | | | | |
QRect::setY() affects the size of the rectangle, so the height of
the bounding rect was too small. Use moveTop() instead, which does
not affect the size of the rectangle.
Change-Id: If41ba6a28c9a7370f054dab20995a198f822ae2b
Task-number: QTBUG-18194
Reviewed-by: Bea Lam
|
| | | |\ \ \ \ \ \ \ \ \
| | | |/ / / / / / / / |
|
| | | | |\ \ \ \ \ \ \ \
| | | | | |_|_|_|/ / /
| | | | |/| | | | | |
| | | | | | | | | | |
| | | | | | | | | | |
| | | | | | | | | | |
| | | | | | | | | | |
| | | | | | | | | | | |
4.7-integration
* '4.7' of scm.dev.nokia.troll.no:qt/qt-s60-public:
Fixed drawImage() not to attempt drawing null images on openvg.
QS60Style: Update placeholder texture to real one
|
| | | | | | | | | | | |
| | | | | | | | | | |
| | | | | | | | | | |
| | | | | | | | | | |
| | | | | | | | | | |
| | | | | | | | | | |
| | | | | | | | | | |
| | | | | | | | | | |
| | | | | | | | | | | |
QVGPaintEngine did not have proper checks for null QImage in the
drawImage functions so it went on trying to create a VGImage of
size 0x0 which is bound to fail always. This resulted in confusing
warnings about not being able to reclaim space for 0x0 images.
Reviewed-by: Jani Hautakangas
|
| | | | | | | | | | | |
| | | | | | | | | | |
| | | | | | | | | | |
| | | | | | | | | | |
| | | | | | | | | | |
| | | | | | | | | | |
| | | | | | | | | | |
| | | | | | | | | | |
| | | | | | | | | | |
| | | | | | | | | | |
| | | | | | | | | | |
| | | | | | | | | | |
| | | | | | | | | | |
| | | | | | | | | | | |
Once the background texture has been created, update it to all widgets.
This corrects most cases where texture is used outside of QS60Style.
It is still possible to access the placeholder texture and draw it,
if:
a) QPalette::Window is accessed before drawing even one widget
b) Painting the texture happens without using QS60Style
Task-number: QTBUG-14910
Reviewed-by: Laszlo Agocs
|
| | | |\ \ \ \ \ \ \ \ \
| | | |/ / / / / / / /
| | | | | | | | / / /
| | | |_|_|_|_|/ / /
| | |/| | | | | | |
| | | | | | | | | |
| | | | | | | | | |
| | | | | | | | | |
| | | | | | | | | |
| | | | | | | | | |
| | | | | | | | | |
| | | | | | | | | |
| | | | | | | | | |
| | | | | | | | | |
| | | | | | | | | |
| | | | | | | | | |
| | | | | | | | | |
| | | | | | | | | |
| | | | | | | | | |
| | | | | | | | | |
| | | | | | | | | |
| | | | | | | | | |
| | | | | | | | | | |
Conflicts:
examples/declarative/positioners/layoutdirection/layoutdirection.qml
src/corelib/global/qglobal.h
src/plugins/qpluginbase.pri
src/qbase.pri
src/s60installs/bwins/QtOpenGLu.def
src/s60installs/eabi/QtOpenGLu.def
tests/auto/selftests/expected_cmptest.txt
tests/auto/selftests/expected_crashes_3.txt
tests/auto/selftests/expected_longstring.txt
tests/auto/selftests/expected_maxwarnings.txt
tests/auto/selftests/expected_skip.txt
tools/assistant/tools/assistant/doc/assistant.qdocconf
tools/qdoc3/test/assistant.qdocconf
tools/qdoc3/test/designer.qdocconf
tools/qdoc3/test/linguist.qdocconf
tools/qdoc3/test/qdeclarative.qdocconf
tools/qdoc3/test/qmake.qdocconf
tools/qdoc3/test/qt-build-docs_ja_JP.qdocconf
tools/qdoc3/test/qt-build-docs_zh_CN.qdocconf
|
| | | | |\ \ \ \ \ \ \
| | | | | |_|_|_|/ /
| | | | |/| | | | |
| | | | | | | | | |
| | | | | | | | | |
| | | | | | | | | |
| | | | | | | | | |
| | | | | | | | | |
| | | | | | | | | | |
4.7-integration
* '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1:
Bump Qt version to 4.7.4
Fix endianness detection with gcc 4.6 -flto -fwhole-program
remove redundand validateModes() call
|
| | | | | |\ \ \ \ \ \
| | | | | | | | | | |
| | | | | | | | | | |
| | | | | | | | | | |
| | | | | | | | | | | |
Conflicts:
dist/changes-4.7.4
|
| | | | | | | | | | | |
| | | | | | | | | | |
| | | | | | | | | | |
| | | | | | | | | | | |
Reviewed-by: Trust Me
|
