summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Merge branch 'master' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into ↵Qt Continuous Integration System2010-11-257-66/+133
|\ | | | | | | | | | | | | | | | | | | | | master-integration * 'master' of scm.dev.nokia.troll.no:qt/oslo-staging-2: Stream raw image data instead of PNG: more info, and faster. Generate thumbnails for faster loading of the web reports Separate reports from adhoc and pulse runs Add cmd to simulate testfail. Misc server improvements. Added command to clear all baselines
| * Merge branch 'master' of scm.dev.nokia.troll.no:qt/oslo-staging-2aavit2010-11-25537-13954/+11950
| |\
| * | Stream raw image data instead of PNG: more info, and faster.aavit2010-11-242-4/+50
| | |
| * | Generate thumbnails for faster loading of the web reportsaavit2010-11-233-5/+24
| | |
| * | Separate reports from adhoc and pulse runsaavit2010-11-222-2/+4
| | |
| * | Add cmd to simulate testfail. Misc server improvements.aavit2010-11-222-10/+45
| | |
| * | Added command to clear all baselinesaavit2010-11-193-53/+18
| | |
* | | Merge branch 'master' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into ↵Qt Continuous Integration System2010-11-255-19/+44
|\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | master-integration * 'master' of scm.dev.nokia.troll.no:qt/oslo-staging-1: qmake/MinGW: do not copy .pdb files on "make install" Allow setting LD, RANLIB, OBJDUMP, and STRIP as one can do with autoconf scripts.
| * | | qmake/MinGW: do not copy .pdb files on "make install"Sean Harmer2010-11-254-18/+41
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Simply refactoring pdb part into the nmake generator at this stage. Some work is being repeated from the base class implementation. Will get it working first then see if I can refactor to remove the redundancy. Task-number: QTBUG-14236 Merge-request: 2506 Reviewed-by: Joerg Bornemann <joerg.bornemann@nokia.com>
| * | | Allow setting LD, RANLIB, OBJDUMP, and STRIP as one can do with autoconf ↵Sam Magnuson2010-11-251-1/+3
|/ / / | | | | | | | | | | | | | | | | | | scripts. Merge-request: 937 Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com>
* | | Merge branch 'master' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into ↵Qt Continuous Integration System2010-11-2533-132/+513
|\ \ \ | | |/ | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | master-integration * 'master' of scm.dev.nokia.troll.no:qt/oslo-staging-2: QThread: fix a race condition when destroying or restarting thread from finished() QThreadStorage: fix crash if thread local destructor reset himself Add WA_MacNoShadow widget attribute Doc: Fixing typo Fix compilation on symbian Fix a namespace error and some warnings found by clang optimize ligatureHelper by using qBinaryFind instead of the for loop QFileSystemWatcher: Do not require QApplication in the destructor. Do not define METHOD if QT_NO_KEYWORD is defined. QThreadPrivate::finish should not keep mutex locked when calling signals Make QThreadStorage supports value type and not only pointers. QThreadStorage: fix memory leak if thread storage are added while destroying Compile fix. Fix some warnings on Mac
| * | QThread: fix a race condition when destroying or restarting thread from ↵Olivier Goffart2010-11-245-3/+68
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | finished() Since we do not keep the mutex locked in QThreadPrivate::finish, We could have races if the thread is destroyed or restarted from another thread while we are still in that function This solve tst_QCoreApplication::deliverInDefinedOrder on mac Regression since a43583e0221311b7fe666726a Reviewed-by: Brad
| * | QThreadStorage: fix crash if thread local destructor reset himselfOlivier Goffart2010-11-242-0/+49
| | | | | | | | | | | | | | | | | | | | | | | | | | | Regression in ed8f3b6c98f1b305f0d183bc70c5f810a9c45ef2 (QTBUG-14579) WebKit ThreadSpecific implementation does that. See the comment in ThreadSpecific<T>::destroy(void*) Reveiwed-by: Brad
| * | Add WA_MacNoShadow widget attributeArvid Ephraim Picciani2010-11-243-1/+9
| | | | | | | | | | | | | | | Task-number: QTBUG-6831 Reviewed-by: Fabien Freling <fabien.freling@nokia.com>
| * | Merge branch 'master' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into ↵Qt Continuous Integration System2010-11-2429-130/+389
| |\ \ |/ / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | master-integration * 'master' of scm.dev.nokia.troll.no:qt/oslo-staging-2: Doc: Fixing typo Fix compilation on symbian Fix a namespace error and some warnings found by clang optimize ligatureHelper by using qBinaryFind instead of the for loop QFileSystemWatcher: Do not require QApplication in the destructor. Do not define METHOD if QT_NO_KEYWORD is defined. QThreadPrivate::finish should not keep mutex locked when calling signals Make QThreadStorage supports value type and not only pointers. QThreadStorage: fix memory leak if thread storage are added while destroying Compile fix. Fix some warnings on Mac
| * | Merge branch 'master' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into ↵Qt Continuous Integration System2010-11-2329-130/+389
| |\ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | master-integration * 'master' of scm.dev.nokia.troll.no:qt/oslo-staging-2: Doc: Fixing typo Fix compilation on symbian Fix a namespace error and some warnings found by clang optimize ligatureHelper by using qBinaryFind instead of the for loop QFileSystemWatcher: Do not require QApplication in the destructor. Do not define METHOD if QT_NO_KEYWORD is defined. QThreadPrivate::finish should not keep mutex locked when calling signals Make QThreadStorage supports value type and not only pointers. QThreadStorage: fix memory leak if thread storage are added while destroying Compile fix. Fix some warnings on Mac
| | * | Doc: Fixing typoSergio Ahumada2010-11-232-2/+2
| | | |
| | * | Fix compilation on symbianOlivier Goffart2010-11-231-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Introduced with 360f596183969a4c69 armcc cannot find the static operator in qBinaryFind Reviewed-by: axis
| | * | Fix a namespace error and some warnings found by clangJiang Jiang2010-11-2312-39/+33
| | | | | | | | | | | | | | | | Reviewed-by: Fabien Freling
| | * | Merge branch 'master' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into ↵Qt Continuous Integration System2010-11-2220-91/+356
| | |\ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | master-integration * 'master' of scm.dev.nokia.troll.no:qt/oslo-staging-2: optimize ligatureHelper by using qBinaryFind instead of the for loop QFileSystemWatcher: Do not require QApplication in the destructor. Do not define METHOD if QT_NO_KEYWORD is defined. QThreadPrivate::finish should not keep mutex locked when calling signals Make QThreadStorage supports value type and not only pointers. QThreadStorage: fix memory leak if thread storage are added while destroying Compile fix. Fix some warnings on Mac
| | | * | optimize ligatureHelper by using qBinaryFind instead of the for loopKonstantin Ritt2010-11-221-7/+19
| | | | | | | | | | | | | | | | | | | | | | | | | Merge-request: 890 Reviewed-by: Olivier Goffart <olivier.goffart@nokia.com>
| | | * | QFileSystemWatcher: Do not require QApplication in the destructor.Olivier Goffart2010-11-224-8/+23
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | QThread::quit() is threadsafe, and can safely (and should) be called from the parent thread. Using invokeMethod requires an instance of QCoreApplication. There is no reason we should depend on that. Task-number: QTBUG-15255 Task-number: QT-3305 Reviewed-by: Denis Reviewed-by: Brad
| | | * | Do not define METHOD if QT_NO_KEYWORD is defined.Olivier Goffart2010-11-221-2/+6
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | METHOD is never used in Qt, and is conflicting with other libraries. Task-number: QTBUG-14514 Reviewed-by: Joao Reviewed-by: Brad
| | | * | QThreadPrivate::finish should not keep mutex locked when calling signalsOlivier Goffart2010-11-223-28/+114
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This fix the deadlock shown in the new test wait3_slowDestructor Add a test for QThread::wait(timeout) Task-number: QTBUG-15030 Reviewed-by: Joao Reviewed-by: Brad
| | | * | Make QThreadStorage supports value type and not only pointers.Olivier Goffart2010-11-224-39/+104
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Handling value type is much more natural than handling pointer. It was not possible to use normal type in QThreadStorage previously (probably because some compiler would not support it?) This should ease a lot the use of QThreadStorage and make it more intuitive. The only problem was the QThreadStorage::deleteData() that would not compile for nonn-pointer. This is now fixed Also updated the documentation. Reviewed-by: Joao Reviewed-by: Brad Task-number: QTBUG-15033
| | | * | QThreadStorage: fix memory leak if thread storage are added while destroyingOlivier Goffart2010-11-222-3/+76
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The destructor(q) function could use itself and create new QThreadStorage. This might be the case for example, when using qDebug in a destructor. Task-number: QTBUG-14579 Reveiwed-by: Joao Reviewed-by: Brad
| | | * | Compile fix.Yoann Lopes2010-11-221-3/+3
| | | | |
| | | * | Fix some warnings on MacJiang Jiang2010-11-226-1/+11
| | | | | | | | | | | | | | | | | | | | Reviewed-by: Fabien Freling
* | | | | Merge branch 'master' of scm.dev.nokia.troll.no:qt/qt-water-staging into ↵Qt Continuous Integration System2010-11-243-8/+8
|\ \ \ \ \ | |/ / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | master-integration * 'master' of scm.dev.nokia.troll.no:qt/qt-water-staging: Doc: Fixing typo Fixed a shadow warning when including QtSql. Fixed a shadow warning when including QTest
| * | | | Doc: Fixing typoSergio Ahumada2010-11-221-1/+1
| | | | |
| * | | | Merge branch 'master-upstream' into master-waterThierry Bastian2010-11-211-3/+2
| |\ \ \ \ | | | |/ / | | |/| |
| * | | | Merge branch 'master-upstream' into master-waterThierry Bastian2010-11-20497-13724/+10994
| |\ \ \ \
| * \ \ \ \ Merge branch 'master-upstream' into master-waterThierry Bastian2010-11-194-13/+44
| |\ \ \ \ \
| * \ \ \ \ \ Merge branch 'master-upstream' into master-waterThierry Bastian2010-11-184-11/+93
| |\ \ \ \ \ \
| * \ \ \ \ \ \ Merge branch 'master-upstream' into master-waterThierry Bastian2010-11-1712-37/+324
| |\ \ \ \ \ \ \
| * \ \ \ \ \ \ \ Merge branch 'master-upstream' into master-waterThierry Bastian2010-11-16377-4917/+12192
| |\ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ Merge branch 'master-upstream' into master-waterThierry Bastian2010-11-128-15/+121
| |\ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ Merge branch 'master-upstream' into master-waterThierry Bastian2010-11-11129-1034/+2369
| |\ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ Merge branch 'master-upstream' into master-waterThierry Bastian2010-11-108-14/+42
| |\ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ Merge branch 'master-upstream' into master-waterThierry Bastian2010-11-0914-164/+222
| |\ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'master-upstream' into master-waterThierry Bastian2010-11-07191-1898/+23784
| |\ \ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'master-upstream' into master-waterThierry Bastian2010-11-064-39/+31
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'master-upstream' into master-waterThierry Bastian2010-11-0532-379/+631
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'master-upstream' into master-waterThierry Bastian2010-11-04857-59571/+55411
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | | Fixed a shadow warning when including QtSql.Kimmo Kotajärvi2010-10-291-5/+5
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge-request: 766 Reviewed-by: Frederik
| * | | | | | | | | | | | | | | | | Fixed a shadow warning when including QTestKimmo Kotajärvi2010-10-291-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Reviewed-by: Frederik
* | | | | | | | | | | | | | | | | | Merge branch 'master' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into ↵Qt Continuous Integration System2010-11-232-3/+21
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|/ / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | master-integration * 'master' of scm.dev.nokia.troll.no:qt/oslo-staging-1: qt_reg_winclass(): use RegisterClassEx() to load the small IDI_ICON1 icon correctly QHash is a bit faster than QMap and thus preferable if sorting by the key is unneeded
| * | | | | | | | | | | | | | | | | qt_reg_winclass(): use RegisterClassEx() to load the small IDI_ICON1 icon ↵miniak2010-11-231-1/+19
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | correctly Merge-request: 769 Reviewed-by: Joerg Bornemann <joerg.bornemann@nokia.com>
| * | | | | | | | | | | | | | | | | QHash is a bit faster than QMap and thus preferable if sorting by the key is ↵Konstantin Ritt2010-11-231-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | unneeded Merge-request: 2501 Reviewed-by: Denis Dzyubenko <denis.dzyubenko@nokia.com>
* | | | | | | | | | | | | | | | | | Merge branch 'master' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into ↵Qt Continuous Integration System2010-11-2215-249/+600
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / / / / / / / | | | | | | | | | | | | | | | | / / | |_|_|_|_|_|_|_|_|_|_|_|_|_|_|/ / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | master-integration * 'master' of scm.dev.nokia.troll.no:qt/oslo-staging-1: Make lupdate recognize TRANSLATOR comments in QtScript files no_debug_info.prf: Also handle MSVC. Revert "Don't destroy Qt's internal pthread_key_t if it was not initialized" Revert "Resolve two save/restore geometry issues on X11." Fix QScriptValue::construct. Split tst_QScriptValue::construct tests into smaller chunks. Docs: QTBUG-10866 Description of how an AutoConnection is resolved. Add script translation test data for plural forms Refactor script translation tests Resolve two save/restore geometry issues on X11. Split newQObject tests into smaller chunks. Compile fix Don't destroy Qt's internal pthread_key_t if it was not initialized