summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Merge branch '4.6' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into ↵Qt Continuous Integration System2010-01-152-14/+29
|\ | | | | | | | | | | | | | | 4.6-integration * '4.6' of scm.dev.nokia.troll.no:qt/oslo-staging-2: Clarify the docs slightly for QPainter::beginNativePainting(). Fixed the encoding of the Tile and Creator tags in the PDF engine.
| * Clarify the docs slightly for QPainter::beginNativePainting().Trond Kjernåsen2010-01-151-6/+11
| | | | | | | | | | | | | | | | Some complain that we don't reset every GL state in the GL engine in endNativePainting(). We simply can't do that as it would be a performance bump. The user is responsible for setting states they themselves change in a begin/endNativePainting() block, back to their default state.
| * Fixed the encoding of the Tile and Creator tags in the PDF engine.Trond Kjernåsen2010-01-151-8/+18
| | | | | | | | | | Task-number: QTBUG-7249 Reviewed-by: Kim
* | Merge branch '4.6' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into ↵Qt Continuous Integration System2010-01-151-821/+0
|\ \ | |/ |/| | | | | | | | | 4.6-integration * '4.6' of scm.dev.nokia.troll.no:qt/oslo-staging-1: Remove unused file.
| * Remove unused file.Rohan McGovern2010-01-151-821/+0
| |
* | Merge branch '4.6' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into ↵Qt Continuous Integration System2010-01-142-7/+16
|\ \ | |/ |/| | | | | | | | | | | 4.6-integration * '4.6' of scm.dev.nokia.troll.no:qt/oslo-staging-2: QListView in icon view mode, drop enabled items wouldn't receive anything Fixes wrong stroke clipping with the raster engine.
| * QListView in icon view mode, drop enabled items wouldn't receive anythingGabriel de Dietrich2010-01-141-0/+7
| | | | | | | | | | | | | | | | | | | | | | QIconModeViewBase::filterDropEvent() was only moving the items around in the view without ever checking whether the cursor was over a drop enabled item. Now it does and returns false if it's the case. As a consequence, QAbstractItemView::dropEvent() gets called. No auto-test since it's a drag & drop related task. Reviewed-by: janarve Task-number: QTBUG-6848
| * Fixes wrong stroke clipping with the raster engine.Yoann Lopes2010-01-141-7/+9
| | | | | | | | | | | | | | | | The problem was that the clip rect was only updated when the QPen had changed. Task-number: QTBUG-7253 Reviewed-by: gunnar
* | Merge branch '4.6' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into ↵Qt Continuous Integration System2010-01-147-9/+119
|\ \ | |/ |/| | | | | | | | | | | | | | | | | | | 4.6-integration * '4.6' of scm.dev.nokia.troll.no:qt/oslo-staging-1: QFile::remove: don't fail for unrelated errors Fix tst_qmlgraphicstext::letterSpacing tst_qmlgraphicstext::wordSpacing Sent for review into 4.6. Updated WebKit from /home/shausman/src/webkit/trunk to qtwebkit/qtwebkit-4.6 ( 8f6992f4e8f027818429d428393b08068eca9ffa ) network internals: fix uploading of data File dialog mode is not correctly updated in Mac (Cocoa). add tests for QFlags behavior in QtScript
| * QFile::remove: don't fail for unrelated errorsJoão Abecasis2010-01-142-0/+37
| | | | | | | | | | | | | | | | remove was checking for errors from close, but without clearing the error state beforehand it ended picking unrelated errors. Task-number: QTBUG-7285 Reviewed-by: qCaro
| * Fix tst_qmlgraphicstext::letterSpacing tst_qmlgraphicstext::wordSpacing Sent ↵Warwick Allison2010-01-141-1/+9
| | | | | | | | | | | | | | | | for review into 4.6. Task-number: QTBUG-7326 Signed-off-by: Simon Hausmann <simon.hausmann@nokia.com>
| * Updated WebKit from /home/shausman/src/webkit/trunk to qtwebkit/qtwebkit-4.6 ↵Simon Hausmann2010-01-144-1/+18
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | ( 8f6992f4e8f027818429d428393b08068eca9ffa ) Changes in WebKit/qt since the last update: ++ b/WebKit/qt/ChangeLog 2010-01-14 Simon Hausmann <simon.hausmann@nokia.com> Reviewed by Kenneth Rohde Christiansen. [Qt] Update Symbian .def symbol export files after private API additions. * symbian/bwins/QtWebKitu.def: * symbian/eabi/QtWebKitu.def:
| * network internals: fix uploading of dataPeter Hartmann2010-01-141-1/+1
| | | | | | | | Reviewed-by: Markus Goetz
| * File dialog mode is not correctly updated in Mac (Cocoa).Prasanth Ullattil2010-01-142-6/+16
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | QFileDialog shows a customized version of the native file dialog on Mac. When user changes the fileMode, the corresponding options needs to be updated in the native dialog as well. Some options like mode, filters, button text, dialog title etc needs to be updated for this. This patch also address the changing of 'acceptMode'. When user changes this, for e.g. the native dialog needs to switch from an open panel to save panel. It is easier to recreate the internal QNSOpenSavePanelDelegate than changing options individually. Task-number: QTBUG-7086 Reviewed-by: Richard Moe Gustavsen
| * add tests for QFlags behavior in QtScriptKent Hansen2010-01-141-1/+56
| | | | | | | | | | It's currently not even documented, but this test defines the current level of support.
* | Merge branch '4.6' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into ↵Qt Continuous Integration System2010-01-1432-483/+645
|\ \ | |/ |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 4.6-integration * '4.6' of scm.dev.nokia.troll.no:qt/oslo-staging-2: Updated WebKit from /home/shausman/src/webkit/trunk to qtwebkit/qtwebkit-4.6 ( 8f6992f4e8f027818429d428393b08068eca9ffa ) Better fix for build!=src Makefile generation Make input mask cursor blink Fix QGLWidget::renderPixmap() on Windows. Fix rules for recreating the Makefile in a subdir Disable some tests that require high floating point precision. Replace the truncate function with fuzzierCompare(). Rework how Qt handles GL extensions. More changelog additions for QtWebKit Make compile on symbian/Linux Removed pointless image comparison in raster colorize filter. Improved performance of translating device coordinate graphics effects.
| * Updated WebKit from /home/shausman/src/webkit/trunk to qtwebkit/qtwebkit-4.6 ↵Simon Hausmann2010-01-144-1/+18
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | ( 8f6992f4e8f027818429d428393b08068eca9ffa ) Changes in WebKit/qt since the last update: ++ b/WebKit/qt/ChangeLog 2010-01-14 Simon Hausmann <simon.hausmann@nokia.com> Reviewed by Kenneth Rohde Christiansen. [Qt] Update Symbian .def symbol export files after private API additions. * symbian/bwins/QtWebKitu.def: * symbian/eabi/QtWebKitu.def:
| * Better fix for build!=src Makefile generationThomas Zander2010-01-141-5/+3
| | | | | | | | | | | | | | Make sure we always use the absolute path to the pro file so it will just work from either source or build dir. This fixes the usecase where qmake generated a relative path starting with '..'
| * Merge branch '4.6' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into 4.6Alan Alpert2010-01-148977-11607/+14009
| |\
| | * Fix QGLWidget::renderPixmap() on Windows.Trond Kjernaasen2010-01-141-6/+6
| | | | | | | | | | | | | | | | | | | | | | | | Using renderPixmap() with scenes that contained textures might not work due to the wrong texture format being used under certain circumstances. Task-number: QTBUG-7213 Reviewed-by: Gunnar
| | * Merge branch '4.6' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into ↵Qt Continuous Integration System2010-01-1427-472/+617
| | |\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 4.6-integration * '4.6' of scm.dev.nokia.troll.no:qt/oslo-staging-2: Fix rules for recreating the Makefile in a subdir Disable some tests that require high floating point precision. Replace the truncate function with fuzzierCompare(). Rework how Qt handles GL extensions. More changelog additions for QtWebKit Make compile on symbian/Linux Removed pointless image comparison in raster colorize filter. Improved performance of translating device coordinate graphics effects.
| | | * Merge branch '4.6' of scm.dev.nokia.troll.no:qt/qt into 4.6Simon Hausmann2010-01-1487-956/+674
| | | |\ | | | | | | | | | | | | | | | | | | | | Conflicts: dist/changes-4.6.1
| | | * | Fix rules for recreating the Makefile in a subdirThomas Zander2010-01-131-8/+8
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The code generated would always create the Makefile in the sourcedir, even if you had src!=build Reviewed-By: Thiago
| | | * | Disable some tests that require high floating point precision.Jan-Arve Sæther2010-01-132-3/+18
| | | | | | | | | | | | | | | | | | | | Disable them if sizeof(qreal)==4
| | | * | Merge branch '4.6' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into 4.6Jan-Arve Sæther2010-01-1325-449/+579
| | | |\ \
| | | | * | Rework how Qt handles GL extensions.Trond Kjernåsen2010-01-1315-428/+469
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Qt used to store the GL extensions a particular implementation supported in a global cache, which was initialized once and never updated. This could cause problems because different types of context might support different kinds of extensions (e.g. the difference between sw and hw contexts). With this patch, the GL extensions are cached and updated within each QGLContext. It also makes the extension initialization lazy, which saves application initialization costs for embedded platforms. The patch introduces a internal cross platform QGLTemporaryContext class that is used to create a light-weight GL context without going via QGLWidget and friends (QWS and WinCE still have QGLWidget fallbacks for now). Reviewed-by: Kim Reviewed-by: Samuel
| | | | * | More changelog additions for QtWebKitSimon Hausmann2010-01-131-0/+2
| | | | | | | | | | | | | | | | | | | | | | | | Reviewed-by: Trust me
| | | | * | Make compile on symbian/LinuxThomas Zander2010-01-131-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | symbian headers on Linux are lowercase and this should work on Windows too.
| | | | * | Removed pointless image comparison in raster colorize filter.Samuel Rødal2010-01-131-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This test is meant to check whether the grayscale operation is done in-place or not. Task-number: QTBUG-6901 Reviewed-by: Bjørn Erik Nilsen
| | | | * | Improved performance of translating device coordinate graphics effects.Samuel Rødal2010-01-136-18/+105
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Don't invalidate the cache if we're only translating and the effect rect is fully contained within the device rect of the painter. Task-number: QTBUG-6901 Reviewed-by: Bjørn Erik Nilsen
| | | * | | Replace the truncate function with fuzzierCompare().Jan-Arve Sæther2010-01-131-13/+13
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | truncate did a qRound of the two numbers, which could cause two numbers that were close to become far away (e.g. (0.000049 and 0.000051 would become 0 and 1 respectively) fuzzierCompare allows less precision than qFuzzyCompare. This is because the anchor layout engine can sometimes do quite a lot of calculations, and the error will be larger than what the qFuzzyCompare checks for. Thus, the factor in fuzzierCompare is not chosen due to mathematical proof but rather it is just chosen by what is acceptable. (actually it can still be larger and still be acceptable)
| * | | | | Make input mask cursor blinkAlan Alpert2010-01-141-4/+6
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Task-number: QTBUG-7174 Reviewed-by: Leo
* | | | | | Merge branch '4.6' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into ↵Qt Continuous Integration System2010-01-144-3/+132
|\ \ \ \ \ \ | |_|/ / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 4.6-integration * '4.6' of scm.dev.nokia.troll.no:qt/oslo-staging-1: tst_qnetworkreply benchmark: Read HTTP headers when emulating HTTP Add a selftest for tests/auto/auto.pro.
| * | | | | tst_qnetworkreply benchmark: Read HTTP headers when emulating HTTPMarkus Goetz2010-01-141-1/+15
| | | | | | | | | | | | | | | | | | | | | | | | Reviewed-by: Peter Hartmann
| * | | | | Add a selftest for tests/auto/auto.pro.Rohan McGovern2010-01-143-2/+117
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This selftest enforces that tests/auto/auto.pro is properly maintained. It may be extended to check other elements of the environment necessary for autotests to run correctly.
* | | | | | Merge branch '4.6' of scm.dev.nokia.troll.no:qt/qt-multimedia-team into ↵Qt Continuous Integration System2010-01-1424-173/+111
|\ \ \ \ \ \ | |_|_|_|_|/ |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 4.6-integration * '4.6' of scm.dev.nokia.troll.no:qt/qt-multimedia-team: Revert "Frequency to SampleRate and channels to channelCount." missed Revert "Frequency to SampleRate and channels to channelCount." Revert "Added setChannelCount() to QAudioFormat."
| * | | | | Merge branch '4.6' of scm.dev.nokia.troll.no:qt/qt-multimedia-team into ↵Qt Continuous Integration System2010-01-1424-173/+111
| |\ \ \ \ \ |/ / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 4.6-integration * '4.6' of scm.dev.nokia.troll.no:qt/qt-multimedia-team: Revert "Frequency to SampleRate and channels to channelCount." missed Revert "Frequency to SampleRate and channels to channelCount." Revert "Added setChannelCount() to QAudioFormat."
| * | | | | Revert "Frequency to SampleRate and channels to channelCount." missedKurt Korbatits2010-01-141-20/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | unit test. This reverts commit 80d4a4945d3273a4b2ce91e34597533f661af320. unit test missed on last revert.
| * | | | | Revert "Frequency to SampleRate and channels to channelCount."Kurt Korbatits2010-01-1418-116/+89
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This reverts commit 80d4a4945d3273a4b2ce91e34597533f661af320. Conflicts: examples/multimedia/audioinput/audioinput.cpp examples/multimedia/audiooutput/audiooutput.cpp src/multimedia/audio/qaudio_mac.cpp src/multimedia/audio/qaudiodeviceinfo_alsa_p.cpp src/multimedia/audio/qaudiodeviceinfo_mac_p.cpp src/multimedia/audio/qaudiodeviceinfo_win32_p.cpp src/multimedia/audio/qaudioformat.h src/multimedia/audio/qaudioinput.cpp src/multimedia/audio/qaudiooutput.cpp tests/auto/qaudiodeviceinfo/tst_qaudiodeviceinfo.cpp tests/auto/qaudioformat/tst_qaudioformat.cpp tests/auto/qaudioinput/tst_qaudioinput.cpp tests/auto/qaudiooutput/tst_qaudiooutput.cpp
| * | | | | Revert "Added setChannelCount() to QAudioFormat."Kurt Korbatits2010-01-1416-57/+42
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This reverts commit f124538ef4840c3d24b4c7e9e7221adb52bdee2c. Conflicts: examples/multimedia/audioinput/audioinput.cpp examples/multimedia/audiooutput/audiooutput.cpp src/multimedia/audio/qaudio_mac.cpp src/multimedia/audio/qaudiodeviceinfo_alsa_p.cpp src/multimedia/audio/qaudiodeviceinfo_mac_p.cpp src/multimedia/audio/qaudiodeviceinfo_win32_p.cpp src/multimedia/audio/qaudioformat.h src/multimedia/audio/qaudioinput.cpp src/multimedia/audio/qaudiooutput.cpp tests/auto/qaudiodeviceinfo/tst_qaudiodeviceinfo.cpp tests/auto/qaudioformat/tst_qaudioformat.cpp tests/auto/qaudioinput/tst_qaudioinput.cpp tests/auto/qaudiooutput/tst_qaudiooutput.cpp
* | | | | | Merge branch '4.6' of scm.dev.nokia.troll.no:qt/qt-s60-public into ↵Qt Continuous Integration System2010-01-142-1/+2
|\ \ \ \ \ \ | |_|/ / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | 4.6-integration * '4.6' of scm.dev.nokia.troll.no:qt/qt-s60-public: Use MMP keyword, not compiler flags, to update FPU option on Symbian
| * | | | | Merge branch '4.6' of scm.dev.nokia.troll.no:qt/qt-s60-public into 4.6Iain2010-01-138894-9441/+10896
| |\ \ \ \ \
| * | | | | | Use MMP keyword, not compiler flags, to update FPU option on SymbianIain2010-01-132-1/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This avoids two sets of --fpu flags being passed on the compiler command line, so we don't have to worry about which takes precedence (especially since it varies between RVCT and GCC). Putting ARMFPU in the MMP file means that the toolchain will replace its default option with the one we specify instead. Reviewed-by: Aleksandar Sasha Babic
* | | | | | | Merge branch '4.6' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into ↵Qt Continuous Integration System2010-01-134-163/+168
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 4.6-integration * '4.6' of scm.dev.nokia.troll.no:qt/oslo-staging-1: Doc: Describe QStackedWidget::removeWidget() more thoroughly. Doc: Resized the window and added a title. Doc: Added a missing example to the list of Graphics View examples. Doc: Clarified why a path matches in the example given.
| * \ \ \ \ \ \ Merge branch '4.6' of git@scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.6David Boddie2010-01-13184-1528/+3165
| |\ \ \ \ \ \ \
| * | | | | | | | Doc: Describe QStackedWidget::removeWidget() more thoroughly.David Boddie2010-01-131-2/+5
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Reviewed-by: Pierre Rossi
| * | | | | | | | Doc: Resized the window and added a title.David Boddie2010-01-121-160/+161
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Reviewed-by: Trust Me
| * | | | | | | | Merge branch '4.6' of git@scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.6David Boddie2010-01-11131-959/+2201
| |\ \ \ \ \ \ \ \
| * | | | | | | | | Doc: Added a missing example to the list of Graphics View examples.David Boddie2010-01-111-0/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Reviewed-by: Trust Me
| * | | | | | | | | Doc: Clarified why a path matches in the example given.David Boddie2010-01-081-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Task-number: QT-1519 (internal) Reviewed-by: Trust Me
generated by cgit v0.12 at 2025-03-13 13:18:06 (GMT)