summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Doc: Added a note about the dll CONFIG option.David Boddie2011-04-181-3/+4
| | | | Task-number: QTBUG-587
* Doc: Fixed incorrect inline snippet for an example .sci file.David Boddie2011-04-181-12/+10
| | | | Task-number: QTBUG-18812
* Merge branch 'master' of scm.dev.nokia.troll.no:qt/qt-doc-teamDavid Boddie2011-04-152-0/+12
|\
| * Added missing resource files.David Boddie2011-04-142-0/+12
| |
* | Doc: Clarified and tidied up OpenGL overlay color documentation.David Boddie2011-04-151-9/+4
|/ | | | Task-number: QTBUG-701
* Added missing data files. Renamed resource files.David Boddie2011-04-138-14/+115
|
* Merge branch 'master' of scm.dev.nokia.troll.no:qt/qtDavid Boddie2011-03-25956-7167/+105724
|\
| * Merge branch 'master' of scm.dev.nokia.troll.no:qt/qt-releng-staging into ↵Qt Continuous Integration System2011-03-252-20/+0
| |\ | | | | | | | | | | | | | | | | | | master-integration * 'master' of scm.dev.nokia.troll.no:qt/qt-releng-staging: Removed old autotest references from Symbian build files
| | * Removed old autotest references from Symbian build filesEckhart Koppen2011-03-242-20/+0
| | | | | | | | | | | | | | | | | | | | | Tests not in use anymore, removed from the layers and package definition files. Reviewed-by: TrustMe
| * | Merge branch 'qt-master-from-4.7' of ↵Qt Continuous Integration System2011-03-2417-85/+283
| |\ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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: 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. Fixes QT-4753 sort out stdout vs. stderr usage Changes for 4.7.3 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.
| | * \ Merge remote-tracking branch 'origin/4.7' into qt-master-from-4.7Thiago Macieira2011-03-2417-85/+283
| | |\ \ | |/ / / | | | | | | | | | | | | Conflicts: src/opengl/qwindowsurface_gl.cpp
| | * | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-s60-public into ↵Qt Continuous Integration System2011-03-233-12/+40
| | |\ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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.
| | | * | Icon in QMessageBox::question is deformed on SymbianSami Merila2011-03-231-3/+10
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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
| | | * | Prevent crash when connecting signal in splitviewSami Merila2011-03-231-9/+12
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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
| | | * | GraphicsViews: Focused widget is not visible after orientation changeSami Merila2011-03-231-12/+14
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Clean up previous fix a little bit, by merging if-statements. Task-number: QTBUG-17576 Reviewed-by: Guoqing Zhang
| | | * | GraphicsViews: Focused widget is not visible after orientation changeSami Merila2011-03-231-0/+15
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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
| | | * | Add missing nullify for the s60 style's background pixmap pointer.Laszlo Agocs2011-03-231-0/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Qt apps would crash during orientation change without setting m_background to null after deleting it. Reviewed-by: Sami Merila
| | * | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into ↵Qt Continuous Integration System2011-03-232-10/+13
| | |\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 4.7-integration * '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1: Fixes QT-4753
| | | * | | Fixes QT-4753Xizhi Zhu2011-03-232-10/+13
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Invalid read in ICD plugin for bearer management. Reviewed-by: Iiro Kause
| | * | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into ↵Qt Continuous Integration System2011-03-223-34/+86
| | |\ \ \ \ | | | |/ / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 4.7-integration * '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1: sort out stdout vs. stderr usage Changes for 4.7.3
| | | * | | sort out stdout vs. stderr usageOswald Buddenhagen2011-03-222-34/+39
| | | | | | | | | | | | | | | | | | | | | | | | Task-number: QTBUG-14728
| | | * | | Changes for 4.7.3Timo Turunen2011-03-221-0/+47
| | | | | | | | | | | | | | | | | | | | | | | | Reviewed-by: Trust Me
| | * | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-s60-public into ↵Qt Continuous Integration System2011-03-229-31/+151
| | |\ \ \ \ | | | | |/ / | | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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.
| | | * | | Implement tiled image and pixmap drawing in VG paint engine.Laszlo Agocs2011-03-221-3/+98
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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
| | | * | | Merge branch '4.7' of git://scm.dev.nokia.troll.no/qt/qt-s60-public into 4.7Laszlo Agocs2011-03-227-27/+51
| | | |\ \ \
| | | | * | | Change Symbian to use destroyed swap behaviour in GLJani Hautakangas2011-03-225-23/+51
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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
| | | | * | | Remove useless profile reference.axis2011-03-222-4/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The profile has been empty since the plugin functionality was moved into QtMultimedia itself (d73df73c556b0a225fdde7341549ed834bc691f4). RevBy: Miikka Heikkinen
| | | * | | | Changed maximum heap size for qmlflickr on Symbian.Laszlo Agocs2011-03-221-1/+2
| | | |/ / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 32 MB is certainly not enough to load large (e.g. 12 Mpix or bigger) images. Now it is changed to 128 MB. Reviewed-by: Jani Hautakangas
| * | | | | Merge branch 'master' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into ↵Qt Continuous Integration System2011-03-2451-37/+73633
| |\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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 ...
| | * | | | | Remove the use of the QtTest baseline feature I revertedThiago Macieira2011-03-221-4/+4
| | | | | | |
| | * | | | | Revert "Add a feature to QTestLib to correct benchmark results."Thiago Macieira2011-03-2220-134/+33
| | | | | | | | | | | | | | | | | | | | | | | | | | | | This reverts commit 3cc83349d9a07bcb7ae9c338bfdc355905a5a2f1.
| | * | | | | Use the ARM version of UTF-8 detection in the Neon codeThiago Macieira2011-03-221-16/+13
| | | | | | |
| | * | | | | Update the data files for the QString benchmark testThiago Macieira2011-03-223-204/+71503
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Also add the Neon build flags
| | * | | | | Fix a bug in the SSE2 UTF-8 decoder.Thiago Macieira2011-03-221-0/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | If the multibyte sequence crossed the end of the SSE2 area, then len would have a wrong value and the data wouldn't be read.
| | * | | | | Add ARM Neon versions of fromLatin1 and fromUtf8Thiago Macieira2011-03-221-0/+192
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The fromLatin1 code is very simple, yet the handwritten assembly performs better due to the use of post-increments. The fromUtf8 code has two alternatives. Neon lacks an instruction similar to SSE2's _mm_movemask_epi8 (PMOVMSKB) which extracts one bit from each byte and stores it in a register. We used that in the UTF-8 code to detect bytes with the highest bit set. To compensate, we used two alternatives: 1) AND the comparison result with a vector containing {128, 64, ...,1 } Do 3 parallel-adds (VPADD.I8), which will make the mask propagate to the lowest component in the vector. Trick found in: http://hilbert-space.de/?p=22 (comment 16-17) 2) Extract the two words from the doubleword Neon register and do the work in ARM assembly. It looks like the latter version is performing better.
| | * | | | | Make this compile on Atom/Core2 (no SSE4) and on ARM (no SSE)Thiago Macieira2011-03-221-1/+18
| | | | | | |
| | * | | | | Add baselines and zeros to the benchmarks.Thiago Macieira2011-03-221-6/+13
| | | | | | |
| | * | | | | Add an UTF-8 conversion on trusted data and no BOM.Thiago Macieira2011-03-221-0/+48
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This assumes that there are no overlong sequences, no continuation characters without the leading, no missing continuations and no BOM.
| | * | | | | Make it easier to write a UTF-8 conversion on trusted dataThiago Macieira2011-03-221-38/+58
| | | | | | |
| | * | | | | Add the missing tests and 4-byte UTF-8 sequencesThiago Macieira2011-03-221-1/+23
| | | | | | |
| | * | | | | Improve the code and avoid unnecessary storesThiago Macieira2011-03-221-7/+9
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | If there's an UTF-8 high byte in the first 8 bytes, don't try to save the latter 8 characters
| | * | | | | Add an UTF-8 conversion optimised for ASCII using SSE2Thiago Macieira2011-03-221-1/+54
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This code is 2x faster than the original UTF-8 code and within 35% of the pure Latin1 code
| | * | | | | Add an UTF-8 conversion code that is optimised for ASCIIThiago Macieira2011-03-221-2/+94
| | | | | | | | | | | | | | | | | | | | | | | | | | | | This code is ~1.5x faster than the original UTF-8 code
| | * | | | | Add a stateless copy of the Qt 4.7 UTF-8 codec.Thiago Macieira2011-03-221-0/+99
| | | | | | | | | | | | | | | | | | | | | | | | | | | | For whatever reason, this code is worse than the stateful code...
| | * | | | | Add UTF-8 code benchmarksThiago Macieira2011-03-221-0/+223
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Also compare to the Latin1 functions. The UTF-8 algorithm in Qt 4.7 right now is 109% slower than the unoptimised Latin-1 algo, 120% than the Qt 4.7 SSE2 code
| | * | | | | Improve a little more the core loop and propagate to the other codeThiago Macieira2011-03-221-18/+22
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Currently are that the "improved SSE2" version and the SSE4.1 version are yielding the best results, within 1% of each other. These results are around 20% better than the Qt 4.7 code.
| | * | | | | Reduce the number of operations in the main loopThiago Macieira2011-03-221-8/+7
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The more operations there are, the more time it takes. More importantly, the more variables we touch, the more the compiler may want to use the stack instead of registers.
| | * | | | | Add an SSE4 version using PMOVZXBW and PSRLDQThiago Macieira2011-03-221-0/+22
| | | | | | |
| | * | | | | Attempt to improve the epilog codeThiago Macieira2011-03-221-19/+72
| | | | | | |
| | * | | | | Add two SIMD overcommit prologsThiago Macieira2011-03-221-0/+21
| | | | | | |
generated by cgit v0.12 at 2024-09-24 22:36:43 (GMT)