summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Add (correct) .pro files to INSTALLs.Frans Englich2010-04-212-2/+2
| | | | Complements previous commit.
* Assign UID3, install example files, remove redundant code.Frans Englich2010-04-212-6/+11
| | | | | | This demo still needs work on Symbian, related is QTBUG-10095. Reviewed-by: Jason Barron
* Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-s60-public into ↵Qt Continuous Integration System2010-04-219-25/+50
|\ | | | | | | | | | | | | | | | | | | | | | | | | | | 4.7-integration * '4.7' of scm.dev.nokia.troll.no:qt/qt-s60-public: Make tst_qdialog::throwInExec work with symbian exception policy Use a compile time constant for the C epoch as a julian day. Fix test failures for qdatetime on symbian and wince Fix compile error in QFileDialog autotest Fix to collections autotest Fixed vendor info in fluidlauncher sis package. Fix default_deployment.pkg_prerules Fix crash on startup on Symbian OS
| * Make tst_qdialog::throwInExec work with symbian exception policyShane Kearns2010-04-211-1/+7
| | | | | | | | | | | | | | | | | | | | On Symbian, exceptions are absorbed by the event loop. This behaviour is inside the user library where we can't modify it. Only std::exception or leaves are supported, other exceptions will cause an assert fail in the symbian code. So the test is changed to throw a std::exception derived class Reviewed-by: mread
| * Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-s60-public into ↵Qt Continuous Integration System2010-04-208-24/+43
| |\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 4.7-integration * '4.7' of scm.dev.nokia.troll.no:qt/qt-s60-public: Use a compile time constant for the C epoch as a julian day. Fix test failures for qdatetime on symbian and wince Fix compile error in QFileDialog autotest Fix to collections autotest Fixed vendor info in fluidlauncher sis package. Fix default_deployment.pkg_prerules Fix crash on startup on Symbian OS
| | * Use a compile time constant for the C epoch as a julian day.Shane Kearns2010-04-201-3/+4
| | | | | | | | | | | | | | | | | | | | | The julian day calculation is complex, so capturing the value and storing as a compile time constant will save some calculations at runtime. Reviewed-by: Thiago Macieira
| | * Fix test failures for qdatetime on symbian and winceShane Kearns2010-04-201-1/+1
| | | | | | | | | | | | Reviewed-by: Thiago Macieira
| | * Fix compile error in QFileDialog autotestShane Kearns2010-04-201-1/+1
| | | | | | | | | | | | Reviewed-by: Trust Me
| | * Fix to collections autotestShane Kearns2010-04-201-1/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | The test was checking for an implementation detail, rather than behaviour which is part of the API. With the symbian text codecs backend, this test failed because the converter returns QByteArray() for empty input (for which isNull() returns true). Reviewed-by: Thiago
| | * Fixed vendor info in fluidlauncher sis package.Miikka Heikkinen2010-04-201-1/+2
| | | | | | | | | | | | | | | | | | | | | | | | Fluidlauncher was using default vendor info while all other demos used Nokia as vendor. Task-number: QTBUG-10051 Reviewed-by: Janne Koskinen
| | * Fix default_deployment.pkg_prerulesMiikka Heikkinen2010-04-202-11/+18
| | | | | | | | | | | | | | | | | | | | | | | | Due to Symbian mkspecs refactoring, some changes from 4.6 didn't get properly merged into 4.7. Task-number: QTBUG-10050 Reviewed-by: Janne Koskinen
| | * Fix crash on startup on Symbian OSShane Kearns2010-04-202-6/+17
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The changes to QThread introduced by commit 9aa4538b219ed759a47e8d1f93c2797bf07b5e2f mean that the QThread constructor calls into the event dispatcher. The Symbian event dispatcher owns a QThread, so it crashed when the code re-entered the partially constructed event dispatcher and used an uninitialised pointer. This change delays construction of the QThread until the point of use, so that the event dispatcher is fully constructed. Task-number: QTBUG-10029 Reviewed-by: Jason Barron
* | | 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
| | | | | | | |
generated by cgit v0.12 at 2025-08-16 04:38:10 (GMT)