summaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
...
* Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7Aaron Kennedy2010-04-2048-9/+808
|\
| * Add drag.active property to MouseArea in qmlLeonardo Sobral Cunha2010-04-205-9/+120
| * Add an examples.qmlproject for all QML examples.Yann Bodson2010-04-201-0/+16
| * Add .qmlproject files to declarative examples.Yann Bodson2010-04-2042-0/+672
* | Handle overrides correctly in extension objectsAaron Kennedy2010-04-204-2/+119
|/
* Allow Loader sourceComponent to be set to undefeined.Martin Jones2010-04-204-3/+35
* Doc fix.Michael Brasser2010-04-191-3/+10
* Minor internal anchor refactoring.Michael Brasser2010-04-196-123/+122
* Doc clarification.Michael Brasser2010-04-191-2/+4
* Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt into 4.7Alan Alpert2010-04-19159-2231/+24731
|\
| * 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
| | | | | * | | Add some statistics in the transfer rateThiago Macieira2010-04-161-30/+87
| | | | | * | | Add the test to the testsuite, but disabledThiago Macieira2010-04-162-0/+9
| | | | | * | | Make sure we read the data, to avoid keeping it all on RAMThiago Macieira2010-04-161-2/+8
| | | | | * | | Update the parallel test to do different counts of parallel testsThiago Macieira2010-04-161-3/+16
| | | | | * | | Add an event-loop based test that does parallel fetchesThiago Macieira2010-04-161-3/+36
| | | | | * | | Add a simple event-loop based testThiago Macieira2010-04-161-0/+26
| | | | | * | | Add two more blocking testsThiago Macieira2010-04-161-1/+98