summaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'master' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into master...Qt Continuous Integration System2010-11-2533-132/+513
|\
| * QThread: fix a race condition when destroying or restarting thread from finis...Olivier Goffart2010-11-245-3/+68
| * QThreadStorage: fix crash if thread local destructor reset himselfOlivier Goffart2010-11-242-0/+49
| * Add WA_MacNoShadow widget attributeArvid Ephraim Picciani2010-11-243-1/+9
| * Merge branch 'master' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into master...Qt Continuous Integration System2010-11-2429-130/+389
| |\ |/ /
| * Merge branch 'master' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into master...Qt Continuous Integration System2010-11-2329-130/+389
| |\
| | * Doc: Fixing typoSergio Ahumada2010-11-232-2/+2
| | * Fix compilation on symbianOlivier Goffart2010-11-231-2/+2
| | * Fix a namespace error and some warnings found by clangJiang Jiang2010-11-2312-39/+33
| | * Merge branch 'master' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into master...Qt Continuous Integration System2010-11-2220-91/+356
| | |\
| | | * optimize ligatureHelper by using qBinaryFind instead of the for loopKonstantin Ritt2010-11-221-7/+19
| | | * QFileSystemWatcher: Do not require QApplication in the destructor.Olivier Goffart2010-11-224-8/+23
| | | * Do not define METHOD if QT_NO_KEYWORD is defined.Olivier Goffart2010-11-221-2/+6
| | | * QThreadPrivate::finish should not keep mutex locked when calling signalsOlivier Goffart2010-11-223-28/+114
| | | * Make QThreadStorage supports value type and not only pointers.Olivier Goffart2010-11-224-39/+104
| | | * QThreadStorage: fix memory leak if thread storage are added while destroyingOlivier Goffart2010-11-222-3/+76
| | | * Compile fix.Yoann Lopes2010-11-221-3/+3
| | | * Fix some warnings on MacJiang Jiang2010-11-226-1/+11
* | | | Merge branch 'master' of scm.dev.nokia.troll.no:qt/qt-water-staging into mast...Qt Continuous Integration System2010-11-243-8/+8
|\ \ \ \ | |/ / / |/| | |
| * | | 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
| * | | | | | | | | | | | | | | | Fixed a shadow warning when including QTestKimmo Kotajärvi2010-10-291-2/+2
* | | | | | | | | | | | | | | | | Merge branch 'master' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into master...Qt Continuous Integration System2010-11-232-3/+21
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|/ |/| | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | qt_reg_winclass(): use RegisterClassEx() to load the small IDI_ICON1 icon cor...miniak2010-11-231-1/+19
| * | | | | | | | | | | | | | | | QHash is a bit faster than QMap and thus preferable if sorting by the key is ...Konstantin Ritt2010-11-231-2/+2
* | | | | | | | | | | | | | | | | Merge branch 'master' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into master...Qt Continuous Integration System2010-11-2215-249/+600
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / / / / / / | | | | | | | | | | | | | | | | / | |_|_|_|_|_|_|_|_|_|_|_|_|_|_|/ |/| | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | Make lupdate recognize TRANSLATOR comments in QtScript filesKent Hansen2010-11-225-12/+205
| * | | | | | | | | | | | | | | no_debug_info.prf: Also handle MSVC.hjk2010-11-221-4/+13
| * | | | | | | | | | | | | | | Revert "Don't destroy Qt's internal pthread_key_t if it was not initialized"Bradley T. Hughes2010-11-221-8/+8
| * | | | | | | | | | | | | | | Revert "Resolve two save/restore geometry issues on X11."Morten Johan Sørvig2010-11-222-7/+7
| * | | | | | | | | | | | | | | Fix QScriptValue::construct.Jedrzej Nowacki2010-11-223-1/+27
| * | | | | | | | | | | | | | | Split tst_QScriptValue::construct tests into smaller chunks.Jedrzej Nowacki2010-11-222-107/+147
| * | | | | | | | | | | | | | | Docs: QTBUG-10866 Description of how an AutoConnection is resolved.Peter Yard2010-11-221-5/+4
| * | | | | | | | | | | | | | | Merge branch 'master' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into master...Qt Continuous Integration System2010-11-209-135/+219
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ |/ / / / / / / / / / / / / / / /
| * | | | | | | | | | | | | | | Merge branch 'master' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into master...Qt Continuous Integration System2010-11-199-135/+219
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |_|_|_|_|_|_|_|_|_|_|_|_|_|/ | |/| | | | | | | | | | | | | |
| | * | | | | | | | | | | | | | Add script translation test data for plural formsKent Hansen2010-11-194-0/+30