summaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'master' of git:qt/oslo-staging-2Thiago Macieira2010-04-225-4/+86
|\
| * QAbstractGraphicsShapeItem: ignore already set pen or brushMarkus Hossner2010-04-211-0/+6
| * Made sure that QTabWidget reported a big enough size hint.Jan-Arve Sæther2010-04-213-4/+79
| * Fixed wasted space in the texture cache.Gunnar Sletta2010-03-151-1/+1
| * Get debug code compiling since function signature changesGunnar Sletta2010-03-151-10/+4
| * --warn;Gunnar Sletta2010-03-122-6/+6
* | Merge branch 'master' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into master...Qt Continuous Integration System2010-04-221-3/+1
|\ \
| * | QSettings: Fix isWritable incorrectly returning true on linux.Christian Kamm2010-04-211-3/+1
|/ /
* | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-webkit into 4.7-integrationQt Continuous Integration System2010-04-2111-21/+36
|\ \
| * \ Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-webkit into 4.7-integrationQt Continuous Integration System2010-04-2011-21/+36
| |\ \ |/ / /
| * | QtWebKit: Fixes compilation on MSVC 64Jocelyn Turcotte2010-04-193-4/+4
| * | QtWebKit: Remove translatable strings from tests/hybridPixmap.Jocelyn Turcotte2010-04-191-5/+5
| * | Remove overloaded placement new operatorsJanne Koskinen2010-04-192-2/+0
| * | WINSCW compiler fix, too eager to solve inlinesJanne Koskinen2010-04-191-2/+4
| * | WINSCW boolean fix for XPATHJanne Koskinen2010-04-192-2/+16
| * | WINSCW compile fix for HashMapJanne Koskinen2010-04-191-4/+4
| * | WINSCW compile fix for WebCoreJanne Koskinen2010-04-191-2/+3
* | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into 4.7-integ...Qt Continuous Integration System2010-04-1915-128/+147
|\ \ \
| * \ \ Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into 4.7-integ...Qt Continuous Integration System2010-04-1815-128/+147
| |\ \ \
| | * \ \ Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into 4.7-integ...Qt Continuous Integration System2010-04-1715-128/+147
| | |\ \ \
| | | * | | Some QWindowSurface implementations might implement flush as a bufferBjørn Erik Nilsen2010-04-165-24/+128
| | | * | | Set EGL_SWAP_BEHAVIOR to EGL_BUFFER_PRESERVED for regular QWidgetsTom Cooksey2010-04-162-0/+7
| | | * | | Cleanup & remove unused function overloads from QEgl* APIsTom Cooksey2010-04-168-102/+10
| | | * | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into 4.7-integ...Qt Continuous Integration System2010-04-161-2/+2
| | | |\ \ \
| | | | * | | QScrollArea: Excessive scrolling in focusNextPrevChild()Gabriel de Dietrich2010-04-161-2/+2
* | | | | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.7-integ...Qt Continuous Integration System2010-04-19144-2114/+24577
|\ \ \ \ \ \ \ | |_|_|_|_|/ / |/| | | | | |
| * | | | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.7-integ...Qt Continuous Integration System2010-04-18144-2114/+24577
| |\ \ \ \ \ \ | | |/ / / / / | |/| | | | |
| | * | | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.7-integ...Qt Continuous Integration System2010-04-17144-2114/+24577
| | |\ \ \ \ \ | | | |/ / / / | | |/| | | |
| | | * | | | Autotest: increase wait time to 3s on Windows to bypass 2s-granularity limita...Thiago Macieira2010-04-171-1/+1
| | | * | | | Autotest: update to the new values for the localeThiago Macieira2010-04-171-3/+3
| | | * | | | do not expand variables in read()'s file nameOswald Buddenhagen2010-04-161-2/+1
| | | * | | | remove ability to use break() a block outside any loopOswald Buddenhagen2010-04-161-2/+0
| | | * | | | don't add -unix to the qmake command lineOswald Buddenhagen2010-04-161-1/+0
| | | * | | | Increase the timeout for the QNAM getter test to 30 secondsThiago Macieira2010-04-161-3/+3
| | | * | | | Remove unstable hosts from the listThiago Macieira2010-04-161-2/+0
| | | * | | | Merge branch '4.7' of git@scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.7Martin Smith2010-04-1618-429/+20214
| | | |\ \ \ \
| | | | * | | | Other fixes to the remote network stresstesterThiago Macieira2010-04-161-8/+7
| | | | * | | | Fix SSL connection problem.Thiago Macieira2010-04-161-4/+6
| | | | * | | | Make sure we don't try URLs that aren't HTTP or HTTPSThiago Macieira2010-04-161-3/+5
| | | | * | | | Fix menu bar visibility.Fabien Freling2010-04-161-3/+3
| | | | * | | | Add SSL remote host testsThiago Macieira2010-04-161-34/+95
| | | | * | | | Split the remote and the local tests in two, in preparation for SSL testsThiago Macieira2010-04-166-266/+465
| | | | * | | | Add tests for remote hostsThiago Macieira2010-04-163-9/+322
| | | | * | | | Change the way we calculate the average transfer rates.Thiago Macieira2010-04-161-49/+84
| | | | * | | | Finish renamingThiago Macieira2010-04-162-7/+4
| | | | * | | | Move these tests to tests/manual.Thiago Macieira2010-04-167-2/+0
| | | | * | | | Add a QNetworkAccessManager stresstestThiago Macieira2010-04-162-17/+142
| | | | * | | | Add a non-blocking native function tooThiago Macieira2010-04-161-33/+162
| | | | * | | | Move the code around into a function and add an alarm(2) on UnixThiago Macieira2010-04-161-54/+66
| | | | * | | | Add a native test to compare withThiago Macieira2010-04-161-0/+126