summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt into 4.7Alan Alpert2010-04-19159-2231/+24731
|\ | | | | | | | | | | Conflicts: doc/src/template/style/style.css tools/qdoc3/htmlgenerator.cpp
| * Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into ↵Qt Continuous Integration System2010-04-1915-128/+147
| |\ | | | | | | | | | | | | | | | | | | | | | | | | | | | 4.7-integration * '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-2: Some QWindowSurface implementations might implement flush as a buffer Set EGL_SWAP_BEHAVIOR to EGL_BUFFER_PRESERVED for regular QWidgets Cleanup & remove unused function overloads from QEgl* APIs QScrollArea: Excessive scrolling in focusNextPrevChild()
| | * Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into ↵Qt Continuous Integration System2010-04-1815-128/+147
| | |\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 4.7-integration * '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-2: Some QWindowSurface implementations might implement flush as a buffer Set EGL_SWAP_BEHAVIOR to EGL_BUFFER_PRESERVED for regular QWidgets Cleanup & remove unused function overloads from QEgl* APIs QScrollArea: Excessive scrolling in focusNextPrevChild()
| | | * Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into ↵Qt Continuous Integration System2010-04-1715-128/+147
| | | |\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 4.7-integration * '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-2: Some QWindowSurface implementations might implement flush as a buffer Set EGL_SWAP_BEHAVIOR to EGL_BUFFER_PRESERVED for regular QWidgets Cleanup & remove unused function overloads from QEgl* APIs QScrollArea: Excessive scrolling in focusNextPrevChild()
| | | | * Some QWindowSurface implementations might implement flush as a bufferBjørn Erik Nilsen2010-04-165-24/+128
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | flip. Such window surfaces therefore destroy the contents during flush. In order to render correctly on these surfaces, any update, no matter how small, needs to trigger the entire window to be redrawn. Auto test included. Task-number: Relates to QTBUG-9978 Reviewed-by: tom
| | | | * Set EGL_SWAP_BEHAVIOR to EGL_BUFFER_PRESERVED for regular QWidgetsTom Cooksey2010-04-162-0/+7
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | QGLWidgets are assumed to be buffer destroyed, however regular QWidgets assume they can to partial updates and thus need the preserved swap behaviour. Reviewed-By: Trond Task-number: QTBUG-9554
| | | | * Cleanup & remove unused function overloads from QEgl* APIsTom Cooksey2010-04-168-102/+10
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This should make stubbing out these APIs slightly easier. Reviewed-By: TrustMe
| | | | * Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into ↵Qt Continuous Integration System2010-04-161-2/+2
| | | | |\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 4.7-integration * '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-2: QScrollArea: Excessive scrolling in focusNextPrevChild()
| | | | | * QScrollArea: Excessive scrolling in focusNextPrevChild()Gabriel de Dietrich2010-04-161-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | We were scrolling horizontally even though the widget already fit the visible area horizontally. And conversely for vertical scrolling. Improves commit f1e92b2fdf6b6fd8aca0d05176c647dd68e21baa. Reviewed-by: Thierry Task-number: QTBUG-9425
| * | | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into ↵Qt Continuous Integration System2010-04-19144-2114/+24577
| |\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 4.7-integration * '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1: (71 commits) Autotest: increase wait time to 3s on Windows to bypass 2s-granularity limitation Autotest: update to the new values for the locale do not expand variables in read()'s file name remove ability to use break() a block outside any loop don't add -unix to the qmake command line Increase the timeout for the QNAM getter test to 30 seconds Remove unstable hosts from the list qdoc: Output TOC for more class ref pages. Other fixes to the remote network stresstester Fix SSL connection problem. Make sure we don't try URLs that aren't HTTP or HTTPS Fix menu bar visibility. Add SSL remote host tests Split the remote and the local tests in two, in preparation for SSL tests Add tests for remote hosts Change the way we calculate the average transfer rates. Finish renaming Move these tests to tests/manual. Add a QNetworkAccessManager stresstest Add a non-blocking native function too ...
| | * \ \ \ \ Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into ↵Qt Continuous Integration System2010-04-18144-2114/+24577
| | |\ \ \ \ \ | | | |/ / / / | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 4.7-integration * '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1: (71 commits) Autotest: increase wait time to 3s on Windows to bypass 2s-granularity limitation Autotest: update to the new values for the locale do not expand variables in read()'s file name remove ability to use break() a block outside any loop don't add -unix to the qmake command line Increase the timeout for the QNAM getter test to 30 seconds Remove unstable hosts from the list qdoc: Output TOC for more class ref pages. Other fixes to the remote network stresstester Fix SSL connection problem. Make sure we don't try URLs that aren't HTTP or HTTPS Fix menu bar visibility. Add SSL remote host tests Split the remote and the local tests in two, in preparation for SSL tests Add tests for remote hosts Change the way we calculate the average transfer rates. Finish renaming Move these tests to tests/manual. Add a QNetworkAccessManager stresstest Add a non-blocking native function too ...
| | | * | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into ↵Qt Continuous Integration System2010-04-17144-2114/+24577
| | | |\ \ \ \ | | | | |/ / / | | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 4.7-integration * '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1: (71 commits) Autotest: increase wait time to 3s on Windows to bypass 2s-granularity limitation Autotest: update to the new values for the locale do not expand variables in read()'s file name remove ability to use break() a block outside any loop don't add -unix to the qmake command line Increase the timeout for the QNAM getter test to 30 seconds Remove unstable hosts from the list qdoc: Output TOC for more class ref pages. Other fixes to the remote network stresstester Fix SSL connection problem. Make sure we don't try URLs that aren't HTTP or HTTPS Fix menu bar visibility. Add SSL remote host tests Split the remote and the local tests in two, in preparation for SSL tests Add tests for remote hosts Change the way we calculate the average transfer rates. Finish renaming Move these tests to tests/manual. Add a QNetworkAccessManager stresstest Add a non-blocking native function too ...
| | | | * | | Autotest: increase wait time to 3s on Windows to bypass 2s-granularity ↵Thiago Macieira2010-04-171-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | limitation
| | | | * | | 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
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | it is positively backwards to apply any expansions at such a low level - they have already been applied where necessary. Reviewed-by: mariusSO
| | | | * | | remove ability to use break() a block outside any loopOswald Buddenhagen2010-04-161-2/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | it is a completely bizarre feature which is nowhere documented and no justification for it is provided anywhere. Reviewed-by: mariusSO
| | | | * | | don't add -unix to the qmake command lineOswald Buddenhagen2010-04-161-1/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | it is redundant now and causes warnings from qmake Reviewed-by: mariusSO
| | | | * | | 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
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | You can't do connectToHost followed by startClientEncryption followed by write.
| | | | | * | | 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
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | We no longer show the menu bar if it is not native and doesn't have a parent widget.
| | | | | * | | 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
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The previous way was prone to division by zero if the file was too small
| | | | | * | | 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
| | | | | | | |
| | | | | * | | Add a TCP stress-test testThiago Macieira2010-04-166-0/+18418
| | | | | | | |
| | | | | * | | Document the time format pattern for timezone info.Denis Dzyubenko2010-04-161-0/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Apparently Qt already supports a format pattern for the timezone info, so it should be mentioned in the doc. Reviewed-by: Thiago
| | | | | * | | Convert date/time format to something that Qt understandsDenis Dzyubenko2010-04-163-424/+547
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The date/time format in QLocale originate from unicode CLDR which has more format patterns that Qt understands, so when generating date for QLocale we remove unsupported patterns and convert some other to something that Qt understands. Task-number: QTBUG-9500 Reviewed-by: Thiago
| | | | | * | | adding new entries to qt::key enumAdam Wasila2010-04-161-0/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | documentation updated with two new Qt::Key keys
| | | | | * | | adding new entries to qt::key enumAdam Wasila2010-04-162-2/+4
| | | | | | | |
| | | | * | | | qdoc: Output TOC for more class ref pages.Martin Smith2010-04-161-10/+6
| | | | |/ / /
| | | | * | | Merge branch '4.7' of git@scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.7Martin Smith2010-04-16188-2488/+2151
| | | | |\ \ \
| | | | | * | | Fix tst_QEventLoop::exec() regression introduced by commit ↵Bradley T. Hughes2010-04-165-19/+35
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 816523117bc00cfeb17e347f7fe5f11278a5e871 The quitNow flag needs to be reset at the beginning of exec() to allow exec() to recurse and be run multiple times. This changes reverts commit 816523117bc00cfeb17e347f7fe5f11278a5e871 an introduces the QThreadPrivate::exited flag to fix the race between start() and exit(), and QThreadPrivate::returnCode to make sure exec() returns the code passed to exit(). Task-number: QTBUG-1184 Reviewed-by: olivier
| | | | | * | | Fix building of corelib, network and gui with qconfig minimal.Aaron McCarthy2010-04-165-0/+14
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The bearer management code, which this bug is for, was fixed by MR 517 previously. Task-number: QTBUG-9493 Reviewed-by: alex