summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7Martin Jones2010-08-3034-426/+17
|\
| * QDeclarativeDebug: Destroy incoming connections if already connectedLasse Holmstedt2010-08-271-0/+2
| | | | | | | | | | | | | | Without this, QML Inspector in Qt Creator gets no error message for failed connections, which can lead to confusion. Reviewed-by: ogoffart
| * CleanupAaron Kennedy2010-08-273-13/+11
| |
| * Remove pointless \internal docs (that contain no information)Aaron Kennedy2010-08-272-38/+0
| |
| * Remove pointless \internal docs (that contain no information)Aaron Kennedy2010-08-2728-375/+4
| |
* | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7Martin Jones2010-08-2775-324/+4527
|\ \ | |/
| * Internal QML API cleanupAaron Kennedy2010-08-275-108/+124
| |
| * Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7-integrationQt Continuous Integration System2010-08-2745-63/+213
| |\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * '4.7' of scm.dev.nokia.troll.no:qt/qt-qml: Update example screenshot in doc. Handle layoutChanged() properly in QML views. Fix ListView and GridView tests following off-by-one fixes. Revert 4bc81bb1cb3cd4a0a3fe071e00556124e770d7ac Fix off-by-one at end when views scroll to keep currentItem visible. Make declarative examples a bit more qt-like. Add quit buttons to declarative demos ListView.view and GridView.view properties should not be writable. Avoid Flickable view jumping when drag threashold is exceeded. Fix ListView.view attached property with VisualItemModel Remove dead code. Add test for VisualItemModel layoutChanged() handling Remove unused code. Handle QAbstractItemModel layoutChanged() signal
| | * Update example screenshot in doc.Yann Bodson2010-08-271-0/+0
| | |
| * | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into ↵Qt Continuous Integration System2010-08-2669-216/+4403
| |\ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 4.7-integration * '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1: (61 commits) Autotest: don't use Q_FUNC_INFO for testing which method got called fix generated makefile dependencies Cocoa: Demo browser can get stuck after closing modal dialog Restore default if to system default on session close. tst_qmake doesn't need QtGui Use the full path to qmake in the qmake unit test qdoc: Fixed erroneous links to QML basic types. Fixed item view background color in Gtk style scope fixes and clutter reduction for sql driver projects I don't know why some linkers can't call this function, so comment it out. QNetworkSession::close() method now send closed() signal while faking disconnection. Add the missing license headers to the QString benchmark data Fix building of qsimd.cpp on Windows CE Use QElapsedTimer for the benchlib tests. Properly implement the CPU feature disabling in qsimd.cpp. Report the detected CPU features in the corelib boilerplate Detect CPU features on ARM by reading the ELF auxvec. Split the CPU-detection code into multiple functions for readability Fixed delivering gestures to a toplevel widget. Unroll the SSSE3 code even more to avoid the need to keep an extra variable for inverting the result ...
| | * | Autotest: don't use Q_FUNC_INFO for testing which method got calledThiago Macieira2010-08-261-15/+20
| | | | | | | | | | | | | | | | | | | | | | | | | | | | The string from Q_FUNC_INFO varies according to the compiler, so instead use an enum. Reviewed-by: Carlos Duclos
| | * | fix generated makefile dependenciesOswald Buddenhagen2010-08-261-2/+2
| | | | | | | | | | | | | | | | | | | | seems like some makes are rather lax about bogus dependencies, so this went unnoticed in local testing for at least two people.
| | * | Cocoa: Demo browser can get stuck after closing modal dialogRichard Moe Gustavsen2010-08-261-0/+6
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This turns out to be a glitch in the event dispatcher for Qt/Cocoa. The problem is that you can, in some really slim cases it must be, end up calling processEvents with the exec flag set, while the current modal dialog has been told to leave modal. In that case, we recurse into a new event dispatching loop for a session that is about to die. And that causes problems when the session actually dies. This patch makes sure that you cannon start spinning a session that is about to die, by setting the sessionCache to zero. Task-number: QTBUG-13164 Reviewed-by: Tor Arne
| | * | Restore default if to system default on session close.Aaron McCarthy2010-08-262-16/+32
| | | | | | | | | | | | | | | | | | | | | | | | | | | | If setdefaultif(0) or unsetdefaultif() is called all sockets belonging to the current process are closed by OpenC. Task-number: QTBUG-12686
| | * | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into ↵Qt Continuous Integration System2010-08-2565-183/+4343
| | |\ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 4.7-integration * '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1: (57 commits) tst_qmake doesn't need QtGui Use the full path to qmake in the qmake unit test qdoc: Fixed erroneous links to QML basic types. Fixed item view background color in Gtk style scope fixes and clutter reduction for sql driver projects I don't know why some linkers can't call this function, so comment it out. QNetworkSession::close() method now send closed() signal while faking disconnection. Add the missing license headers to the QString benchmark data Fix building of qsimd.cpp on Windows CE Use QElapsedTimer for the benchlib tests. Properly implement the CPU feature disabling in qsimd.cpp. Report the detected CPU features in the corelib boilerplate Detect CPU features on ARM by reading the ELF auxvec. Split the CPU-detection code into multiple functions for readability Fixed delivering gestures to a toplevel widget. Unroll the SSSE3 code even more to avoid the need to keep an extra variable for inverting the result Don't try to compile the SSE2 and SSSE3 code with compilers that don't support them (e.g. ARM) Improve on the SSSE3 with alternate aligning function. Add the beginnings of a new SSSE3-based aligning algorithm Small fixup ...
| | | * | tst_qmake doesn't need QtGuiThiago Macieira2010-08-251-0/+1
| | | | | | | | | | | | | | | | | | | | Reviewed-By: ossi
| | | * | Use the full path to qmake in the qmake unit testThiago Macieira2010-08-251-1/+2
| | | | | | | | | | | | | | | | | | | | Reviewed-By: ossi
| | | * | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into ↵Qt Continuous Integration System2010-08-2564-182/+4340
| | | |\ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 4.7-integration * '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1: (55 commits) qdoc: Fixed erroneous links to QML basic types. Fixed item view background color in Gtk style scope fixes and clutter reduction for sql driver projects I don't know why some linkers can't call this function, so comment it out. QNetworkSession::close() method now send closed() signal while faking disconnection. Add the missing license headers to the QString benchmark data Fix building of qsimd.cpp on Windows CE Use QElapsedTimer for the benchlib tests. Properly implement the CPU feature disabling in qsimd.cpp. Report the detected CPU features in the corelib boilerplate Detect CPU features on ARM by reading the ELF auxvec. Split the CPU-detection code into multiple functions for readability Fixed delivering gestures to a toplevel widget. Unroll the SSSE3 code even more to avoid the need to keep an extra variable for inverting the result Don't try to compile the SSE2 and SSSE3 code with compilers that don't support them (e.g. ARM) Improve on the SSSE3 with alternate aligning function. Add the beginnings of a new SSSE3-based aligning algorithm Small fixup Update the SSSE3-with-alignment function to use aligned loads. Add an ucstrncmp that uses SSSE3 with aligning. ...
| | | | * \ Merge branch '4.7' of git@scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.7Martin Smith2010-08-255-13/+27
| | | | |\ \
| | | | | * | Fixed item view background color in Gtk styleJens Bache-Wiig2010-08-252-4/+21
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Autotests were modified to check for 50% color coverage as well. Before they were not really testing the bgcolor since they would accept only the red grid color as a valid test pass. Task-number: QTBUG-13125 Reviewed-by: ogoffart
| | | | | * | scope fixes and clutter reduction for sql driver projectsMark Brand2010-08-252-7/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Add missing wildcard to scope where meant to include all win32-g++ targets. There is no reason to ignore QT_LFLAGS_TDS and QT_LFLAGS_PSQL in static builds. Via LIBS these may end up in QMAKE_PRL_LIBS in QtSql.prl. Also, the isEmpty() tests on these is redundant and only wastes time. Processing of QT_CFLAGS_PSQL should not depend on QT_LFLAGS_PSQL. It no longer seems appropriate to clean up "-lz" here in case of zlib bundled in QtCore. It's reasonable to expect QT_LFLAGS_PSQL to be ready after configure. Merge-request: 2459 Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com>
| | | | | * | I don't know why some linkers can't call this function, so comment it out.Thiago Macieira2010-08-251-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | It works fine for me on my Linux box (also 32-bit) and on ARM.
| | | | * | | qdoc: Fixed erroneous links to QML basic types.Martin Smith2010-08-251-2/+9
| | | | |/ / | | | | | | | | | | | | | | | | | | Task-nr: QTBUG-13096
| | | | * | QNetworkSession::close() method now send closed() signal while faking ↵Tomasz Bursztyka2010-08-251-3/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | disconnection. Fixes: NB#185586 - QNetworkSession::closed() signal never sent when QNetworkSession::close() is called.
| | | | * | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into ↵Qt Continuous Integration System2010-08-2558-166/+4303
| | | | |\ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 4.7-integration * '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1: (50 commits) Add the missing license headers to the QString benchmark data Fix building of qsimd.cpp on Windows CE Use QElapsedTimer for the benchlib tests. Properly implement the CPU feature disabling in qsimd.cpp. Report the detected CPU features in the corelib boilerplate Detect CPU features on ARM by reading the ELF auxvec. Split the CPU-detection code into multiple functions for readability Fixed delivering gestures to a toplevel widget. Unroll the SSSE3 code even more to avoid the need to keep an extra variable for inverting the result Don't try to compile the SSE2 and SSSE3 code with compilers that don't support them (e.g. ARM) Improve on the SSSE3 with alternate aligning function. Add the beginnings of a new SSSE3-based aligning algorithm Small fixup Update the SSSE3-with-alignment function to use aligned loads. Add an ucstrncmp that uses SSSE3 with aligning. Add an SSSE3 version of ucstrncmp Optimise the tail comparison of ucstrncmp Add a version of ucstrncmp with SSE2 with aligning. Add an SSE2-optimised version of ucstrncmp Add the ucstrncmp benchmarks ...
| | | | | * | Add the missing license headers to the QString benchmark dataThiago Macieira2010-08-244-2/+46
| | | | | | |
| | | | | * | Fix building of qsimd.cpp on Windows CEThiago Macieira2010-08-241-0/+2
| | | | | | |
| | | | | * | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into ↵Qt Continuous Integration System2010-08-2457-166/+4257
| | | | | |\ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 4.7-integration * '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1: (48 commits) Use QElapsedTimer for the benchlib tests. Properly implement the CPU feature disabling in qsimd.cpp. Report the detected CPU features in the corelib boilerplate Detect CPU features on ARM by reading the ELF auxvec. Split the CPU-detection code into multiple functions for readability Fixed delivering gestures to a toplevel widget. Unroll the SSSE3 code even more to avoid the need to keep an extra variable for inverting the result Don't try to compile the SSE2 and SSSE3 code with compilers that don't support them (e.g. ARM) Improve on the SSSE3 with alternate aligning function. Add the beginnings of a new SSSE3-based aligning algorithm Small fixup Update the SSSE3-with-alignment function to use aligned loads. Add an ucstrncmp that uses SSSE3 with aligning. Add an SSSE3 version of ucstrncmp Optimise the tail comparison of ucstrncmp Add a version of ucstrncmp with SSE2 with aligning. Add an SSE2-optimised version of ucstrncmp Add the ucstrncmp benchmarks Update the data generation script to use a non-including .cpp Update comments in QString about alignment performance. ...
| | | | | | * | Use QElapsedTimer for the benchlib tests.Thiago Macieira2010-08-242-2/+120
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | It's faster to calculate the time with it, since it doesn't need to convert to local time first. Reviewed-By: Harald Fernengel
| | | | | | * | Properly implement the CPU feature disabling in qsimd.cpp.Thiago Macieira2010-08-241-97/+60
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Don't use ^=, since that might enable a feature that wasn't detected. The new use is: export QT_NO_CPU_FEATURE="<feature1> [<feature2>]" Reviewed-by: Benjamin Poulain
| | | | | | * | Report the detected CPU features in the corelib boilerplateThiago Macieira2010-08-242-0/+56
| | | | | | | |
| | | | | | * | Detect CPU features on ARM by reading the ELF auxvec.Thiago Macieira2010-08-241-2/+43
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Reviewed-by: Benjamin Poulain
| | | | | | * | Split the CPU-detection code into multiple functions for readabilityThiago Macieira2010-08-241-17/+69
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Reviewed-By: Benjamin Poulain
| | | | | | * | Fixed delivering gestures to a toplevel widget.Denis Dzyubenko2010-08-242-2/+8
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | If there is only one widget which is a toplevel, then gestures were not delivered to it because we assumed (wrong) that there is at least one child widget. Reviewed-by: Frederik Gladhorn
| | | | | | * | Unroll the SSSE3 code even more to avoid the need to keep an extra variable ↵Thiago Macieira2010-08-241-35/+53
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | for inverting the result On 32-bit, we're out of registers already, so this variable ended up in memory
| | | | | | * | Don't try to compile the SSE2 and SSSE3 code with compilers that don't ↵Thiago Macieira2010-08-241-3/+11
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | support them (e.g. ARM)
| | | | | | * | Improve on the SSSE3 with alternate aligning function.Thiago Macieira2010-08-241-38/+101
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Even though this function *only* does aligned loads, it's worse than the other function
| | | | | | * | Add the beginnings of a new SSSE3-based aligning algorithmThiago Macieira2010-08-241-1/+83
| | | | | | | |
| | | | | | * | Small fixupThiago Macieira2010-08-241-1/+1
| | | | | | | |
| | | | | | * | Update the SSSE3-with-alignment function to use aligned loads.Thiago Macieira2010-08-241-9/+11
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This results in no change on the Core-i7, but another 2.6% on the Atom (so it's now 8% better than 4-byte loads and 31% better than current code)
| | | | | | * | Add an ucstrncmp that uses SSSE3 with aligning.Thiago Macieira2010-08-241-1/+52
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The results on i7 are 32% improvement over current code, 13% improvement over 4-byte loads, 6% over the unaligned SSSE3 loads. However, it's about 2.5% slower than pure SSE2 code due to complexity. The results on Atom are 30% improvement over current code, 7% over 4-byte loads, 15% over pure unaligned SSE2 and 9% over unaligned SSSE3.
| | | | | | * | Add an SSSE3 version of ucstrncmpThiago Macieira2010-08-241-1/+79
| | | | | | | |
| | | | | | * | Optimise the tail comparison of ucstrncmpThiago Macieira2010-08-241-2/+36
| | | | | | | |
| | | | | | * | Add a version of ucstrncmp with SSE2 with aligning.Thiago Macieira2010-08-241-1/+43
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This is a different technique of aligning. Instead of reading some bytes before the string, we will read some bytes of the string twice. Best results are only 2% improvement over the unaligned SSE2 on a Core-i7.
| | | | | | * | Add an SSE2-optimised version of ucstrncmpThiago Macieira2010-08-241-1/+38
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | First results make it 34% faster than current ucstrncmp, 16% faster than the 32-bit version.
| | | | | | * | Add the ucstrncmp benchmarksThiago Macieira2010-08-241-0/+136
| | | | | | | |
| | | | | | * | Update the data generation script to use a non-including .cppThiago Macieira2010-08-244-14/+23
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This speeds up the writing of algorithms, so I don't have to recompile megabytes of data dumps.
| | | | | | * | Update comments in QString about alignment performance.Thiago Macieira2010-08-242-15/+49
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This commit makes no code change at all. Write down the conclusions from experimenting with the x86 SIMD instructions for faster string comparison routines. Long story short: we're already pretty good. The SSE4.2 string instructions are probably more useful for "implicit-length mode" (that is, the end of the string is marked by a NUL), rather than QString's "explicit-length mode".
| | | | | | * | Major improvements to the comparison functions.Thiago Macieira2010-08-242-188/+1770
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Also use the real-world data that I collected. The resulting files are quite large, so I've added to Git only the smallest dump (apparently Teambuilder scanning the environment for "TEAMBUILDER=").
| | | | | | * | Add a script to generate real-world data from applicationsThiago Macieira2010-08-241-0/+200
| | | | | | | |