summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into 4.7David Boddie2010-09-01232-3729/+9103
|\
| * Fix a crash when passing a null pixmap to QPainter::drawPixmapFragments().Trond Kjernåsen2010-09-011-1/+1
| | | | | | | | | | Task-number: QTBUG-13331 Reviewed-by: Samuel
| * Use NEON and preloading for 16 bit small / medium sized image blits.Samuel Rødal2010-09-014-4/+108
| | | | | | | | | | | | | | | | | | | | | | | | | | | | This gives a nice speedup for blitting of small and medium sized images by using preloading and avoiding function call overhead to memcpy for each scanline. For larger image widths memcpy becomes more efficient. Speedups of up to 40 % for 64 pixel wide images were measured. For image widths between 2 and 16 the speedup ranges between 12 % and 28 %. Task-number: QT-3401 Reviewed-by: Benjamin Poulain <benjamin.poulain@nokia.com>
| * Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into ↵Qt Continuous Integration System2010-09-0168-1518/+824
| |\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 4.7-integration * '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1: Remove unused source files in designer make various POST_LINK steps nicer fix qt_webkit_version.pri install for in-Qt builds fix windows build with -prefix Update to the NTLM code. QTextEngine::LayoutData::reallocate musn't corrupt memory Updated Twitter demo in response to the new Twitter oauth requirement doc: Remove \internal tag from QScriptProgram Doc: Reviewed updates to the model/view tutorial. QNetworkAccessManager doc: add since tag for added enum fixed compilation problem added missing files added missing files problem: 2 images that were in raw html tables appeared smaller in konqueror for some reason - solution: fixed width for right columns in 2 raw html tables moving over work from 28b49e42f5bddec2d62e957f158cb848da134db8
| | * Remove unused source files in designerVictor Ostashevsky2010-08-313-170/+1
| | | | | | | | | | | | | | | Merge-request: 2463 Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com>
| | * make various POST_LINK steps nicerOswald Buddenhagen2010-08-315-23/+14
| | | | | | | | | | | | | | | | | | | | | put each step into a separate make command. that makes for cleaner output and less troubles with command separators. Reviewed-by: mariusSO
| | * fix qt_webkit_version.pri install for in-Qt buildsOswald Buddenhagen2010-08-311-13/+21
| | | | | | | | | | | | | | | | | | | | | | | | always add the target, even if building inside Qt - as opposed to the headers and libraries, there are no rules for that coming from qbase.pri. Task-number: QTBUG-13306
| | * fix windows build with -prefixOswald Buddenhagen2010-08-311-3/+5
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | passing just a spec name to qmake is bogus, as it will try to find it in the install dir, which of course won't work before it is installed. so either pass nothing at all (when preparing the libraries, as .qmake.cache already contains the right path), or explicitly pass a full path (when building the host tools, as we have to override the spec here). Reviewed-by: mariusSO
| | * Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into ↵Qt Continuous Integration System2010-08-3159-1350/+824
| | |\ | |/ / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 4.7-integration * '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1: Update to the NTLM code. QTextEngine::LayoutData::reallocate musn't corrupt memory Updated Twitter demo in response to the new Twitter oauth requirement doc: Remove \internal tag from QScriptProgram Doc: Reviewed updates to the model/view tutorial. QNetworkAccessManager doc: add since tag for added enum fixed compilation problem added missing files added missing files problem: 2 images that were in raw html tables appeared smaller in konqueror for some reason - solution: fixed width for right columns in 2 raw html tables moving over work from 28b49e42f5bddec2d62e957f158cb848da134db8
| | * Update to the NTLM code.Thiago Macieira2010-08-311-19/+37
| | | | | | | | | | | | | | | | | | | | | | | | Fixes extraction of time from the server, and saves the domain information properly. Patch by subcontractor Reviewed-by: Thiago Macieira
| | * QTextEngine::LayoutData::reallocate musn't corrupt memoryJoão Abecasis2010-08-311-2/+5
| | | | | | | | | | | | | | | | | | | | | | | | | | | ... on re-allocation failure. So, let's actually check the returned pointer and fail, instead of using Q_CHECK_PTR. Task-number: QT-3785 Reviewed-by: Peter Hartmann Reviewed-by: Samuel Rødal
| | * Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into ↵Qt Continuous Integration System2010-08-3157-1329/+782
| | |\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 4.7-integration * '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1: Updated Twitter demo in response to the new Twitter oauth requirement doc: Remove \internal tag from QScriptProgram Doc: Reviewed updates to the model/view tutorial. QNetworkAccessManager doc: add since tag for added enum fixed compilation problem added missing files added missing files problem: 2 images that were in raw html tables appeared smaller in konqueror for some reason - solution: fixed width for right columns in 2 raw html tables moving over work from 28b49e42f5bddec2d62e957f158cb848da134db8
| | | * Updated Twitter demo in response to the new Twitter oauth requirementJens Bache-Wiig2010-08-3114-461/+332
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Twitter is blocking access to the old authentification method that our demo was using. This breaks the demo completely. To fix this, I changed the demo into only make use of the public search API. You can no longer tweet but you can search for different tweets. At the moment making an oauth capable demo is not desirable due to the problems with handling a secret app token among other issues. Task-number: QTBUG-13181 Reviewed-by: Alan Alpert
| | | * doc: Remove \internal tag from QScriptProgramKent Hansen2010-08-312-5/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The class has been there since 4.6 (http://labs.trolltech.com/blogs/2009/11/23/qtscript-in-46/), but we don't see a reason to hide it any longer. Task-number: QTBUG-13229 Reviewed-by: Olivier Goffart
| | | * Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.7David Boddie2010-08-31107-1721/+7042
| | | |\
| | | | * QNetworkAccessManager doc: add since tag for added enumPeter Hartmann2010-08-311-1/+1
| | | | |
| | | * | Doc: Reviewed updates to the model/view tutorial.David Boddie2010-08-311-454/+356
| | | | |
| | | * | Merge branch '4.7' of ../msculls-modelview-qdoc-enhancement into 4.7David Boddie2010-08-3040-858/+541
| | | |\ \
| | | | * | fixed compilation problemRoland Wolf2010-07-302-7/+13
| | | | | |
| | | | * | Merge branch 'modelviewdoc' of ↵Roland Wolf2010-07-301-3/+3
| | | | |\ \ | | | | | | | | | | | | | | | | | | | | | scm.dev.nokia.troll.no:qt/msculls-modelview-qdoc-enhancement into modelviewdoc
| | | | | * | problem: 2 images that were in raw html tables appeared smaller in konqueror ↵Michael D Scull2010-07-291-3/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | for some reason - solution: fixed width for right columns in 2 raw html tables
| | | | * | | added missing filesRoland Wolf2010-07-304-0/+318
| | | | | | |
| | | | * | | added missing filesRoland Wolf2010-07-302-0/+119
| | | | |/ /
| | | | * | moving over work from 28b49e42f5bddec2d62e957f158cb848da134db8Roland Wolf2010-07-2940-1245/+485
| | | | | |
| * | | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into ↵Qt Continuous Integration System2010-08-315-12/+8
| |\ \ \ \ \ | | |/ / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | 4.7-integration * '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-2: Undefined SSE symbols when crosscompiling Qt on PPC.
| | * | | | Undefined SSE symbols when crosscompiling Qt on PPC.Benjamin Poulain2010-08-315-12/+8
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Qt does not build on PowerPC when compiling for both x86 and PPC on Mac. The compiler is invoked only once for both architecture so the defines are there in order to get the optimized path for x86. Those defines needs to be removed from the compilation environment when the target is set to PPC by GCC. Reviewed-by: Kent Hansen
| * | | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-s60-public into ↵Qt Continuous Integration System2010-08-317-13/+50
| |\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 4.7-integration * '4.7' of scm.dev.nokia.troll.no:qt/qt-s60-public: Fix gcce building of apps using static libraries in symbian-sbsv2
| | * | | | | Fix gcce building of apps using static libraries in symbian-sbsv2Miikka Heikkinen2010-08-317-13/+50
| | | |_|_|/ | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Removed usage of buggy .release_gcce target from symbian-sbsv2 generated makefiles. Now gcce builds like armv5 as it is supposed to when using Raptor. Task-number: QTBUG-13307 Reviewed-by: axis
| * | | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7-integrationQt Continuous Integration System2010-08-3115-62/+177
| |\ \ \ \ \ | | |_|/ / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | * '4.7' of scm.dev.nokia.troll.no:qt/qt-qml: Center and clip QML startup animation so it looks correct in fullscreen Prevent calling deleteLater() from QML Ignore non-scriptable properties in QML
| | * | | | Center and clip QML startup animation so it looks correct in fullscreenAaron Kennedy2010-08-311-41/+47
| | | | | | | | | | | | | | | | | | | | | | | | QTBUG-12831
| | * | | | Prevent calling deleteLater() from QMLAaron Kennedy2010-08-313-2/+26
| | | | | | | | | | | | | | | | | | | | | | | | QTBUG-13045
| | * | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7Aaron Kennedy2010-08-3142-497/+5680
| | |\ \ \ \ | | | |/ / /
| | * | | | Ignore non-scriptable properties in QMLAaron Kennedy2010-08-3113-19/+104
| | | | | | | | | | | | | | | | | | | | | | | | QTBUG-13043
| * | | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into ↵Qt Continuous Integration System2010-08-315-152/+283
| |\ \ \ \ \ | | |_|/ / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 4.7-integration * '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-2: Make tst_image a little bit more tollerent to rounding errors Clear the QGLWindowSurface in ::beginPaint when needed. Made QT_GL_SWAPBUFFER_PRESERVE=1 with the GL graphics system work. Fix QStaticText with OpenGL1 engine tst_qimage: backport fix of commit 0d7e683 into 4.7 qdrawhelper: backport the optimisations in fetchTransformBilinear from master to 4.7
| | * | | | Make tst_image a little bit more tollerent to rounding errorsOlivier Goffart2010-08-311-8/+8
| | | | | | | | | | | | | | | | | | | | | | | | (cherry picked from commit 23306a399c0703eea7420231903c850566bfe2f0)
| | * | | | Clear the QGLWindowSurface in ::beginPaint when needed.Michael Dominic K2010-08-311-0/+14
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge-request: 2462 Reviewed-by: Samuel Rødal <samuel.rodal@nokia.com>
| | * | | | Made QT_GL_SWAPBUFFER_PRESERVE=1 with the GL graphics system work.Samuel Rødal2010-08-311-5/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | On desktop, we should just do swapBuffers() in swapRegion(). Reviewed-by: Trond
| | * | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into ↵Qt Continuous Integration System2010-08-313-142/+262
| | |\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 4.7-integration * '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-2: Fix QStaticText with OpenGL1 engine tst_qimage: backport fix of commit 0d7e683 into 4.7 qdrawhelper: backport the optimisations in fetchTransformBilinear from master to 4.7
| | | * \ \ \ Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into ↵Qt Continuous Integration System2010-08-303-142/+262
| | | |\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 4.7-integration * '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-2: Fix QStaticText with OpenGL1 engine tst_qimage: backport fix of commit 0d7e683 into 4.7 qdrawhelper: backport the optimisations in fetchTransformBilinear from master to 4.7
| | | | * | | | Fix QStaticText with OpenGL1 engineEskil Abrahamsen Blomfeldt2010-08-301-1/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Like OpenGL2 and OpenVG, the OpenGL1 paint engine also transforms text coordinates itself and does not require QStaticText to use device coordinates. Task-number: QTBUG-13228 Reviewed-by: Samuel
| | | | * | | | tst_qimage: backport fix of commit 0d7e683 into 4.7Olivier Goffart2010-08-301-3/+3
| | | | | | | |
| | | | * | | | qdrawhelper: backport the optimisations in fetchTransformBilinear from ↵Olivier Goffart2010-08-301-138/+257
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | master to 4.7 This backport the following commits: e55b6a3 qdrawhelper: remove code duplication 0d7e683 qdrawhelper: optimize fetchTransformedBilinear 29ef46e Fix compilation with RVCT 6601458 qdrawhelper: Use SSE2 in fetchTransformedBilinear (when scalling up) 398ef0ca Fix nasty copy-paste bug in fetchTransformedBilinear() d585ece qdrawhelper: fix assert in fetchTransformedBilinear Reviewed-by: Benjamin Poulain
| * | | | | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7-integrationQt Continuous Integration System2010-08-3161-1224/+2135
| |\ \ \ \ \ \ \ | | |/ / / / / / | |/| | | / / / | | | |_|/ / / | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * '4.7' of scm.dev.nokia.troll.no:qt/qt-qml: Don't double call classBegin() Notify QML internal notifiers of item geometry changes before QML signal handlers. Revert "Add 'cached' property to Image." Add 'cached' property to Image. Ensure Flickable visibleArea is updated when view height changes Improve calling QML functions from C++ docs. Add missing license headers Remove debug. Snake: Don't use Behavior with states. QML Viewer should be put under QtDemos instead of QtExamples folder in Symbian app menu Fix application exiting in embedded qml examples QDeclarativeDebug: Destroy incoming connections if already connected Simplify type management code QML JavaScript .import parser Fix VisualDataModel model update handling when rootIndex is specified. Improve test reliability when running in parallel with other tests. Improve stability of test on loaded hw. Improve stability of test on loaded hw.
| | * | | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7Aaron Kennedy2010-08-311-6/+6
| | |\ \ \ \ \
| | | * \ \ \ \ Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7Martin Jones2010-08-310-0/+0
| | | |\ \ \ \ \
| | | * | | | | | Notify QML internal notifiers of item geometry changes before QML signal ↵Martin Jones2010-08-311-6/+6
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | handlers. Task-number: QTBUG-12303 Reviewed-by: Aaron Kennedy
| | * | | | | | | Don't double call classBegin()Aaron Kennedy2010-08-316-2/+42
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | QTBUG-13114
| | * | | | | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7Aaron Kennedy2010-08-3162-152/+782
| | |\ \ \ \ \ \ \ | | | | |/ / / / / | | | |/| | | | |
| | | * | | | | | Revert "Add 'cached' property to Image."Yann Bodson2010-08-319-96/+28
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This will have to go in 4.8. This reverts commit 3928cb20ecc63ed21cdb122388b200c9ab8e7cad.
| | | * | | | | | Add 'cached' property to Image.Yann Bodson2010-08-319-28/+96
| | | |/ / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Task-number: QTBUG-7300 Reviewed-by: Aaron Kennedy
generated by cgit v0.12 at 2025-02-04 11:07:43 (GMT)