summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Merge remote branch 'origin/4.7' into lighthouseJørgen Lind2010-04-216942-225895/+450724
|\ | | | | | | | | | | | | | | | | | | | | | | Conflicts: configure src/gui/kernel/qapplication.cpp src/gui/painting/qbackingstore.cpp src/opengl/qgl.cpp src/opengl/qgl_p.h src/plugins/plugins.pro tests/auto/declarative/qdeclarativedom/data/importlib/sublib/qmldir tools/tools.pro
| * Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-webkit into 4.7-integrationQt Continuous Integration System2010-04-2111-21/+36
| |\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * '4.7' of scm.dev.nokia.troll.no:qt/qt-webkit: QtWebKit: Fixes compilation on MSVC 64 QtWebKit: Remove translatable strings from tests/hybridPixmap. Remove overloaded placement new operators WINSCW compiler fix, too eager to solve inlines WINSCW boolean fix for XPATH WINSCW compile fix for HashMap WINSCW compile fix for WebCore
| | * Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-webkit into 4.7-integrationQt Continuous Integration System2010-04-2011-21/+36
| | |\ | |/ / | | | | | | | | | | | | | | | | | | | | | | | | | | | * '4.7' of scm.dev.nokia.troll.no:qt/qt-webkit: QtWebKit: Fixes compilation on MSVC 64 QtWebKit: Remove translatable strings from tests/hybridPixmap. Remove overloaded placement new operators WINSCW compiler fix, too eager to solve inlines WINSCW boolean fix for XPATH WINSCW compile fix for HashMap WINSCW compile fix for WebCore
| | * QtWebKit: Fixes compilation on MSVC 64Jocelyn Turcotte2010-04-193-4/+4
| | | | | | | | | | | | | | | | | | This patch should be overwritten by the next import of QtWebKit trunk Reviewed-by: TrustMe
| | * QtWebKit: Remove translatable strings from tests/hybridPixmap.Jocelyn Turcotte2010-04-191-5/+5
| | | | | | | | | | | | Reviewed-by: TrustMe
| | * Remove overloaded placement new operatorsJanne Koskinen2010-04-192-2/+0
| | | | | | | | | | | | | | | | | | WINSCW and Sun OS build fix. placement new is already defined in NonCopyable, no need for overloading. Reviewed-by: Simon Hausmann
| | * WINSCW compiler fix, too eager to solve inlinesJanne Koskinen2010-04-191-2/+4
| | | | | | | | | | | | | | | | | | | | | WINSCW tries immediately solve inlines causing forward declared classes to be used before they are defined. Reviewed-by: Simon Hausmann
| | * WINSCW boolean fix for XPATHJanne Koskinen2010-04-192-2/+16
| | | | | | | | | | | | | | | | | | | | | WINSCW cannot determine boolean type unless it is explicitly defined. This fix needs to be re-applied always when files are regenerated. Reviewed-by: Simon Hausmann
| | * WINSCW compile fix for HashMapJanne Koskinen2010-04-191-4/+4
| | | | | | | | | | | | | | | | | | | | | WINSCW with templates function declarations and definitions will have to use same names for variables or you get 'undefined identifier' Reviewed-by: Miikka Heikkinen
| | * WINSCW compile fix for WebCoreJanne Koskinen2010-04-191-2/+3
| | | | | | | | | | | | | | | | | | | | | WINSCW fails to parse function pointer name if it is not introduced before use. Reviewed-by: Miikka Heikkinen
| * | 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
| | | | | | | |
generated by cgit v0.12 at 2025-02-13 19:00:41 (GMT)