summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Unfreeze the DEF files for now.Jason Barron2009-08-241-1/+2
| | | | | | | | | Currently the private-but-exported API of Qt is still quite unstable and this is causing problems in the link step since the libraries will not link. The temporary solution is to unfreeze the symbols until we can find a better way to update the symbols. Task-number: Iain
* s/hasAlpha/hasAlphaChannel/gAnders Bakken2009-08-243-7/+7
| | | | | | Make it more consistent. Reviewed-by: TrustMe
* pass engine pointer to QScriptValuePrivateKent Hansen2009-08-243-34/+19
| | | | Just a little cleanup.
* Add missing file in priAlexis Menard2009-08-241-0/+1
| | | | Reviewed-by:TrustMe
* Don't float objects into next page unless they can fit in itEskil Abrahamsen Blomfeldt2009-08-242-1/+34
| | | | | | | | | | | | | | | | | | | If you had a floating table which spanned over several pages, this would always float down to the next page, even when it was the only element in the document. The main reason why this mechanism was added to positionFloat() was to handle floating images, since they can't be broken down into more than one page. Tables, however, have logic to ensure they are broken into several pages if they are too large for the current page. There is however no reason to float an object into the next page if it is larger than that page. Since the size of tables are altered by their position as long as they span more than one page, we need to set the sizeDirty flag for floating tables when positioning and then relayout the frame to make sure the page breaks are set correctly. Task-number: 240086 Reviewed-by: Simon Hausmann
* handle memory management of QScriptValuePrivate in engine if possibleKent Hansen2009-08-244-17/+61
| | | | | | | | | Avoid calling malloc() and free() so often. The premise is that QScriptValue is usually a short-lived type, and only a few QScriptValues exist at a time, so if we cache privates in the engine, QScriptValues will be much faster to create and destroy. Reviewed-by: Olivier Goffart
* Windows compile fix for code that needs WINVER > 0x500Joerg Bornemann2009-08-242-4/+9
| | | | | | This is premature and is about to change, probably. Reviewed-by: thierry
* Remove warningJan-Arve Sæther2009-08-241-2/+1
|
* QAbstractSocket: Also check for HostLookupStateMarkus Goetz2009-08-241-2/+3
| | | | | | | connectToHostImplementation should also not be called while another lookup (= connect) is in progress. Reviewed-by: Thiago
* Fix include guard and simplify compiler workaround.Frans Englich2009-08-242-10/+6
| | | | Addresses S60 review comment.
* Merge branch '4.6' of git@scm.dev.nokia.troll.no:qt/qt into 4.6Markus Goetz2009-08-2411-96/+44
|\
| * Minor documentation and code fixes.Frans Englich2009-08-241-2/+4
| | | | | | | | | | | | Addresses S60 review comments. Reviewed-by: TrustMe
| * Remove dead code.Frans Englich2009-08-241-3/+1
| | | | | | | | Addresses review comment.
| * Phonon/ds9: refactor to prepare some improvements in the usage of mutexThierry Bastian2009-08-246-86/+35
| |
| * fix memory leakKent Hansen2009-08-241-1/+0
| | | | | | | | | | | | Introduced in commit 38e0c07a78fb585e23c4ff8947be737a28b2257c Reviewed-by: Olivier Goffart
| * Fix QPlainTextEdit painting errorsmae2009-08-241-2/+3
| | | | | | | | | | | | | | | | With line wrapping enabled and very large text blocks, painting errors could occur. Reviewed-by: hjk (cherry picked from commit 82dba1d346a6f4a5d2602d930e0aed75c13bcafb)
| * Compile after a41d614eb8afd7c1c5b95b8ac34335fc0aaf0a18Eskil Abrahamsen Blomfeldt2009-08-241-2/+1
| | | | | | | | | | | | | | | | | | | | Change a41d614 sets _WIN32_WINNT to 0x500, which will cause FAPPCOMMAND_MOUSE to be defined in the PlatformSDK, but not APPCOMMAND_MICROPHONE_VOLUME_MUTE (which requires 0x501 for the version.) The check for APPCOMMAND_MICROPHONE_VOLUME_MUTE would thus be #ifdef'd out and compilation would fail. Reviewed-by: Thierry
* | Examples: Warn about usage of QHttpMarkus Goetz2009-08-243-0/+3
|/ | | | | | | This is an intermediate solution until the examples have been ported to using QNetworkAccessManager. Reviewed-by: TrustMe
* Remove another occurence of QScopedSharedPointerHarald Fernengel2009-08-241-20/+23
| | | | | | Replace with QExplicitlySharedDataPointer Reviewed-by: Thiago
* Fixed SVG stroke attributes to work with 'use' tags.Kim Motoyoshi Kalland2009-08-248-313/+434
| | | | | | | | In the process of rewriting the stroke handling code, I also fixed gradients on strokes. Task-number: 202426, 250618 Reviewed-by: Trond
* Added autotest for SVG 'use' elements.Suneel BS2009-08-241-0/+102
| | | | Reviewed-by: Kim
* Fix double to float truncation warning.Alessandro Portale2009-08-241-1/+1
|
* avoid calling QScriptValue::isFunction() inside call() and construct()Kent Hansen2009-08-242-16/+40
| | | | | | | Avoid calling virtual function JSC::JSValue::get{Call,Construct}Data() twice. Reviewed-by: Olivier Goffart
* Removed unused header for the WinCE and Windows platforms.Trond Kjernåsen2009-08-241-1/+0
| | | | | | | This should make it possible to build binaries for Windows desktop again. Reviewed-by: Thomas Hartmann
* fix warning in qthread_win.cppJoerg Bornemann2009-08-241-4/+0
| | | | _WIN32_WINNT is now defined in qglobal.h
* QFSFileEngine compile fix for NTFS symlink supportJoerg Bornemann2009-08-241-5/+8
| | | | | | | | This also reverts my panic compile fixes, which just disabled the symlink code paths on Windows. This reverts commit e5fe8b49b08a6e749bde8581d9267ddafa7c9990. This reverts commit 7385c1fc7fe03836ed42cc783e840557d267cff9.
* define WINVER and _WIN32_WINNT in qglobal.hJoerg Bornemann2009-08-241-0/+9
| | | | | | | We define these values now in qglobal.h as 0x0500, which is Windows 2k, the oldest version we will support. Reviewed-by: mariusSO
* use QVarLengthArray instead of QVector for holding JS argumentsKent Hansen2009-08-242-6/+4
| | | | | | It's faster. Reviewed-by: Olivier Goffart
* Designer: Disable the Button group property editor for good.Friedemann Kleint2009-08-241-1/+1
|
* 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
| | |\