summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* make QPixmap rely on QPixmapData for loading from files and from data...gunnar2009-08-243-31/+43
| | | | Reviewed-By: Eskil
* HSL support for QColorThomas Hartmann2009-08-243-26/+689
| | | | | | | This patch adds support for the HSL color space to QColor See discussions on dev mailing list Reviewed-by: Marco Bubke
* Fix the last fix to QList.Thiago Macieira2009-08-242-2/+2
| | | | Reviewed-by: TrustMe
* Gestures, Mac: remove pan gesture from qabstractscrollareaRichard Moe Gustavsen2009-08-242-4/+9
| | | | | | | | | On Mac there really is no native pan gesture. Instead, this gesture is delivered as mouse wheel events. So adding a pan gesture to qabstractscrollarea means that it will get both wheel and pan events. And both will try to move the viweport. I think that the correct thing to do here is to not apply a pan gesture by default on all scroll areas.
* Speedup the qgraphicsscene benchmarkOlivier Goffart2009-08-241-0/+5
| | | | | let QGraphicsScene::_q_polishItems be called so ~QGraphicsItem doesn't spend all his time cleaning the unpolished list
* Removed superfluous status change.axis2009-08-241-1/+0
| | | | | | | The service provider (RTimer) will do it for us. RevBy: Iain AutoTest: Passed
* Merge branch '4.6' of git@scm.dev.nokia.troll.no:qt/qt into 4.6Jason Barron2009-08-249-29/+144
|\
| * Remove QScopedCustomPointerHarald Fernengel2009-08-243-10/+19
| | | | | | | | | | | | | | Use QScopedPointer with a custom deleter instead, so we can remove the awful QScopedCustomPointer once and for all :) Reviewed-by: Thiago
| * Restore QList backward compatibilityHarald Fernengel2009-08-242-3/+56
| | | | | | | | | | | | | | | | Add detach3 and append2, leaving the old functions as they were. This ensures that new code will use the optimized version of QList, and old code will just continue calling the old functions. Reviewed-by: Thiago
| * Revert "Remove the unnecessary double memcpy now too."Harald Fernengel2009-08-241-0/+3
| | | | | | | | This reverts commit 10a0ed3f2e6a71eced5f470f1c3e09d7be58bbc9.
| * Revert "Fix trivial QList detaching: QListData::detach2() *must* memcpy."Harald Fernengel2009-08-241-1/+1
| | | | | | | | This reverts commit 7a7ea0219f6ebb9f7833649ec76e077796be1843.
| * Fix QScriptContext::argumentObjects for function called with QScriptValue::callOlivier Goffart2009-08-242-2/+42
| | | | | | | | They have the hostCallFrameFlag, but are function context, not <eval> context
| * QScriptValue: No need to create the activation object for call or constructOlivier Goffart2009-08-242-13/+23
| | | | | | | | It is uneeded and add useless overhead
* | Make context2d compile with QT_NO_SCRIPTTOOLS.Jason Barron2009-08-241-2/+4
|/ | | | | | These two member variables should be ifdef'ed. Reviewed-by: Kent Hansen
* Trivial: Remove uneeded #includeHarald Fernengel2009-08-241-1/+0
|
* Merge branch 'master' of git@scm.dev.nokia.troll.no:qt/qt-s60-public into 4.6axis2009-08-2425-5/+39195
|\
| * Added some internal docs to make the class clearer.axis2009-08-211-0/+6
| |
| * Merge branch 'master' of git@scm.dev.nokia.troll.no:qt/qt-s60-publicIain2009-08-211-5/+5
| |\
| | * Fixed an MSVC 9.0 /2008 warningAlessandro Portale2009-08-211-5/+5
| | | | | | | | | | | | Reviewed-By: Harald Fernengel
| * | Merge branch 'symbolVisibility'Iain2009-08-2124-5/+39189
| |\ \ | | |/ | |/|
| | * Merge commit 'origin/master' into symbolVisibilityIain2009-08-21677-39737/+27759
| | |\
| | * | Update EABI DEF files after 4.6 mergeIain2009-08-2110-1160/+2560
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Removed exports are marked ABSENT, as we're experimenting with how hard it will be to maintain BC once these DEF files are final. There were probably too many exports anyway, as I think I might have originally frozen them with a version of RVCT that had the symbol visibility issues. Reviewed-by: TrustMe
| | * | Merge commit 'origin/master' into symbolVisibilityIain2009-08-20387-1266/+34125
| | |\ \
| | * | | Update schema version number for SBSv2 Qt integrationIain2009-08-191-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | New version of SBSv2 build schema release, but no impact on our file, so just update the version number. Reviewed-by: TrustMe
| | * | | ***EXPERIMENTAL*** DEF files for WINSCW targetsIain2009-08-199-0/+19218
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Note: these *will* change between now and the release of 4.6, they should not be relied upon for anything - they are purely for experimental purposes Task-number: 259810 (partial) Reviewed-by: TrustMe
| | * | | ***EXPERIMENTAL*** DEF files for EABI targetsIain2009-08-199-0/+18549
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Note: these *will* change between now and the release of 4.6, they should not be relied upon for anything - they are purely for experimental purposes Webkit DEF files to follow in later commit...
| | * | | New definition for ...EXPORT_INLINE to deal with the way we drive RVCTIain2009-08-191-0/+6
| | | | |
| | * | | Ensure the correct set of symbols are exported in the DEF files (part 1)Iain2009-08-193-4/+15
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | For DLLs using Qt-style class level exports, ensure that only public symbols are exported For static libraries (static, staticlib configs) we don't want/need/ can't have a DEF file
* | | | | Remove last vestiges of the qtusagereporter.Jason McDonald2009-08-247-85/+1
| | | | | | | | | | | | | | | | | | | | Reviewed-by: Trust Me
* | | | | Fix compilation with WINSCW: no varargs macrosThiago Macieira2009-08-221-9/+9
| | | | | | | | | | | | | | | | | | | | src\3rdparty\webkit\JavaScriptCore\wtf\Assertions.h:150: badly punctuated parameter list in `#define'
* | | | | Export QClipData and QRasterBufferAnders Bakken2009-08-211-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | These classes are needed in QDirectFBPaintEngine. Reviewed-by: Donald Carr <donald.carr@nokia.com>
* | | | | Clean up surface creation code in dfbAnders Bakken2009-08-215-145/+66
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Don't try too hard to temporarily represent an image in a real directfb surface. It leads to all sorts of rendering issues. Reviewed-by: Donald Carr <donald.carr@nokia.com>
* | | | | Fix warning about unreferenced element.Alessandro Portale2009-08-211-3/+1
| | | | | | | | | | | | | | | | | | | | StationQuery::query is static. No need for StationQuery instance.
* | | | | Fix warning about unreferenced element.Alessandro Portale2009-08-211-2/+1
| | | | | | | | | | | | | | | | | | | | TimeQuery::query is static. No need for TimeQuery instance.
* | | | | Fix double to float truncation warning.Alessandro Portale2009-08-211-1/+1
| | | | |
* | | | | Merge branch 'master' of git@scm.dev.troll.no:qt/qtAlessandro Portale2009-08-212-1/+2
|\ \ \ \ \
| * | | | | Export QRasterizerAnders Bakken2009-08-211-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This is required for QDirectFBPaintEngine to link. Reviewed-by: Donald Carr <donald.carr@nokia.com>
| * | | | | CompileAnders Bakken2009-08-211-0/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Apparently QScopedPointer requires knowledge of the class it points to. Reviewed-by: Donald Carr <donald.carr@nokia.com>
* | | | | | Warning fix: mask_format = unreferenced parameterAlessandro Portale2009-08-211-0/+1
| | | | | |
* | | | | | "d->" is not used. Fix MSVC warning.Alessandro Portale2009-08-211-2/+0
| | | | | |
* | | | | | Fixed unreferenced variable warning in Release mode.Alessandro Portale2009-08-211-2/+1
| | | | | |
* | | | | | Fixed an MSVC 9.0 /2008 warningAlessandro Portale2009-08-211-5/+5
|/ / / / / | | | | | | | | | | | | | | | Reviewed-By: Harald Fernengel
* | | | | Fix obsolete license headers.Jason McDonald2009-08-2119-210/+551
| | | | | | | | | | | | | | | | | | | | Reviewed-by: Trust Me
* | | | | Add missing license headers and header guards.Jason McDonald2009-08-215-5/+199
| | | | | | | | | | | | | | | | | | | | Reviewed-by: Trust Me
* | | | | Fix obsolete license headers.Jason McDonald2009-08-2125-52/+52
| | | | | | | | | | | | | | | | | | | | Reviewed-by: Trust Me
* | | | | Merge branch 'master' of git@scm.dev.nokia.troll.no:qt/qtJason McDonald2009-08-2115-17/+23
|\ \ \ \ \
| * | | | | Using pnginfo and optipng to reduce file size (thus resources size).Alessandro Portale2009-08-2111-0/+0
| | | | | |
| * | | | | Remove the unnecessary double memcpy now too.Thiago Macieira2009-08-211-3/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The previous commit reintroduced memcpy in detach2(). So we don't need to do memcpy here. Re-add the memcpy when detach3() is introduced.
| * | | | | Don't access usedHashFunc() if it's already been deleted.Thiago Macieira2009-08-211-1/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Problem spotted in Designer: ==13197== Invalid read of size 4 ==13197== at 0x5C9AD2A: QHash<QString, QConfFile*>::isEmpty() const (qhash.h:283) ==13197== by 0x5C98142: QHash<QString, QConfFile*>::remove(QString const&) (qhash.h:769) ==13197== by 0x5C8C9FF: QConfFile::~QConfFile() (qsettings.cpp:226) ==13197== by 0x5C9238E: QConfFileSettingsPrivate::~QConfFileSettingsPrivate() (qsettings.cpp:1228) ==13197== by 0x5C9D7AA: QScopedPointerDeleter<QObjectData>::cleanup(QObjectData*) (qscopedpointer.h:62) ==13197== by 0x5CF11A4: QScopedPointer<QObjectData, QScopedPointerDeleter<QObjectData> >::~QScopedPointer() (qscopedpointer.h:100) ==13197== by 0x5CE9B46: QObject::~QObject() (qobject.cpp:992) ==13197== by 0x5C95C90: QSettings::~QSettings() (qsettings.cpp:2754) ==13197== by 0x5CC1FDC: LibraryData::~LibraryData() (qlibrary.cpp:428) ==13197== by 0x5CC2441: QGlobalStaticDeleter<LibraryData>::~QGlobalStaticDeleter() (qglobal.h:1767) ==13197== by 0x5FE16DE: __run_exit_handlers (exit.c:78) ==13197== by 0x5FE174E: exit (exit.c:100) ==13197== by 0x5FCBA3D: (below main) (libc-start.c:252) ==13197== Address 0x0 is not stack'd, malloc'd or (recently) free'd
| * | | | | Fix trivial QList detaching: QListData::detach2() *must* memcpy.Thiago Macieira2009-08-211-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Qt 4.5 did that and the node_copy function depended on it. I have some patches from Lars that introduce detach3() and try to improve performance a bit more.