summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Another attempt at fixing the MSVC2005 build.Samuel Rødal2011-04-151-1/+6
| | | | | | | Apparently direct casting is illegal there too, even though they don't have the cast operators. Reviewed-by: Kim
* Compile fix in qdrawhelper_sse2.cpp for MSVC 2005.Samuel Rødal2011-04-141-0/+5
|
* Compile fix in qdrawhelper_sse2.cpp.Samuel Rødal2011-04-141-1/+1
|
* Added support for six-parameter radial gradients.Samuel Rødal2011-04-1321-130/+617
| | | | | | | | The extended radial gradients conform to the radial gradient specification in HTML 5 canvas. Task-number: QTBUG-14075 Reviewed-by: Andreas Kling
* Improved gradient table generation performance for two-stop gradients.Samuel Rødal2011-04-136-77/+256
| | | | | | | | Two stops is a fairly common case so we gain quite a bit by special casing it. Improves performance by 10 % in parcycle benchmark, and by 90 % in a synthetic benchmark. Reviewed-by: Andreas Kling
* Optimized radial gradient fetch using SSE 2.Samuel Rødal2011-04-133-0/+98
| | | | | | | On an i7 this improves performance by 22 % in parcycle, 107 % in default svgviewer example, and 283 % in a synthetic radial gradient benchmark. Reviewed-by: Andreas Kling
* Improved qt_gradient_clamp for reflect spreads.Samuel Rødal2011-04-131-5/+2
| | | | | | | Using GRADIENT_STOPTABLE_SIZE * 2 as the modulo gives more correct behaviour, and also improves performance slightly. Reviewed-by: Benjamin Poulain
* Prepared for SIMD implementation of radial gradients.Samuel Rødal2011-04-132-177/+174
| | | | | | | Made the radial gradient fetch func into a template to be able to optimize the inner loop using SIMD instructions. Reviewed-by: Benjamin Poulain
* Fix a race condition when the main window is being destructed.Fabien Freling2011-04-122-1/+3
| | | | | | | | During the destructor of QWidget, we delete the layout. If the layout is not set to 0 afterwards, a check on the layout might turn true, but any access will end with a segfault. Reviewed-by: João Abecasis
* Switch the default graphics system to raster on Mac.Fabien Freling2011-04-111-1/+1
| | | | Reviewed-by: Lars Knoll
* Lancelot: support for custom keys added to protocol. API cleanup.aavit2011-04-112-53/+144
|
* Merge branch 'master' of scm.dev.nokia.troll.no:qt/qt-fire-staging into ↵Qt Continuous Integration System2011-04-105-9/+65
|\ | | | | | | | | | | | | | | | | | | master-integration * 'master' of scm.dev.nokia.troll.no:qt/qt-fire-staging: Lancelot: bail out if rendering consistently fails Minor optimization to lance/elot Make it possible to test the new font hinting in lance[elot] Fixes: The "test: too many arguments" error after every make
| * Merge branch 'master' of git://scm.dev.nokia.troll.no/qt/qt-fire-teamQt Continuous Integration System2011-04-074-8/+64
| |\ | | | | | | | | | | | | | | | | | | * 'master' of git://scm.dev.nokia.troll.no/qt/qt-fire-team: Lancelot: bail out if rendering consistently fails Minor optimization to lance/elot Make it possible to test the new font hinting in lance[elot]
| | * Lancelot: bail out if rendering consistently failsaavit2011-04-071-1/+10
| | |
| | * Minor optimization to lance/elotaavit2011-04-071-1/+2
| | |
| | * Make it possible to test the new font hinting in lance[elot]aavit2011-04-073-6/+52
| | | | | | | | | | | | | | | A rudimentary test script is also included, showing the use of the new parameter to the qps setFont command.
| * | Merge branch 'master' of git://scm.dev.nokia.troll.no/qt/qt-fire-teamQt Continuous Integration System2011-04-0770-857/+2276
| |\ \ | | |/ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * 'master' of git://scm.dev.nokia.troll.no/qt/qt-fire-team: (53 commits) Fixes: The "test: too many arguments" error after every make Fixed license headers for examples in master Fixed deployment problems with MSVC 2005 and 2008 SP1 QLocalSocket/Win: handle ERROR_ACCESS_DENIED Add branch prediction macros Add methods for traversing and combining QProcessEnvironment. Designer [Qt Creator integration]: Fix integrated property editor. Handle the HTTP 418 reply properly in QNAM absorb translations.pri into translations.pro let generated flag control SQL generation Add version attributes as per ODF specification Fixed QFtp autotests not to crash in network time out situations Make createpackage and patch_capabilties scripts use tmp dir Fix for QTBUG-16985. Revert "QComboBox fix for QTBUG-16985" Moving Symbian CPU core detection to qthread_symbian.cpp QComboBox fix for QTBUG-16985 Making Symbian helper threads exit cleanly at app exit Add ".make.cache" to the files to be cleaned for symbian-abld. Fix mismatched $$translations handling after merge ...
| | * Merge remote branch 'qt-mainline/master'aavit2011-04-0769-856/+2275
| | |\
| | * | Fixes: The "test: too many arguments" error after every makeaavit2011-04-071-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | If the gdb version string was not matched, it would be passed in full to test. This new regexp matches the different kinds of gdb version string observed in the wild, as listed in qtcreator/tests/auto/debugger/tst_version.cpp Reviewed-by: aep <arvid.picciani@nokia.com>
* | | | Merge branch 'master' of scm.dev.nokia.troll.no:qt/qt-tools-staging into ↵Qt Continuous Integration System2011-04-092-1/+4
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | master-integration * 'master' of scm.dev.nokia.troll.no:qt/qt-tools-staging: Designer: Allow promoted QWidget's to be buddies. Designer: Specify 'notr' attribute for buttongroup name.
| * | | | Designer: Allow promoted QWidget's to be buddies.Friedemann Kleint2011-04-081-1/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Extend check for focusPolicy by promoted check. Task-number: QTBUG-18631
| * | | | Designer: Specify 'notr' attribute for buttongroup name.Friedemann Kleint2011-04-081-0/+1
| | | | | | | | | | | | | | | | | | | | Such that the name does not show up in lupdate.
* | | | | Merge branch 'qt-master-from-4.7' of ↵Qt Continuous Integration System2011-04-095-22/+33
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | scm.dev.nokia.troll.no:qt/qt-integration into master-integration * 'qt-master-from-4.7' of scm.dev.nokia.troll.no:qt/qt-integration: [QTBUG-15278] QWidget::windowState gets out of sync (Aero Snap) HTTP cacheing: do not store the date header with the resource Let's not write to the source buffer when blending argb32 on rgb16. make -markuntranslated work without -idbased fix conditional on shell type
| * \ \ \ \ Merge branch 4.7 into qt-master-from-4.7Qt Continuous Integration System2011-04-095-22/+33
| |\ \ \ \ \
| | * \ \ \ \ Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into ↵Qt Continuous Integration System2011-04-092-17/+30
| | |\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 4.7-integration * '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1: [QTBUG-15278] QWidget::windowState gets out of sync (Aero Snap) HTTP cacheing: do not store the date header with the resource
| | | * | | | | [QTBUG-15278] QWidget::windowState gets out of sync (Aero Snap)Arnold Konrad2011-04-081-9/+25
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Windows 7 sends WM_SIZE messages without preceding WM_SYSCOMMAND when a window is maximized or restored via Aero Snap. These messages are now handled correctly. Merge-request: 1105 Reviewed-by: Prasanth Ullattil <prasanth.ullattil@nokia.com>
| | | * | | | | HTTP cacheing: do not store the date header with the resourcePeter Hartmann2011-04-081-8/+5
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | ... to avoid re-writing the resource to disk when retrieving the resource from cache. We are currently using the "Expires", "max-age" and "s-maxage" headers to determine when a cached resource will expire. Autotests still pass and the demo browser reports the same amount of pages loaded from the cache. Reviewed-by: Markus Goetz
| | * | | | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into ↵Qt Continuous Integration System2011-04-081-3/+1
| | |\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 4.7-integration * '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-2: Let's not write to the source buffer when blending argb32 on rgb16.
| | | * | | | | | Let's not write to the source buffer when blending argb32 on rgb16.Samuel Rødal2011-04-081-3/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Even though we're writing the same values back, we might get a segfault when the source is in read-only memory. Reviewed-by: Kim
| | * | | | | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into ↵Qt Continuous Integration System2011-04-082-2/+2
| | |\ \ \ \ \ \ \ | | | | |/ / / / / | | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 4.7-integration * '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1: make -markuntranslated work without -idbased fix conditional on shell type
| | | * | | | | | make -markuntranslated work without -idbasedOswald Buddenhagen2011-04-081-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Task-number: QTBUG-18625
| | | * | | | | | fix conditional on shell typeOswald Buddenhagen2011-04-081-1/+1
| | | | | | | | |
* | | | | | | | | Merge branch 'master' of scm.dev.nokia.troll.no:qt/qt-qa-staging into ↵Qt Continuous Integration System2011-04-0912-102/+64
|\ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | master-integration * 'master' of scm.dev.nokia.troll.no:qt/qt-qa-staging: Fix typos in QSharedPointer documentation. Remove test for compiler correctness Refactor qpointer dereference tests Prefer QCOMPARE to QVERIFY for comparisons. Improve coverage of qpointer autotest Add comments, eliminate duplication in qpointer autotest. Remove redundant includes and functions from qpointer autotest. Fix tst_XmlPatterns::xquerySupport() autotest Update copyright year to 2011. BM2: Little fix to make the `make check-trusted' to work on Linux and Windows.
| * \ \ \ \ \ \ \ \ Merge remote branch 'qa-review/master' into qa-staging-masterRohan McGovern2011-04-0712-102/+64
| |\ \ \ \ \ \ \ \ \
| | * \ \ \ \ \ \ \ \ Merge branch 'master' of git://scm.dev.nokia.troll.no/qt/qt-qa-teamQt Continuous Integration System2011-04-061-11/+11
| | |\ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * 'master' of git://scm.dev.nokia.troll.no/qt/qt-qa-team: Fix typos in QSharedPointer documentation.
| | | * | | | | | | | | Fix typos in QSharedPointer documentation.Jason McDonald2011-04-061-11/+11
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Reviewed-by: Trust Me
| | * | | | | | | | | | Merge branch 'master' of git://scm.dev.nokia.troll.no/qt/qt-qa-teamQt Continuous Integration System2011-04-061-74/+36
| | |\ \ \ \ \ \ \ \ \ \ | | | |/ / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * 'master' of git://scm.dev.nokia.troll.no/qt/qt-qa-team: Remove test for compiler correctness Refactor qpointer dereference tests Prefer QCOMPARE to QVERIFY for comparisons. Improve coverage of qpointer autotest Add comments, eliminate duplication in qpointer autotest. Remove redundant includes and functions from qpointer autotest.
| | | * | | | | | | | | Remove test for compiler correctnessJason McDonald2011-04-061-17/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Unit tests are supposed to verify Qt, verifying the compiler is a different task entirely. Reviewed-by: Rohan McGovern
| | | * | | | | | | | | Refactor qpointer dereference testsJason McDonald2011-04-061-19/+10
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The data method is just another way of dereferencing a QPointer, so test it in the same place as the other dereference operators. Reviewed-by: Rohan McGovern
| | | * | | | | | | | | Prefer QCOMPARE to QVERIFY for comparisons.Jason McDonald2011-04-061-3/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Reviewed-by: Rohan McGovern
| | | * | | | | | | | | Improve coverage of qpointer autotestJason McDonald2011-04-051-0/+7
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Coverage analysis revealed that the assignment test was not exercising code that shortcuts assignment when assigning the value that is already held. Reviewed-by: Rohan McGovern
| | | * | | | | | | | | Add comments, eliminate duplication in qpointer autotest.Jason McDonald2011-04-051-7/+17
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Test destruction of guarded objects in the destruction test function, rather than partly there and partly in the assignment test. Reviewed-by: Rohan McGovern
| | | * | | | | | | | | Remove redundant includes and functions from qpointer autotest.Jason McDonald2011-04-051-29/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Reviewed-by: Rohan McGovern
| | * | | | | | | | | | Merge branch 'master' of git://scm.dev.nokia.troll.no/qt/qt-qa-teamQt Continuous Integration System2011-03-271-8/+8
| | |\ \ \ \ \ \ \ \ \ \ | | | |/ / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * 'master' of git://scm.dev.nokia.troll.no/qt/qt-qa-team: Fix tst_XmlPatterns::xquerySupport() autotest
| | | * | | | | | | | | Fix tst_XmlPatterns::xquerySupport() autotestSergio Ahumada2011-03-251-8/+8
| | | | | | | | | | | |
| | * | | | | | | | | | Merge branch 'master' of git://scm.dev.nokia.troll.no/qt/qt-qa-teamQt Continuous Integration System2011-03-241949-74768/+111147
| | |\ \ \ \ \ \ \ \ \ \ | | | |/ / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * 'master' of git://scm.dev.nokia.troll.no/qt/qt-qa-team: (1731 commits) Updated QtGUI DEF files for WINSCW Handle removal of setter for partialUpdateSupport Updated QtGUI DEF files for WINSCW Handle removal of setter for partialUpdateSupport Designer: Avoid nested QDialog's in item widget content dialogs. Updated DEF files for Symbian Fixed drawImage() not to attempt drawing null images on openvg. QS60Style: Update placeholder texture to real one Text bounding rect calculated incorrectly if non-top aligned. Designer: Remember default of main container's object name. Bump Qt version to 4.7.4 Return SV_S60_5_2 / SV_SF_3 for next gen Symbian platform. Remove incorrect check in qpixmap autotest. Change the pooled QGLPixmapData to be backed by QVolatileImage. Started changes-4.7.4 file Fix endianness detection with gcc 4.6 -flto -fwhole-program remove redundand validateModes() call Changed s60 style not to rely on QPixmapData::toNativeType(). Add missing bitmap locking to QVGPixmapData::fromNativeType. Don't crash calling QTextDocument::blockBoundingRect on invalid block ...
| | | * | | | | | | | | Merge qt/qt.git master into qa-team-masterRohan McGovern2011-03-241949-74768/+111147
| | | |\ \ \ \ \ \ \ \ \
| | * | \ \ \ \ \ \ \ \ \ Merge branch 'master' of scm.dev.nokia.troll.no:qt/qt-qa-teamQt Continuous Integration System2011-01-1010767-16726/+100031
| | |\ \ \ \ \ \ \ \ \ \ \ | | | |/ / / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * 'master' of scm.dev.nokia.troll.no:qt/qt-qa-team: (157 commits) Update copyright year to 2011. Fix reversed condition introduced in 9a6cfc07e5 Add /DYNAMICBASE /NXCOMPAT to linker options in Visual Studio 2005 and higher Fix compilation error on Solaris Check elapsed time only once Added api for efficient data driven baseline testing Assistant: Fix warnings. Assistant: Don't tabify "Open Pages" dock widget by default. QmlViewer: Remove unused class variables Fixed bug and performance problem in windowsstyle. Restored old flushing behavior in -graphicssystem opengl on desktop. Fix KERN-EXEC 0 panic on exit when bearer is searching for WLANs Designer: Block QEvent::WinIdChange. QUrl::setUrl should call detach qkeymapper_x11.cpp: fix compilation with LSB and without XKB tst_qscriptclass: backport test from the v8 branch QHostInfoCache: Use QElapsedTime instead of QTime Remove unnecessarily frozen functions from QtOpenGL WINSCW DEF file Cocoa: add support for QEventLoop::ExcludeUserInputEvents Updated QTOpenGL DEF files for WINSCW and ARMV5 ...
| | | * | | | | | | | | | Update copyright year to 2011.Jason McDonald2011-01-1010658-10751/+10751
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Reviewed-by: Trust Me
| | | * | | | | | | | | | Merge branch 'master' of scm.dev.nokia.troll.no:qt/qt-qa-teamJason McDonald2011-01-101-1/+4
| | | |\ \ \ \ \ \ \ \ \ \