summaryrefslogtreecommitdiffstats
path: root/src
Commit message (Collapse)AuthorAgeFilesLines
* Re-apply change 0f8bff1970d4b0f10e98ce7d6ab341620f4ce76b by Martin SmithMartin Smith2009-10-221-1/+1
| | | | doc: Changed Trolltech to Nokia
* Re-apply change 8e0fbc2caa3edefb78d6667721235b783bc1a850 by IainIain2009-10-221-0/+13
| | | | | | | | Temporary workaround to get WebKit to pick up DEF file from std location Tweak WebCore .pro file to get its DEF file from the same location as all the other DEF files come from Reviewed-by: TrustMe
* Re-apply change 6b8ac349b9a477863a8c8388dcc0658f3284bc54 by Jocelyn TurcotteJocelyn Turcotte2009-10-221-2/+6
| | | | | | | | | | | | | | Re-applying commit ee0a43fee20cc398b505eb65218ebed56dfc8f39 by Simon Hausmann Fix crash of QtScript on Mac OS X When compiling on 10.4 but running on 10.5 the flags passed to vm_map cause it to crash. For now fall back to the use of mmap() as allocator instead. Reviewed-by: Kent Hansen
* Updated WebKit from /home/jturcott/dev/webkit/ to ↵Jocelyn Turcotte2009-10-221270-11675/+33732
| | | | | | | qtwebkit-4.6-snapshot-22102009 ( 0639bb8e812c8923287cd5523248ca64fa5f7a50 ) Changes in WebKit/qt since the last update: Jocelyn: fatal error from script, sha1 in src/3rdparty/webkit/VERSION is bad
* Remove declaration of QDirectFBScreen::scrollAnders Bakken2009-10-221-1/+0
| | | | | | | | This function has been declared since the initial commit but was never actually implemented. The function exists in QDirectFBWindowSurface. Reviewed-by: Donald Carr <donald.carr@nokia.com>
* Compile fix.Denis Dzyubenko2009-10-221-4/+4
| | | | | | | QPanGesture was changed to use QPointF instead of QSizeF, also need to change all usages of the pan gesture. Reviewed-by: trustme
* QTextEdit: Fix the wrong order for call of Qt::WA_InputMethodEnabled in ↵Liang QI2009-10-221-1/+1
| | | | | | | | | setReadOnly. Should set Qt::WA_InputMethodEnabled after set the flags, just because shouldEnableInputMethod() will read the flags. Task-number: QTBUG-4917 Reviewed-by: Shane Kearns
* QHttp: Fix bug related to SSL and big POST dataMarkus Goetz2009-10-222-0/+31
| | | | | | | | QHttp is deprecated, but let's be nice and fix this. POST/PUT now properly works over HTTPS without buffering the whole data when it is not needed. Reviewed-by: Peter Hartmann
* QSslSocket: Trigger a SSL transmission when reading from the socket.Markus Goetz2009-10-223-0/+17
| | | | | | | | | In certain cases a SSL transfer stalled when a readBufferSize was set. This change triggers a SSL transmission when there is data on the socket waiting to be decrypted. Task-number: QTBUG-3860 Reviewed-by: Thiago
* Make warning more helpful.Thomas Zander2009-10-221-1/+1
| | | | Also fix grammer and avoid using combined words.
* Change API; the pan gesture now has points for distance, not size.Thomas Zander2009-10-224-24/+24
|
* Make the already-public calls be documented and publicThomas Zander2009-10-222-3/+2
|
* Implemented gesture event delivery and propagation inside QGraphicsView.Denis Dzyubenko2009-10-222-18/+236
| | | | Reviewed-by: Thomas Zander
* Added debug operator for QGraphicsObjectDenis Dzyubenko2009-10-222-0/+18
| | | | Reviewed-by: Alexis Menard
* Add QGestureEvent::mapToScene for better graphicsView integrationThomas Zander2009-10-223-0/+24
|
* Fix for the gestures autotest.Denis Dzyubenko2009-10-221-1/+2
| | | | Reviewed-by: trustme
* Improvements for gesture event deliveryDenis Dzyubenko2009-10-226-40/+92
| | | | | | | | | When delivering GestureOverride events by default both the event and individual gestures will be ignored. We also store the acceptance state of individual gesture in the event and not in the gesture object, along with its target. Reviewed-by: Thomas Zander
* Improving gesture event delivery for widgets.Denis Dzyubenko2009-10-224-81/+148
| | | | Reviewed-by: trustme
* Fixed gesture event delivery when several gestures are triggered.Denis Dzyubenko2009-10-222-23/+20
| | | | | | | | When there are two different gestures are being triggered and they are supposed to be sent to different widgets, don't stop event "propagation" when the first event is successfully delivered. Reviewed-by: trustme
* Improved gesture event filtering inside QGraphicsView for QGraphicObjectsDenis Dzyubenko2009-10-2212-130/+212
| | | | Reviewed-by: trustme
* Changed qsrand() behavior for Windows to match the linux versionninerider2009-10-221-5/+20
| | | | | | | | A problem occurred related to the createUUid function on Windows Mobile. Calling rand() before srand() resulted in identical pseudo random sequences for different threads. Reviewed-by: Joerg
* Use the qsreal type instead of double when working with QtScript numbersKent Hansen2009-10-224-7/+7
| | | | | | | | The idea is that qsreal can be typedef'ed to float on platforms where it's appropriate. Since the QScriptValue ctor takes a qsreal, we should not convert it to a double internally. Reviewed-by: Olivier Goffart
* Merge branch 'origin/4.6' into widgets-team/4.6Olivier Goffart2009-10-22124-3829/+7950
|\
| * QtScript: Compatibility with 4.5Olivier Goffart2009-10-221-0/+4
| | | | | | | | | | | | | | | | We must register the same type as they were registered in Qt 4.5 Reported on qt4-preview-feedback mailing list. Reviewed-by: Kent Hansen
| * Qt patches to libpng sources.aavit2009-10-221-2/+12
| | | | | | | | | | This commit is the combination of earlier Qt patches to libpng, reapplied here after the upgrade to 1.2.40.
| * Upgrade libpng to version 1.2.40aavit2009-10-2286-3626/+6428
| | | | | | | | | | This commit contains a clean copy of the libpng source distribution. The Qt patches will follow in a separate commit.
| * qfontengine_win.cpp: special Windows CE code removedJoerg Bornemann2009-10-221-75/+16
| | | | | | | | Reviewed-by: thartman
| * Fix a bug in QGraphicsRotation related to 2D projectionsRhys Weatherley2009-10-222-2/+4
| | | | | | | | | | | | | | The projection to 2D needs to be done when the rotation is applied, not after all transformations have been applied. Reviewed-by: trustme
| * Merge branch '4.6' of git@scm.dev.nokia.troll.no:qt/qt into 4.6Gunnar Sletta2009-10-2284-30806/+55398
| |\ | | | | | | | | | | | | Conflicts: src/gui/painting/qtextureglyphcache.cpp
| | * Merge branch '4.6' of git@scm.dev.nokia.troll.no:qt/qt into 4.6Kurt Korbatits2009-10-2222-30144/+54246
| | |\
| | | * Merge branch '4.6' of scm.dev.nokia.troll.no:qt/qt into 4.6Iain2009-10-2164-30780/+55188
| | | |\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: src/s60installs/eabi/QtGuiu.def src/s60installs/eabi/QtMultimediau.def src/s60installs/eabi/QtNetworku.def
| | | * | Update EABI DEF files for Symbian OSIain2009-10-205-10/+55
| | | | | | | | | | | | | | | | | | | | Reviewed-by: TrustMe
| | * | | Fixed clock() function return values in audio class's.Kurt Korbatits2009-10-224-4/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | clock() function should return microseconds, fixed example, alsa backend and win32 backend. Reviewed-by:Justin McPherson
| * | | | Properly detect font smoothing setting on Mac OS X in raster engineEskil Abrahamsen Blomfeldt2009-10-213-3/+18
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | We would assume font smoothing on the mac was always turned on, giving poor text rendering in the cases where it was not. This implementation mirrors querying the cleartype setting on Windows, checking the setting on application initialization and rendering into an 8 bit cache if it is turned off. Task-number: QTBUG-4881 Reviewed-by: Morten Johan Sørvig
| * | | | Fixed an assert when running the composition demo on Mac.Trond Kjernåsen2009-10-201-16/+19
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | We can't create a QGLWidget in the QGLEngineSelector, since it may be called before a QApplication object has been constructed. Reviewed-by: Kim
| * | | | Make sure QGLTextureCache exists when creating surfaces for pixmapsTom Cooksey2009-10-202-2/+8
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | QGLTextureCache installs pixmap cleanup hooks which are used to clean up the EGL surfaces. Reviewed-By: Trustme
| * | | | Add a new window surface which utilises QX11GLPixmapDataTom Cooksey2009-10-205-4/+239
| | | | | | | | | | | | | | | | | | | | | | | | | The new surface uses XCopyArea to post updates to the window and thus, supports partial updates.
| * | | | Fixed the SVG paint engine to preserve whitespace when drawing text.Kim Motoyoshi Kalland2009-10-201-0/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Added xml:space="preserve" to the output text tag. This attribute tells the SVG user agent not to strip away excess whitespace in the text element. Reviewed-by: Trond
| * | | | Fixed a stencil clearing bug in the GL 1 engine.Trond Kjernaasen2009-10-201-19/+21
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | If the system clip changed the stencil buffer wasn't necessarily updated correctly. Use a region to keep track of the dirty areas in the stencil buffer, like we do in the GL 2 engine. Reviewed-by: Samuel
| * | | | Fix build on desktop X11Tom Cooksey2009-10-202-3/+1
| | | | | | | | | | | | | | | | | | | | Hash-Define out X11GL pixmap data until the GLX implementation is ready.
| * | | | Use different GL contexts for ARGB & RGB pixmapsTom Cooksey2009-10-191-31/+100
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | On 16 bpp systems, RGB pixmaps are 16-bit whereas ARGB pixmaps are 32-bit. This means two different EGL configs are used which are incompatable with each other. As a result, we have to use 2 different EGL contexts - one for each config. Reviewed-By: Trustme
| * | | | Add an assert testing the cleanup hooks exist before executing themTom Cooksey2009-10-191-0/+1
| | | | | | | | | | | | | | | | | | | | Reviewed-By: TrustMe
| * | | | Add a new QX11GLPixmapData which renders to X pixmaps using GLTom Cooksey2009-10-199-5/+304
| | | | | | | | | | | | | | | | | | | | | | | | | Enable it by setting QT_USE_X11GL_PIXMAPS environment variable while using the -graphicssystem opengl
| * | | | Separate modification & destruction pixmap cleanup hooksTom Cooksey2009-10-195-19/+67
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Before the QExplicitlySharedDataPointer change, the ref-count was 0 when calling the cleanup hooks from ~QPixmap. That enabled the hook to figure out if the pixmap is being modified or deleted. As the ref count is now 1 when calling the cleanup hooks in ~QPixmap, we need to seperate the hooks. This change should make using textre-from-pixmap faster as the EGL/glX surface wont get re-created everytime the pixmap is modified. Reviewed-By: Gunnar
| * | | | Stop QEglContext destroying contexts it doesn't ownTom Cooksey2009-10-192-2/+4
| | | | | | | | | | | | | | | | | | | | Reviewed-By: Rhys Weatherley
| * | | | Integrated new triangulating stroker into QtGunnar Sletta2009-10-195-54/+730
| | | | |
| * | | | Fixed slow QPixmap::fill() when the pixmap is sharing data.Kim Motoyoshi Kalland2009-10-191-1/+11
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | If the pixmap is sharing data with other pixmaps, it must be detached before it is filled. Instead of detaching by making a copy, create a new uninitialized data object since all pixels are overwritten by fill() anyway. Task-number: QTBUG-3228 Reviewed-by: Trond
* | | | | Fixed crash in tst_qabstractitemview.Gabriel de Dietrich2009-10-211-3/+11
| | | | | | | | | | | | | | | | | | | | Reviewed-by: trust-me
* | | | | The QMenuPrivate::activationRecursionGuard has to be a boolean.Marius Bugge Monsen2009-10-211-1/+1
| | | | | | | | | | | | | | | | | | | | Reviewed-by: Trust Me
* | | | | Make QMenu::activateCausedStack() exception safe.Marius Bugge Monsen2009-10-211-3/+11
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Use an internal class to reset the activationRecursionGuard when the scope is closed. Reviewed-by: Leo Cunha