summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Merge remote branch 'qt/master' into qml-masterQt Continuous Integration System2010-02-2678-714/+8041
|\ | | | | | | | | | | | | | | Conflicts: tools/qdoc3/cppcodeparser.cpp tools/qdoc3/htmlgenerator.cpp tools/qdoc3/htmlgenerator.h tools/qdoc3/node.cpp
| * Merge branch 'master' of scm.dev.nokia.troll.no:qt/mobility-staging into ↵Qt Continuous Integration System2010-02-263-7/+12
| |\ | | | | | | | | | | | | | | | | | | | | | | | | master-integration * 'master' of scm.dev.nokia.troll.no:qt/mobility-staging: Speed up compilation of this test with MSVC. Fix Symbian build when building for WINSCW with abld. Fix file descriptor leak with generic engine on Linux.
| | * Speed up compilation of this test with MSVC.Rohan McGovern2010-02-261-0/+7
| | | | | | | | | | | | | | | | | | | | | | | | This test includes a source file which is almost half a megabyte in size. When compiling with -O2, MSVC2008 can take over 20 minutes to link this test! Turn off optimization, just for this test.
| | * Merge commit 'f17ba38d5380e458b50ae543b34c52b2a2df8e7e' into ↵Aaron McCarthy2010-02-261-7/+4
| | |\ | | | | | | | | | | | | bearermanagement/staging
| | | * Fix file descriptor leak with generic engine on Linux.Aaron McCarthy2010-02-251-7/+4
| | | |
| | * | Fix Symbian build when building for WINSCW with abld.Aaron McCarthy2010-02-261-0/+1
| | | | | | | | | | | | | | | | Fix include path to find private QtNetwork headers.
| * | | Merge branch 'master' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into ↵Qt Continuous Integration System2010-02-2567-568/+7891
| |\ \ \ | | |/ / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | master-integration * 'master' of scm.dev.nokia.troll.no:qt/oslo-staging-1: (35 commits) Doc: Added a config file for creating Simplified Chinese docs directly. Doc: add a few lines about bearer managment to "What's New" page. Fix the SIMD implementations of QString::toLatin1() Update of the QScriptValue autotest suite. New data set for QScriptValue autotest generator. Autotest: make tst_qchar run out-of-source too Autotest: add a test for roundtrips through toLatin1/fromLatin1 Implement toLatin1_helper with Neon QRegExp::pos() should return -1 for empty/non-matching captures Revert "qdoc: Finished "Inherited by" list for QML elements." Revert "qdoc: List new QML elements in \sincelist for What's New page." Add the Unicode normalisation properties. Autotest: add a test for QDBusPendingCallWatcher use in threads Doc: placeholders for new feature highlights. doc: mark as reimplemented. Update of the QScriptValue autotest suite. New autotests cases for QScriptValue autotests generator. QScriptValue autotest generator templates change. Fix license template. QScriptValue::isQMetaObject crash fix. ...
| | * | Merge branch 'master' of git@scm.dev.nokia.troll.no:qt/oslo-staging-1David Boddie2010-02-2580-169/+7129
| | |\ \
| | | * | Doc: add a few lines about bearer managment to "What's New" page.Volker Hilsheimer2010-02-251-0/+8
| | | | | | | | | | | | | | | | | | | | Needs a screenshot of one of the examples.
| | | * | Fix the SIMD implementations of QString::toLatin1()Benjamin Poulain2010-02-251-7/+13
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The SSE implementation used signed integers. This was failing for characters with high value. The Neon implementation was using >= instead of > for creating the mask Reviewed-by: Samuel Rødal
| | | * | Update of the QScriptValue autotest suite.Jedrzej Nowacki2010-02-252-6/+617
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The test suite was updated after changes in dataset of autotest generator. New test were added: isVariant, isQMetaObject and isQObject. Reviewed-by: Kent Hansen
| | | * | New data set for QScriptValue autotest generator.Jedrzej Nowacki2010-02-251-0/+6
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | New tests data was added. The tests cover a qscriptvalue created by QScriptEngine newQMetaObject(), newVariant() and newQObject() functions. Reviewed-by: Kent Hansen
| | | * | Autotest: make tst_qchar run out-of-source tooThiago Macieira2010-02-252-4/+2
| | | | |
| | | * | Autotest: add a test for roundtrips through toLatin1/fromLatin1Thiago Macieira2010-02-251-0/+107
| | | | |
| | | * | Implement toLatin1_helper with NeonBenjamin Poulain2010-02-251-0/+22
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Implement toLatin1 with neon to process 8 characters at a time. Using Neon improve the speed it there is at least 16 characters, there is no improvement when using it for 8 characters. Speed difference on a N900: -8 characters: no change 100% -16 characters: 126% -1000 characters: 361% -10000 characters: 423% Reviewed-by: Samuel Rødal
| | | * | QRegExp::pos() should return -1 for empty/non-matching capturesJoão Abecasis2010-02-252-3/+101
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Instead, we were returning 0, even if this index did not belong to the match. Task-number: QTBUG-7049 Reviewed-by: Volker Hilsheimer Reviewed-by: Olivier Goffart
| | | * | Revert "qdoc: Finished "Inherited by" list for QML elements."Andreas Aardal Hanssen2010-02-256-44/+35
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This reverts commit 83d7242271cf8196a8133de0406788135e16abbb. Reviewed-by: Martin Smith
| | | * | Revert "qdoc: List new QML elements in \sincelist for What's New page."Andreas Aardal Hanssen2010-02-253-29/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This reverts commit d1b4e4666e4fe1a5fae0571c37535159c097f485. Reviewed-By: Martin Smith
| | | * | Add the Unicode normalisation properties.Thiago Macieira2010-02-241-0/+2650
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Source: http://unicode.org/Public/5.0.0/ucd/DerivedNormalizationProps.txt Reviewed-by: Trust Me
| | | * | Autotest: add a test for QDBusPendingCallWatcher use in threadsThiago Macieira2010-02-241-1/+56
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | I'm satisfied that the finished() signal won't be emitted until the event loop is run, or waitForFinished() is called. However, I'm not fully convinced that there isn't a race condition if you try to waitForFinished() right away. Needs more investigation.
| | | * | Doc: placeholders for new feature highlights.Volker Hilsheimer2010-02-241-0/+6
| | | | |
| | | * | doc: mark as reimplemented.Volker Hilsheimer2010-02-241-0/+3
| | | | |
| | | * | Merge branch 'master' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into ↵Qt Continuous Integration System2010-02-2447-481/+4183
| | | |\ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | master-integration * 'master' of scm.dev.nokia.troll.no:qt/oslo-staging-1: Update of the QScriptValue autotest suite. New autotests cases for QScriptValue autotests generator. QScriptValue autotest generator templates change. Fix license template. QScriptValue::isQMetaObject crash fix. Implement toLatin1_helper with SSE2 Doc: add \since 4.7 to new QtMultimedia classes Autotest: add a test to ensure that the Qt headers are clean. Compile on Linux: close(2) is defined in #include <unistd.h> Improved gesture event delivery in graphicsview. Fixed a gesture autotest. Cache scene coordinates of a hotspot in a QGesture. Add an extra operator delete() to QSharedPointer's internals. Fix compilation on x86 with gcc if SSE2 is not enabled Comments the SSE implementation of fromLatin1_helper() Build fixes for the SIMD functions Implement QString::fromLatin1_helper() with SSE2 Cache the result of qDetectCPUFeatures() Move the SIMD detection from QtGui to QtCore Prevent stale QWidget pointers in QCocoaView
| | | | * | Update of the QScriptValue autotest suite.Jedrzej Nowacki2010-02-241-0/+3114
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | tst_qscriptvalue_generated.cpp was updated after last few autotest generator modifications. Reviewed-by: Kent Hansen
| | | | * | New autotests cases for QScriptValue autotests generator.Jedrzej Nowacki2010-02-241-1/+36
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Few test cases were added. They test values returned from QScriptEngine functions; evaluate(), newDate(), newObject() and newArray(). Reviewed-by: Kent Hansen
| | | | * | QScriptValue autotest generator templates change.Jedrzej Nowacki2010-02-241-0/+8
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Each generated test case should check if a result is deterministic. The future generation of QScriptValue will be based on a state machine. The state might be changed after each function call, so it is worth of testing if result is always the same. Reviewed-by: Kent Hansen
| | | | * | Fix license template.Jedrzej Nowacki2010-02-241-2/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fix license template inside the qscriptvalue autotest generator. Reviewed-by: TrustMe
| | | | * | QScriptValue::isQMetaObject crash fix.Jedrzej Nowacki2010-02-241-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | QScriptValue::isQMetaObject shouldn't crash for a value that internally is represented as a non JSObjects values. Additional check was added to QScriptEnginePrivate::isQMetaObject. Reviewed-by: Kent Hansen
| | | | * | Implement toLatin1_helper with SSE2Benjamin Poulain2010-02-241-6/+48
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Encoding to latin1 can be done 8 characters at a time with SSE2. The speed difference on a current CPU : -<16 characters: no change: 100% -16 characters string: 120% -1000 characters: 230% -10000 characters: 322% Reviewed-by: Samuel Rødal
| | | | * | Doc: add \since 4.7 to new QtMultimedia classesVolker Hilsheimer2010-02-2422-8/+31
| | | | | |
| | | | * | Autotest: add a test to ensure that the Qt headers are clean.Thiago Macieira2010-02-242-1/+87
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The test here is to compile all Qt headers with QT_NO_KEYWORDS as well as ensuring that all #includes have the module prefix. QtDeclarative is currently disabled because the headers aren't clean and I can't fix them until the renaming is done.
| | | | * | Compile on Linux: close(2) is defined in #include <unistd.h>Thiago Macieira2010-02-241-0/+1
| | | | | | | | | | | | | | | | | | | | | | | | Reviewed-by: Trust Me
| | * | | | Doc: Added a config file for creating Simplified Chinese docs directly.David Boddie2010-02-252-1/+87
| | | |/ / | | |/| | | | | | | | | | | | Reviewed-by: Trust Me
| | * | | Improved gesture event delivery in graphicsview.Denis Dzyubenko2010-02-243-244/+343
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Made it possible to delete a gesture target from a gesture event handler. It is still not possible to delete some items (like an item that originated the gesture, i.e. that that the event that triggered the gesture to start), and in that case deleteLater() should be used. Reviewed-by: Andreas Aardal Hanssen
| | * | | Fixed a gesture autotest.Denis Dzyubenko2010-02-241-1/+1
| | | | | | | | | | | | | | | | | | | | Reviewed-by: trustme
| | * | | Cache scene coordinates of a hotspot in a QGesture.Denis Dzyubenko2010-02-244-12/+22
| | | | | | | | | | | | | | | | | | | | Reviewed-by: trustme
| | * | | Add an extra operator delete() to QSharedPointer's internals.Thiago Macieira2010-02-241-0/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Maybe this fixes a warning that MSVC produces. But no guarantees. Task-number: QTBUG-8462 Reviewed-by: Trust Me
| | * | | Fix compilation on x86 with gcc if SSE2 is not enabledThiago Macieira2010-02-241-10/+3
| | | | | | | | | | | | | | | | | | | | Reviewed-By: Benjamin Poulain
| | * | | Comments the SSE implementation of fromLatin1_helper()Benjamin Poulain2010-02-241-3/+9
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Add comments to explain the intrinsics. Comment on the general method. Share the information that it is not worth it to do the same on with Neon.
| | * | | Merge branch 'master' of scm.dev.nokia.troll.no:qt/oslo-staging-1Morten Johan Sørvig2010-02-24156-531/+24071
| | |\ \ \
| | | * \ \ Merge branch 'master' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into ↵Qt Continuous Integration System2010-02-247-208/+427
| | | |\ \ \ | | | | |_|/ | | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | master-integration * 'master' of scm.dev.nokia.troll.no:qt/oslo-staging-1: Build fixes for the SIMD functions Implement QString::fromLatin1_helper() with SSE2 Cache the result of qDetectCPUFeatures() Move the SIMD detection from QtGui to QtCore
| | | | * | Build fixes for the SIMD functionsBenjamin Poulain2010-02-232-2/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Two semicolons were missing for arm. The MMX header was included for all non-x86 platforms.
| | | | * | Merge branch 'master' of scm.dev.nokia.troll.no:qt/oslo-staging-1Benjamin Poulain2010-02-234554-116093/+517052
| | | | |\ \
| | | | * | | Implement QString::fromLatin1_helper() with SSE2Benjamin Poulain2010-02-232-2/+31
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | When there is at least 16 characters, use SSE2 to convert from 8bits to 16 bits. Reviewed-by: Samuel Rødal Reveiwed-by: Thiago Macieira
| | | | * | | Cache the result of qDetectCPUFeatures()Benjamin Poulain2010-02-232-11/+27
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Move the caching of the result from drawhelper to qsimd.cpp. Avoid getting the environment variables when not necessary Reviewed-by: Samuel Rødal
| | | | * | | Move the SIMD detection from QtGui to QtCoreBenjamin Poulain2010-02-236-203/+375
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The SIMD instructions are useful outside painting code, the common functions are moved to QtCore Reviewed-by: Samuel Rødal
| | * | | | | Prevent stale QWidget pointers in QCocoaViewMorten Johan Sørvig2010-02-234-3/+69
| | | |_|/ / | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | QCocoaView has two "back" pointers ot its owning QWidget and the corresponding QWidgetPrivate. The lifetime of the QCocoaView might be longer and that of the QWidget if Cocoa itself holds references to it. In addition accessing a QWidget that is being destroyed is not safe. Set both pack pointers to NULL in ~QWidget. This prevents following stale pointers in the QCocoaView callbacks. This also means that we'll see the NULL pointers, add gurads for that.
* | | | | | Merge branch 'master' of scm.dev.nokia.troll.no:qt/qt-qmlWarwick Allison2010-02-265-48/+71
|\ \ \ \ \ \
| * \ \ \ \ \ Merge branch 'master' of scm.dev.nokia.troll.no:qt/qt-qmlMartin Jones2010-02-2626-383/+469
| |\ \ \ \ \ \
| | * | | | | | Revert "Some animation cleanup/refactoring."Leonardo Sobral Cunha2010-02-262-20/+12
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This reverts commit b5700759da7bccf0ccd6e20b1727950532894ad2.