summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Clean up oracle data type tests.Bill King2009-12-221-21/+16
|
* Merge branch '4.6' of scm.dev.nokia.troll.no:qt/qt-s60-public into ↵Qt Continuous Integration System2009-12-215-8/+20
|\ | | | | | | | | | | | | | | | | 4.6-integration * '4.6' of scm.dev.nokia.troll.no:qt/qt-s60-public: Edit focus should not be lost unless by explicit action RVCT 2.2 compiler can't handle static inline functions with templates. Forwarded return value from QtMainWrapper() to E32Main() exit code.
| * Edit focus should not be lost unless by explicit actionSami Merila2009-12-213-3/+15
| | | | | | | | | | | | | | | | | | | | | | | | Currently non-touch devices lose edit focus if window switch happens. I.e. in cases when screensaver activates, an incoming call occurs, a global notification is shown... With this fix, edit focus remain active, until user removes the focus explicitly. Task-number: 4792 Reviewed-by: axis
| * RVCT 2.2 compiler can't handle static inline functions with templates.Miikka Heikkinen2009-12-211-4/+4
| | | | | | | | | | | | Removed static keywords from offending functions. Reviewed-by: axis
| * Forwarded return value from QtMainWrapper() to E32Main() exit code.Miikka Heikkinen2009-12-211-1/+1
| | | | | | | | | | | | | | Previously only leaves from QtMainWrapper() were forwarded. Task-number: QTBUG-6422 Reviewed-by: axis
* | Merge branch '4.6' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into ↵Qt Continuous Integration System2009-12-1914-313/+417
|\ \ | |/ |/| | | | | | | | | | | | | | | | | | | | | | | | | 4.6-integration * '4.6' of scm.dev.nokia.troll.no:qt/oslo-staging-1: Fix a bug in resizing the anomaly browser demo. doc: Added a missing \sa command, plus a \l in the text. Improve the performance of the Anomaly browser demo Fixed crash when parsing invalid polygons in svgs. doc: Fixed typos. Fixed QResource to respect the explicitely set locale Change QHostInfo to use 5 parallel lookup threads Doc: fix typo fix Cocoa build
| * Merge branch '4.6' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into ↵Qt Continuous Integration System2009-12-1914-313/+417
| |\ |/ / | | | | | | | | | | | | | | | | | | | | | | | | | | 4.6-integration * '4.6' of scm.dev.nokia.troll.no:qt/oslo-staging-1: Fix a bug in resizing the anomaly browser demo. doc: Added a missing \sa command, plus a \l in the text. Improve the performance of the Anomaly browser demo Fixed crash when parsing invalid polygons in svgs. doc: Fixed typos. Fixed QResource to respect the explicitely set locale Change QHostInfo to use 5 parallel lookup threads Doc: fix typo fix Cocoa build
| * Merge branch '4.6' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into ↵Qt Continuous Integration System2009-12-1914-313/+417
| |\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 4.6-integration * '4.6' of scm.dev.nokia.troll.no:qt/oslo-staging-1: Fix a bug in resizing the anomaly browser demo. doc: Added a missing \sa command, plus a \l in the text. Improve the performance of the Anomaly browser demo Fixed crash when parsing invalid polygons in svgs. doc: Fixed typos. Fixed QResource to respect the explicitely set locale Change QHostInfo to use 5 parallel lookup threads Doc: fix typo fix Cocoa build
| | * Merge branch '4.5' into 4.6-stagingThiago Macieira2009-12-181-16/+4
| | |\
| | | * Fixed crash when parsing invalid polygons in svgs.Kim Motoyoshi Kalland2009-12-181-16/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Since a 2D point consists of two coordinates, it was assumed that polygons and polylines were described with an even number of coordinates. When the number of coordinates was odd, the program would read out of bounds and cause an assert failure. Task-number: QTBUG-6899 Reviewed-by: Gunnar
| | * | Fix a bug in resizing the anomaly browser demo.Benjamin Poulain2009-12-181-2/+3
| | | | | | | | | | | | | | | | | | | | The sliding surface does not move, the position of the children must be used to find the correct layout.
| | * | Merge branch '4.6' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into ↵Qt Continuous Integration System2009-12-1813-297/+412
| | |\ \ | |/ / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 4.6-integration * '4.6' of scm.dev.nokia.troll.no:qt/oslo-staging-1: doc: Added a missing \sa command, plus a \l in the text. Improve the performance of the Anomaly browser demo doc: Fixed typos. Fixed QResource to respect the explicitely set locale Change QHostInfo to use 5 parallel lookup threads Doc: fix typo fix Cocoa build
| | * | Merge branch '4.6' of git@scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.6Martin Smith2009-12-182-88/+70
| | |\ \
| | | * | Improve the performance of the Anomaly browser demoBenjamin Poulain2009-12-182-88/+70
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Some minor changes to improve the demo: -use QUrl::fromUserInput() -scroll a surface instead of moving the widgets to minimize the repaint -use the animation framework instead of QTimeLine
| | * | | doc: Added a missing \sa command, plus a \l in the text.Martin Smith2009-12-182-10/+11
| | |/ / | | | | | | | | | | | | Task-number: QTBUG-6288
| | * | Merge branch '4.6' of git@scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.6Martin Smith2009-12-18191-3078/+5950
| | |\ \
| | | * \ Merge branch '4.6' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into ↵Qt Continuous Integration System2009-12-187-197/+329
| | | |\ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 4.6-integration * '4.6' of scm.dev.nokia.troll.no:qt/oslo-staging-1: Fixed QResource to respect the explicitely set locale Change QHostInfo to use 5 parallel lookup threads Doc: fix typo fix Cocoa build
| | | | * | Fixed QResource to respect the explicitely set localeDenis Dzyubenko2009-12-172-1/+23
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | When using QResource directly, the loader should respect the locale that the user asked to use for the resource. Reviewed-by: João Abecasis
| | | | * | Change QHostInfo to use 5 parallel lookup threadsMarkus Goetz2009-12-174-195/+305
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Instead of sequentially looking up and potentially taking a long time, we now do work in parallel. Reviewed-by: ogoffart Reviewed-by: lars
| | | | * | Doc: fix typoVolker Hilsheimer2009-12-171-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | Fixes: QTBUG-6539
| | | | * | Merge branch '4.5' of scm.dev.nokia.troll.no:qt/qt into 4.6Simon Hausmann2009-12-170-0/+0
| | | | |\ \ | | | | | |/ | | | | | | | | | | | | | | | | | | Conflicts: src/network/kernel/kernel.pri
| | | | | * fix Cocoa buildPeter Hartmann2009-12-151-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | with change 83940f25, we used LIBS_PRIVATE on the Mac; somewhere the line where we linked against the Mac libs in the network kernel was lost. Reviewed-By: Thiago
| | * | | | doc: Fixed typos.Martin Smith2009-12-182-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | Task-number: QTBUG-6898
* | | | | | Merge branch '4.6' of scm.dev.nokia.troll.no:qt/qt-s60-public into ↵Qt Continuous Integration System2009-12-195-61/+55
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 4.6-integration * '4.6' of scm.dev.nokia.troll.no:qt/qt-s60-public: Fixing compile issue on Windows CE Fixed two incorrect signal connections. Switched two files to BSD license.
| * \ \ \ \ \ Merge branch '4.6' of scm.dev.nokia.troll.no:qt/qt-s60-public into ↵Qt Continuous Integration System2009-12-185-61/+55
| |\ \ \ \ \ \ | | |/ / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 4.6-integration * '4.6' of scm.dev.nokia.troll.no:qt/qt-s60-public: Fixing compile issue on Windows CE Fixed two incorrect signal connections. Switched two files to BSD license.
| | * | | | | Fixing compile issue on Windows CEAleksandar Sasha Babic2009-12-181-3/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Reviewed-by: TrustMe
| | * | | | | Fixed two incorrect signal connections.axis2009-12-182-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | RevBy: Friedemann Kleint
| | * | | | | Switched two files to BSD license.axis2009-12-182-56/+52
| | | |/ / / | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This is needed because they become a static library that is linked into every application. RevBy: Espen Riskedal
* | | | | | Merge branch '4.6' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into ↵Qt Continuous Integration System2009-12-1925-91/+928
|\ \ \ \ \ \ | |/ / / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 4.6-integration * '4.6' of scm.dev.nokia.troll.no:qt/oslo-staging-2: Fixed QPixmap::load() to not modify referenced copies. Fixes bug when using AnchorUnderMouse for GraphicsView transformation. Make the layout{,AboutToBe}Changed signals in the QSortFilterProxyModel match its source. Make sure mappings are created for columns when indexes newly become parents. NEON configure detection and initial blend function implementations. Optimize QThreadStorage with QVector Add Q_OBJECT to QBalloonTip so it can be intreospected by styles.
| * | | | | Merge branch '4.6' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into ↵Qt Continuous Integration System2009-12-1825-91/+928
| |\ \ \ \ \ |/ / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 4.6-integration * '4.6' of scm.dev.nokia.troll.no:qt/oslo-staging-2: Fixed QPixmap::load() to not modify referenced copies. Fixes bug when using AnchorUnderMouse for GraphicsView transformation. Make the layout{,AboutToBe}Changed signals in the QSortFilterProxyModel match its source. Make sure mappings are created for columns when indexes newly become parents. NEON configure detection and initial blend function implementations. Optimize QThreadStorage with QVector Add Q_OBJECT to QBalloonTip so it can be intreospected by styles.
| * | | | | Fixed QPixmap::load() to not modify referenced copies.Trond Kjernåsen2009-12-181-5/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This is a bad regression from 4.5. QPixmap::load() would modify all references to the same QPixmap object. Task-number: QTBUG-6840 Reviewed-by: Kim
| * | | | | Fixes bug when using AnchorUnderMouse for GraphicsView transformation.Yoann Lopes2009-12-182-3/+113
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | We now automatically enable mouse tracking on the viewport of the GraphicsView when setting AnchorUnderMouse as transformationAnchor or resizeAnchor. Autotest included. Task-number: QTBUG-6835 Reviewed-by: bnilsen
| * | | | | Make the layout{,AboutToBe}Changed signals in the QSortFilterProxyModel ↵Stephen Kelly2009-12-182-13/+115
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | match its source. Merge-request: 2266 Reviewed-by: Olivier Goffart
| * | | | | Make sure mappings are created for columns when indexes newly become parents.Stephen Kelly2009-12-188-17/+80
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Also move the modeltest related tests to the modeltest subdirectory Merge-request: 2262 Reviewed-by: Olivier Goffart <ogoffart@trolltech.com>
| * | | | | NEON configure detection and initial blend function implementations.Samuel Rødal2009-12-188-4/+432
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Adds new NEON configure test and -no-neon configure option. NEON implementations can also be turned off by setting the QT_NO_NEON environment variable. Performance improvements (in frames per second): - Blending ARGB32 on RGB32/ARGB32, mostly opaque: 71 % - Blending ARGB32 on RGB32/ARGB32, no opaque pixels: 108 % - Blending ARGB32 on RGB32/ARGB32, with 0.5 opacity: 158 % - Blending RGB32 on RGB32/ARGB32, with 0.5 opacity: 189 % Task-number: QTBUG-6684 Reviewed-by: Gunnar Sletta Reviewed-by: Paul Olav Tvete
| * | | | | Optimize QThreadStorage with QVectorOlivier Goffart2009-12-185-49/+183
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | QThreadStorageData::get might be accessed very often. QMap lookup has proven to be too slow. We can expect about 20 instances of QThreadStorage in a typical applications (tested with some KDE applications) So a QVector is more suited Note: we now re-use the ids. Which means that if the QThreadStorage is destroyed before the QThread, and another one is created, we might get crashes (instead of a warning printed to the console) Reviewed-by: brad
| * | | | | Add Q_OBJECT to QBalloonTip so it can be intreospected by styles.Olivier Goffart2009-12-181-0/+1
| | | | | | | | | | | | | | | | | | | | | | | | Reviewed-by: jbache
* | | | | | Merge branch '4.6' of scm.dev.nokia.troll.no:qt/qt-multimedia-team into ↵Qt Continuous Integration System2009-12-184-14/+39
|\ \ \ \ \ \ | |/ / / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 4.6-integration * '4.6' of scm.dev.nokia.troll.no:qt/qt-multimedia-team: Check if the scene exists before attempting to set its focus item. The "audioinput" multimedia example locks up the audio input/output no audiodevices found using QAudioDeviceInfo::availableDevices on Ubuntu
| * | | | | Check if the scene exists before attempting to set its focus item.Michael Brasser2009-12-181-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Prevents crashing when an item involved in the scope chain is set to be visible but it isn't part of a scene. Reviewed-by: Alexis Menard
| * | | | | The "audioinput" multimedia example locks up the audio input/outputKurt Korbatits2009-12-182-13/+33
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Task-number:QTBUG-5633 Reviewed-by:Justin McPherson
| * | | | | no audiodevices found using QAudioDeviceInfo::availableDevices on UbuntuKurt Korbatits2009-12-181-0/+5
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Task-number:QTBUG-6866 Reviewed-by:Justin McPherson
* | | | | | Merge branch '4.6' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into ↵Qt Continuous Integration System2009-12-187-66/+62
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 4.6-integration * '4.6' of scm.dev.nokia.troll.no:qt/oslo-staging-2: Prevent access to non-existent memory in triagulating stroker Align GL_RGB lines on a 4-byte boundary when uploading pixmap textures Cleanup qsqldatabase test case a little bit. GL2Engine: Don't mark brush as dirty if it hasn't changed Doc: setFeature snippet was in the wrong place
| * | | | | | Prevent access to non-existent memory in triagulating strokerRhys Weatherley2009-12-181-2/+8
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | In the triangulating stroker, the last point was being duplicated in dashed paths. But because QDataBuffer::add() takes a ref to a float rather than a float, it would resize the data buffer and then try to fetch the values out of a pointer to the original buffer memory. This change copies the values into temporary variables before resizing the array. Task-number: QTBUG-6045 Reviewed-by: Sarah Smith
| * | | | | | Align GL_RGB lines on a 4-byte boundary when uploading pixmap texturesRhys Weatherley2009-12-181-13/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Previous code was aligning lines on a 3-byte boundary. Task-number: QTBUG-6902 Reviewed-by: Julian de Bhal
| * | | | | | Cleanup qsqldatabase test case a little bit.Bill King2009-12-171-15/+9
| | | | | | |
| * | | | | | Merge branch '4.6' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into ↵Qt Continuous Integration System2009-12-174-36/+43
| |\ \ \ \ \ \ | | |_|_|_|/ / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 4.6-integration * '4.6' of scm.dev.nokia.troll.no:qt/oslo-staging-2: GL2Engine: Don't mark brush as dirty if it hasn't changed Doc: setFeature snippet was in the wrong place
| | * | | | | GL2Engine: Don't mark brush as dirty if it hasn't changedTom Cooksey2009-12-173-34/+41
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | If the same brush is used over and over again, this gives a huge performance boost (measured to be 25% faster on desktop and 73% faster on SGX). Reviewed-By: Samuel Rødal
| | * | | | | Doc: setFeature snippet was in the wrong placeJoerg Bornemann2009-12-171-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Reviewed-by: Niels Weber
* | | | | | | Merge branch '4.6' of scm.dev.nokia.troll.no:qt/berlin-staging-1 into ↵Qt Continuous Integration System2009-12-183-12/+43
|\ \ \ \ \ \ \ | |_|_|_|/ / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 4.6-integration * '4.6' of scm.dev.nokia.troll.no:qt/berlin-staging-1: Designer: Fix compilation with -static on Mac OS X Configure support for multiple include levels in qmake.conf hierarchy. Stop the configuration if the test compiler cannot be found.
| * | | | | | Merge branch '4.6' of scm.dev.nokia.troll.no:qt/berlin-staging-1 into ↵Qt Continuous Integration System2009-12-173-12/+43
| |\ \ \ \ \ \ | | |/ / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 4.6-integration * '4.6' of scm.dev.nokia.troll.no:qt/berlin-staging-1: Designer: Fix compilation with -static on Mac OS X Configure support for multiple include levels in qmake.conf hierarchy. Stop the configuration if the test compiler cannot be found.