summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Merge branch '4.6' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into ↵Qt Continuous Integration System2010-02-0915-302/+313
|\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 4.6-integration * '4.6' of scm.dev.nokia.troll.no:qt/oslo-staging-1: Tidy the changes file. Skip the transparent pixels when doing the sourceOver Refactor comp_func_solid_Clear() and comp_func_solid_Source() Add mingw-specific expected failures for JS test suite QNAM HTTP: Forgot to remove a qDebug() QNAM HTTP: Reserve bytes for HTTP parsing Add platform-specific expected failures for JS test suite Skip test that crashes on win32-g++ QNetworkCookie(Jar): fix includes QNAM HTTP: Improve readHeader() of the HTTP reply Add QSKIP to functionEntryAndExit_builtin. QNAM HTTP: Improve parseStatus() of HTTP reply Demo browser: Better handleUnsupportedContent implementation demo browser: Fix the way warnings were (not) displayed doc: Updated deployment OS X requirements for 4.6
| * Merge branch '4.6' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.6Jason McDonald2010-02-093-43/+41
| |\
| | * Skip the transparent pixels when doing the sourceOverBenjamin Poulain2010-02-091-1/+6
| | | | | | | | | | | | | | | | | | | | | | | | Blending fully transparent pixels take a non-negligible time when webkit use transparent layer. We can avoid that be skipping those pixels since they have no impact on the final result. Reviewed-by: Samuel Rødal
| | * Refactor comp_func_solid_Clear() and comp_func_solid_Source()Benjamin Poulain2010-02-093-42/+35
| | | | | | | | | | | | | | | | | | Put the common code together with a #define. Remove the check for the length from comp_func_Clear_impl and move it to qt_memfill()
| * | Tidy the changes file.Jason McDonald2010-02-091-177/+97
| |/ | | | | | | Reviewed-by: Trust Me
| * Add mingw-specific expected failures for JS test suiteKent Hansen2010-02-091-0/+11
| |
| * QNAM HTTP: Forgot to remove a qDebug()Markus Goetz2010-02-091-1/+1
| | | | | | | | Reviewed-by: TrustMe
| * QNAM HTTP: Reserve bytes for HTTP parsingMarkus Goetz2010-02-091-0/+12
| | | | | | | | Reviewed-by: Peter Hartmann
| * Add platform-specific expected failures for JS test suiteKent Hansen2010-02-092-0/+63
| |
| * Skip test that crashes on win32-g++Kent Hansen2010-02-091-0/+4
| |
| * QNetworkCookie(Jar): fix includesPeter Hartmann2010-02-092-2/+2
| | | | | | | | | | | | we need to include the module preefix in public headers Reviewed-by: Denis Dzyubenko
| * QNAM HTTP: Improve readHeader() of the HTTP replyMarkus Goetz2010-02-091-11/+25
| | | | | | | | | | | | | | Just read() instead us using peek() and bytesAvailable() Also don't use the obfuscated line ending checking code. Reviewed-by: Peter Hartmann
| * Add QSKIP to functionEntryAndExit_builtin.Jedrzej Nowacki2010-02-091-0/+1
| | | | | | | | | | | | | | The function fails on Mac and Windows, but it will be fixed in next JSC update. Lets skip it for now. Reviewed-by: Kent Hansen
| * QNAM HTTP: Improve parseStatus() of HTTP replyMarkus Goetz2010-02-091-10/+12
| | | | | | | | | | | | Just read() instead us using peek() and bytesAvailable() Reviewed-by: Peter Hartmann
| * Demo browser: Better handleUnsupportedContent implementationMarkus Goetz2010-02-091-3/+11
| | | | | | | | | | | | | | Do warnings instead of downloads for sub resources. Show error message for main resources. Reviewed-by: Tor Arne
| * demo browser: Fix the way warnings were (not) displayedMarkus Goetz2010-02-092-3/+2
| | | | | | | | Reviewed-by: TrustMe
| * doc: Updated deployment OS X requirements for 4.6Martin Smith2010-02-092-54/+33
| | | | | | | | Beginning with Qt 4.6, OS X 103 (Panther) is no longer supported.
* | Merge branch '4.6' of scm.dev.nokia.troll.no:qt/berlin-staging-1 into ↵Qt Continuous Integration System2010-02-0910-44/+64
|\ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 4.6-integration * '4.6' of scm.dev.nokia.troll.no:qt/berlin-staging-1: Fix warnings ~QX11PixmapData(): QPixmap objects must be destroyed.. fix a few mistakes in German translation Fix Float Conversion in xmlpatterns generate code which does not break QT_USE_FAST_CONCATENATION with old gcc drastically improve load time of TS files
| * | Fix warnings ~QX11PixmapData(): QPixmap objects must be destroyed..Friedemann Kleint2010-02-095-21/+25
| | | | | | | | | | | | | | | Reviewed-by: Trond Kjernåsen <trond@trolltech.com> Task-number: QTBUG-8046
| * | fix a few mistakes in German translationFrederik Schwarzer2010-02-091-4/+4
| | | | | | | | | | | | | | | Merge-request: 2302 Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com>
| * | Fix Float Conversion in xmlpatternsDominik Holland2010-02-091-0/+2
| | | | | | | | | | | | | | | | | | | | | On Maemo5 devices there is an automatic conversion to Float. So qtToXDMType() needs a special case. Reviewed By: Peter Hartmann
| * | Merge branch '4.6' of scm.dev.nokia.troll.no:qt/berlin-staging-1 into ↵Qt Continuous Integration System2010-02-083-19/+33
| |\ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | 4.6-integration * '4.6' of scm.dev.nokia.troll.no:qt/berlin-staging-1: generate code which does not break QT_USE_FAST_CONCATENATION with old gcc drastically improve load time of TS files
| | * | generate code which does not break QT_USE_FAST_CONCATENATION with old gccOswald Buddenhagen2010-02-081-1/+1
| | | |
| | * | drastically improve load time of TS filesOswald Buddenhagen2010-02-082-18/+32
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | it isn't such a good idea to insert rows one by one into the model. so instead batch the "announcement" of new data. unloading single models is still slow, but that's a corner use case, so don't bother fixing it now, especially as it is harder to do it.
* | | | Merge branch '4.6' of scm.dev.nokia.troll.no:qt/qt-s60-public into ↵Qt Continuous Integration System2010-02-097-35/+84
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 4.6-integration * '4.6' of scm.dev.nokia.troll.no:qt/qt-s60-public: Setting some parameters to reliably run on Tb9.2, Streamlined smart installer package creation in Symbian
| * | | | Setting some parameters to reliably run on Tb9.2,Aleksandar Sasha Babic2010-02-091-0/+28
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Tb 9.2 ATM is more memory sensitive. Reviewed-by: TrustMe
| * | | | Streamlined smart installer package creation in SymbianMiikka Heikkinen2010-02-096-35/+56
| |/ / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | - Added make target for creating smart installer packages - Application sis is automatically generated if missing when "make installer_sis" is invoked - No need to specify installer pkg UID if self signing is enough - Related docs fixed - Fixed smartinstaller.sis name to be correct Task-number: QTBUG-8026 Reviewed-by: axis
* | | | Merge branch '4.6' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into ↵Qt Continuous Integration System2010-02-094-387/+184
|\ \ \ \ | |/ / / |/| | / | | |/ | |/| | | | | | | | | | | | | | | | 4.6-integration * '4.6' of scm.dev.nokia.troll.no:qt/oslo-staging-1: Improve the benchmark of QScriptClass QNAM HTTP: Fix issue with some servers Added QMake directory to INCPATH so the compiler can find required headers Handle Shift+Tab correctly on X11.
| * | Improve the benchmark of QScriptClassBenjamin Poulain2010-02-091-381/+155
| | | | | | | | | | | | | | | | | | | | | | | | | | | The benchmarks has been stabilised and modified so the number are more representative of QSCriptClass and not other part of Qt: -the "iteration numbmer" has been introduced to ensure a minimal number of call, indpendant of QTestLib. -the subclasses of QScriptClass have been rewritten to have less impact on the results
| * | QNAM HTTP: Fix issue with some serversMarkus Goetz2010-02-091-2/+5
| | | | | | | | | | | | | | | | | | | | | | | | | | | The call to eatWhitespace() must only be done before reading the status, not while reading it. (We can be in ReadingStatusState for multiple loop iterations) Task-number: QTBUG-7673 Reviewed-by: Peter Hartmann
| * | Merge branch '4.6' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into ↵Qt Continuous Integration System2010-02-092-4/+24
| |\ \ |/ / / | | | | | | | | | | | | | | | | | | 4.6-integration * '4.6' of scm.dev.nokia.troll.no:qt/oslo-staging-1: Added QMake directory to INCPATH so the compiler can find required headers Handle Shift+Tab correctly on X11.
| * | Added QMake directory to INCPATH so the compiler can find required headersConstantin Makshin2010-02-081-4/+10
| | | | | | | | | | | | Reviewed-by: Benjamin Poulain <benjamin.poulain@nokia.com>
| * | Merge branch '4.6' of git@scm.dev.nokia.troll.no:qt/oslo-staging-1 into ↵Denis Dzyubenko2010-02-0832-4973/+17
| |\ \ | | | | | | | | | | | | oslo-staging-1/4.6
| * | | Handle Shift+Tab correctly on X11.Thomas Sondergaard2010-02-081-0/+14
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This fixes incorrect handling of Shift+Tab keysyms. Most typically Shift+Tab generates Shift+ISO_Left_Tab, but VNC clients generate Shift+Tab in accordance with the RFB specification. Merge-request: 458 Reviewed-by: Denis Dzyubenko <denis.dzyubenko@nokia.com>
* | | | Merge branch '4.6' of scm.dev.nokia.troll.no:qt/qt-s60-public into ↵Qt Continuous Integration System2010-02-085-17/+53
|\ \ \ \ | |_|/ / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 4.6-integration * '4.6' of scm.dev.nokia.troll.no:qt/qt-s60-public: Documentation: clarified RVCT support for Symbian Update Symbian OS def files for 4.6.2 Don't remove all dependencies when patching the pkg. Workaround for abld toolchain issue with s60main
| * | | Merge branch '4.6' of scm.dev.nokia.troll.no:qt/qt-s60-public into 4.6Gareth Stockwell2010-02-082-12/+40
| |\ \ \
| | * | | Update Symbian OS def files for 4.6.2Shane Kearns2010-02-082-12/+40
| | | | | | | | | | | | | | | | | | | | Task-number: QTBUG-8024
| * | | | Documentation: clarified RVCT support for SymbianGareth Stockwell2010-02-081-2/+3
| |/ / / | | | | | | | | | | | | | | | | Task-number: QTBUG-8012 Reviewed-by: Iain
| * | | Don't remove all dependencies when patching the pkg.Miikka Heikkinen2010-02-081-3/+7
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Only remove dependencies that are known to cause unncessary warnings from pkg files when patching them with patch_capabilities.pl script. Task-number: QTBUG-8018 Reviewed-by: Janne Koskinen
| * | | Workaround for abld toolchain issue with s60mainMiikka Heikkinen2010-02-081-0/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | When building for ARMV6 with abld toolchain in Symbian, qtmain.lib ends up missing some symbols that are required to link it against GCCE apps. This happens because --dllimport_runtime compiler option is missing in ARMV6 builds of qtmain.lib. Task-number: QTBUG-7952 Reviewed-by: axis
* | | | Merge branch '4.6' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into ↵Qt Continuous Integration System2010-02-0846-5049/+172
|\ \ \ \ | |/ / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 4.6-integration * '4.6' of scm.dev.nokia.troll.no:qt/oslo-staging-1: Remove the installer from the Qt sources. Fixes qabstractslider autotest Add a recursive rule for running the auto-tests. Do not run the tests automatically during install. Fixes scrolling horizontally with a mouse wheel over sliders. Doc: Clarified ownership of custom buttons added to a QDialogButtonBox. Updated WebKit from /home/shausman/src/webkit/trunk to qtwebkit/qtwebkit-4.6 ( da5d96a26e80162027bc95ce7e5725fe4b277ff7 ) A fix for accidently reused variable names in nested iterations. Iain's changes for 4.6.2 Doc: Fixed typo.
| * | | Remove the installer from the Qt sources.Thiago Macieira2010-02-0830-4972/+0
| |/ / | | | | | | | | | | | | | | | This copy of the installer doesn't work anymore. Reviewed-By: TrustMe
| * | Fixes qabstractslider autotestDenis Dzyubenko2010-02-082-6/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | Fixed a bad merge in the QAbstractSlider::wheelEvent. Modified an autotest to follow a change in behavior - scrolling with a horizontal mouse wheel to the "right" means increasing the value. Reviewed-by: Richard Moe Gustavsen
| * | Add a recursive rule for running the auto-tests.Adrian Constantin2010-02-081-0/+8
| | | | | | | | | | | | | | | | | | | | | | | | Use "make check" to run all the auto-tests. Task-number: QTPROD-442 Reviewed-by: Harald Fernengel Reviewed-by: Rohan McGovern
| * | Do not run the tests automatically during install.Janne Hämäläinen2010-02-081-15/+11
| | | | | | | | | | | | | | | | | | | | | | | | | | | A separate "check" rule added for running the tests. Use "make check" to run the tests. Task-number: QTPROD-442 Reviewed-by: Harald Fernengel Reviewed-by: Rohan McGovern
| * | Merge branch '4.6' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into ↵Qt Continuous Integration System2010-02-0813-58/+151
| |\ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 4.6-integration * '4.6' of scm.dev.nokia.troll.no:qt/oslo-staging-1: Fixes scrolling horizontally with a mouse wheel over sliders. Doc: Clarified ownership of custom buttons added to a QDialogButtonBox. Updated WebKit from /home/shausman/src/webkit/trunk to qtwebkit/qtwebkit-4.6 ( da5d96a26e80162027bc95ce7e5725fe4b277ff7 ) A fix for accidently reused variable names in nested iterations. Iain's changes for 4.6.2 Doc: Fixed typo.
| | * \ Merge branch '4.6' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into ↵Qt Continuous Integration System2010-02-0613-58/+151
| | |\ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 4.6-integration * '4.6' of scm.dev.nokia.troll.no:qt/oslo-staging-1: Fixes scrolling horizontally with a mouse wheel over sliders. Doc: Clarified ownership of custom buttons added to a QDialogButtonBox. Updated WebKit from /home/shausman/src/webkit/trunk to qtwebkit/qtwebkit-4.6 ( da5d96a26e80162027bc95ce7e5725fe4b277ff7 ) A fix for accidently reused variable names in nested iterations. Iain's changes for 4.6.2 Doc: Fixed typo.
| | | * \ Merge branch '4.6' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into ↵Qt Continuous Integration System2010-02-0613-58/+151
| | | |\ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 4.6-integration * '4.6' of scm.dev.nokia.troll.no:qt/oslo-staging-1: Fixes scrolling horizontally with a mouse wheel over sliders. Doc: Clarified ownership of custom buttons added to a QDialogButtonBox. Updated WebKit from /home/shausman/src/webkit/trunk to qtwebkit/qtwebkit-4.6 ( da5d96a26e80162027bc95ce7e5725fe4b277ff7 ) A fix for accidently reused variable names in nested iterations. Iain's changes for 4.6.2 Doc: Fixed typo.
| | | | * | Fixes scrolling horizontally with a mouse wheel over sliders.Denis Dzyubenko2010-02-053-27/+57
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | When scrolling horizontally over sliders the slider should go to the right, which means the value of the slider should increase. However in Qt scrolling with a mouse wheel horizontally means the delta value is negative, which is wrong. So changed the delta to be inversed. Reviewed-by: Richard Moe Gustavsen
| | | | * | Merge branch '4.6' of git@scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.6David Boddie2010-02-056-28/+81
| | | | |\ \
generated by cgit v0.12 at 2025-01-15 11:02:35 (GMT)