summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Removed README.s60-mkspec.axis2010-07-161-99/+0
| | | | | The instructions are old, and should now be found in the qdoc docs. (cherry picked from commit dcfa4125625c028165c424b5d95cb0795194d6f2)
* Fixed install docs for Qt for Symbian on Linux.axis2010-07-161-1/+1
| | | | (cherry picked from commit 920980c77269325cc94efd2ff10347bd2745736d)
* Compile with QT_NO_DEBUG_STREAMOlivier Goffart2010-07-164-6/+8
| | | | | Task-number: QTBUG-11510 (cherry picked from commit 4e2eb2945dbc3865e2901f12d663ed89e8f0dfbf)
* Work around memory leak issue in grid and linear layouts.Andreas Aardal Hanssen2010-07-164-8/+20
| | | | | | | | | | | | | | | These classes create a new QWidget and assign it to a static pointer which is never cleaned up. Using Q_GLOBAL_STATIC ensures that they are deleted on library unload. This is really just a cosmetic change that removes a leak warning - the real fix should be to find a way to not use a new QWidget like this. It seems odd that QGraphicsLayouts, which don't use QWidget in any other way, should depend on QWidget like this. Task-number: QTBUG-10768 Merge-request: 741 Reviewed-by: Jan-Arve Sæther <jan-arve.saether@nokia.com> (cherry picked from commit ea6a5146397b668bf535ee7249bd4262d6185234)
* Performance docs.Michael Brasser2010-07-151-0/+21
| | | | (cherry picked from commit adbdb6c4b52d72e77d1cb4ff23573e957a7c9e14)
* Added symbian defs for e55781212532e2abcdd1cef8548b146fb14f0713Lasse Holmstedt2010-07-152-0/+2
| | | | | | Reviewed-by: Jason McDonald Submitted-by: Alessandro Portale (cherry picked from commit 9c68bdf3ed66564bce3064a49ca80b7889c35952)
* Resetting bindings through debugger interfaceLasse Holmstedt2010-07-154-0/+44
| | | | | Reviewed-by: Aaron Kennedy (cherry picked from commit e55781212532e2abcdd1cef8548b146fb14f0713)
* Distinguish Qt Quick, Qt Declarative and QML on the landing pageAlan Alpert2010-07-151-2/+4
| | | | | Task-number: QTBUG-11916 (cherry picked from commit d7a1e01e9970bef56f647873bb2a3496893b775a)
* Clean up particle motion documentationAlan Alpert2010-07-151-3/+16
| | | | | Task-number: QTBUG-11917 (cherry picked from commit 2d4876330e292253a9133b0197e573097ecfa5bb)
* Finish QML for Qt Programmers sectionAlan Alpert2010-07-151-2/+10
| | | | | | | | | I don't think I kept the same style as the rest of the section, so this may need to be refactored a little. But it's not incomplete anymore, content-wise. Task-number: QTBUG-11918 (cherry picked from commit 2ba0dfd82a3d82e98a70aeda3b142e0a870eeb0d)
* Fixes crash in QGraphicsScene::addItem().Yoann Lopes2010-07-152-2/+22
| | | | | | | | | | | | | | Crashed because tabFocusFirst could end up being a dangling pointer when removing an item from the scene before deleting it. When setting tabFocusFirst in fixFocusChainBeforeReparenting, we now check that the item is in the scene. If it is not, tabFocusFirst is set to 0. Autotest included. Task-number: QTBUG-12056 Reviewed-by: Alexis Ménard <alexis.menard@nokia.com> (cherry picked from commit 7d09f690d5b4c56699092444665d1879deb86a6e)
* Fixes QGraphicsItem::focusItem() returning incorrect value.Yoann Lopes2010-07-152-2/+31
| | | | | | | | | | | | | When setting focus on an item, subfocus chain was previously updated only for items with a common ancestor. We now make sure that this chain is updated also for the previously focused item (possibly not sharing any common ancestor with the newly focused item). Autotest included. Task-number: QTBUG-12112 Reviewed-by: Alexis Ménard <alexis.menard@nokia.com> (cherry picked from commit b5b011a181bd187dcef5ee8f46a3ac2c5dc2e09c)
* Position GridView and ListView footer correctly when model cleared.Martin Jones2010-07-156-3/+144
| | | | | Task-number: QTBUG-12167 (cherry picked from commit 9adc85fdfa0af2b6948408932188ee1b79247fa6)
* Ensure the section header isn't shown twice.Martin Jones2010-07-141-1/+6
| | | | | | | Happened when currentItem was on a section boundary. Task-number: QTBUG-12089 (cherry picked from commit 181749ff7dcfbeb5eb64026e80353f27013af833)
* Only support portrait and landscape orientations on Symbian when updating ↵Joona Petrell2010-07-143-18/+6
| | | | | | | | the runtime.orientation property Task-number: QTBUG-12036 Reviewed-by: Martin Jones (cherry picked from commit cb6472cb67511316f058b1eda4ffe71a1c4fe019)
* Add Symbian support for runtime.orientation propertyJoona Petrell2010-07-146-9/+205
| | | | | | Task-number: Reviewed-by: Martin Jones (cherry picked from commit af5fc41e27f068604453a927cac4d81886d1987e)
* Export QDeclarativePixmapMartin Jones2010-07-141-1/+1
| | | | But its still a private class.
* Make Text, TextInput, and TextEdit all have the same size for the same text.Warwick Allison2010-07-136-25/+33
| | | | | | | | | | | | | This may mean that the cursor is to the right of the width, so components should cater for that with a margin if they are boxed / clipped. TextInput used to try to account for right bearing (and left bearing incorrectly since it added it on the right). This is removed. Potentially this means that for some fonts the text repaints incorrectly on the left or right, but if that is the case Text and TextEdit already had such a problem (undetected), and all will need fixing. Task-number: QTBUG-11983 (cherry picked from commit 628159323c60c434a202b036ecbaf5e433c703e8)
* Don't double delete cancelled pixmap cache requestsAaron Kennedy2010-07-131-3/+9
| | | | | QTBUG-11954 (cherry picked from commit cec6d01d17e39af6e8a139156a3b51fd45558a50)
* Fix inconsistent reporting of module import errors when using versions.Warwick Allison2010-07-137-8/+37
| | | | | Task-number: QTBUG-11936 (cherry picked from commit cabdb16f5ea6458dec9a2ec3b70a01e498b27dbc)
* Fix TextInput selectionColor or selectedTextColor -based animationsJoona Petrell2010-07-131-0/+4
| | | | | | Task-number: QTBUG-12115 Reviewed-by: Martin Jones (cherry picked from commit 400b0d43830dfdcefb2f8bd91440ab6f4130ce0f)
* Update QtDeclarative def filesJoona Petrell2010-07-132-2/+17
| | | | (cherry picked from commit abd49d1d146b73a124b5e650f1b254da992ed3a4)
* Convert QtDeclarative def files to use LF line endingsJoona Petrell2010-07-132-3372/+3372
| | | | (cherry picked from commit 7e35c6ff442e237ff9a1bec9ea1cdfb597d9ceae)
* Update QtDeclarative def filesJoona Petrell2010-07-132-66/+131
| | | | (cherry picked from commit 23ef32dc0972d027617e5052192d1a17ba424f66)
* Added QDeclarativeSpringAnimationmae2010-07-1310-17/+622
| | | | | | | | | | | | | | The QDeclarativeSpringAnimation is a replacement for QDeclarativeSpringFollow. The idea is to remove the Follows quickly. Follows used to have an inSync property. In order to provide an alternative mechanism, the commit also fixes the running property for animations which are controlled by a behavior. Previously running would always return false and never change. Now running does change and indicates that the animation is running indeed. (cherry picked from commit cb406a116bf2237c743ac05882fb06927c70359c)
* Add copy(), cut() and paste() support to TextInputJoona Petrell2010-07-135-1/+117
| | | | | | Task-number: QTBUG-12086 Reviewed-by: Michael Brasser (cherry picked from commit 0fdf5122c72eb86d49cba2b69f80d3a9c5949da6)
* Remove deprecated Flickable.flickDirectionMartin Jones2010-07-133-16/+1
| | | | (cherry picked from commit e3bc34b40559e0cb88363039ee61300478e7c700)
* Update QmlChanges.txtBea Lam2010-07-131-0/+4
| | | | (cherry picked from commit c3ee63fd9a1428718ca2f2a32e81a3f977878fad)
* Remove Image::pixmap property. QML applications should useBea Lam2010-07-134-45/+5
| | | | | | | QDeclarativeImageProvider to provide pixmaps instead. Task-number: QTBUG-11980 (cherry picked from commit 33b664eabe5d9621d71e5bf3bfcc46ea385a399c)
* Extend QDeclarativeImageProvider to support QPixmap loading andBea Lam2010-07-1314-147/+473
| | | | | | | | | | | synchronous loading of QImages. (QPixmaps can only be created in the main thread so they will always be loaded synchronously). This changes request() to requestImage() and adds requestPixmap() for pixmap support. Task-number: QTBUG-11989 (cherry picked from commit a258456bcb35ec4211751a702ea94a1881d82a07)
* Make declarative pixmap cache easier to useAaron Kennedy2010-07-1312-733/+930
| | | | | | | | | | | | | | | | | | The QDeclarativePixmapCache was both slow, and very trickey to use correctly. Many QML elements did not correctly cancel outstanding requests, which leads to pixmaps leaking indefinately. Other elements, such as Text, were subject to race conditions that meant they may never actually load all their images. QDeclarativePixmap is a single class than encapsulates the action of fetching a pixmap, as well as the pixmap itself and the responsibility of canceling outstanding requests. Rather than relying on Qt's pixmap cache that doesn't cache all the information QML needs, QDeclarativePixmap implements its own cache, that correctly degrades over time (unlike QPixmapCache that can stop expiring items in some conditions). Reviewed-by: Warwick Allison (cherry picked from commit 09f07b98dfdaec2e48749768b967a48e588d3f7f)
* Allow the debugger to modify method bodiesAaron Kennedy2010-07-137-39/+160
| | | | | QTBUG-11933 (cherry picked from commit 76a1804b0fff9ffd092a551defe448d3e9d4346e)
* Fix qdoc error.Jason McDonald2010-07-131-2/+2
| | | | | | Task-number: QTBUG-12078 Reviewed-By: Trust Me (cherry picked from commit e45b8dceca9c424815c6b08355a95cb34382186c)
* Doc: Removed links to Qt3 support in QHostAddressGeir Vattekar2010-07-131-5/+7
| | | | | Task-number: QTBUG-12004 (cherry picked from commit 10039e4b5bb80e5a9705126e7c62c588039acde6)
* Quiet qmake warnings during configure.Aaron McCarthy2010-07-132-17/+21
| | | | | | | | | Configure runs qmake on all .pro files in the source tree. Wrapping symbian only code in symbian scopes prevents warnings about unset EPOCROOT on other platforms. Task-number: QTBUG-11996 (cherry picked from commit 054049046e89d6e18d800f4728d4927354b640c6)
* Don't crash if drag.target has no parentItemMartin Jones2010-07-131-2/+2
| | | | | Task-number: QTBUG-11986 (cherry picked from commit 44d78dca77b8a5f4f0d1bb67e84c21a4c57345b6)
* Fix TextEdit with no color property defined is drawn with wrong colorJoona Petrell2010-07-132-0/+27
| | | | | | Task-number: QTBUG-11932 Reviewed-by: Martin Jones (cherry picked from commit 5500ffeeaee3412272f0f4af844fbc1d4d78a3bb)
* qmlviewer: Update the proxy factory when the user changes the proxy.Martin Jones2010-07-131-42/+62
| | | | | Task-number: QTBUG-11856 (cherry picked from commit 953142469cd49fd2f5180a60dcaa7d2029457401)
* Fix TextInput text getting improperly clippedJoona Petrell2010-07-139-22/+110
| | | | | | Task-number: QTBUG-11790 Reviewed-by: Martin Jones (cherry picked from commit 37792d20eeef870a0d695fc15bc943f20275be9a)
* Calling setMinimumSize(0, 0) on a top-level window sometimes triggers a bugRobert Griebl2010-07-133-50/+40
| | | | | | | | | | | in the Compiz window manager which leads to the QML viewer mainwindow not being composited anymore (at least until the next resize). Since we need to somehow switch between fixed size and freely resizable views, we have to work around that bug using the layout constraint hints. Task-number: QTBUG-11771 Reviewed-by: kkoehne (cherry picked from commit 07321dfceed41c1851781841e03c4148da47e41e)
* Changing currentIndex shouldn't cancel a flick unnecessarily.Martin Jones2010-07-132-24/+45
| | | | | | | | If the new currentIndex is in view, then there is no need to cancel a flick that is in progress. Task-number: QTBUG-11405 (cherry picked from commit c09f58965e772064ca952892f2e7969082f03855)
* Fix input methods for TextInput elements with key handlersJoona Petrell2010-07-133-8/+23
| | | | | | Task-number: QTBUG-10297 Reviewed-by: Martin Jones (cherry picked from commit 98bfc8b8db811eb902290dbe87660ce799a44c27)
* Fix text drawing into alpha pixmap with opengl engineEskil Abrahamsen Blomfeldt2010-07-122-6/+0
| | | | | | | | | | | | | | The merge 03dc74984749adf5b11482bf871a47086217845c mistakenly merged the glyphMargin() (which had been removed in 4.7 because QGLTextureGlyphCache now inherits from the image glyph cache) with the glyphPadding() which had been introduced in separate commits in both branches (probably backported.) This broke text drawing into a pixmap with an alpha with the GL engine, because we'd assume a margin of 1, but the alphaMapForGlyph() function doesn't support margins. Task-number: QTBUG-11987 Reviewed-by: Gunnar (cherry picked from commit 4e915e3942c1523ffdda01e36c019f842062b794)
* Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-s60-public into ↵Qt Continuous Integration System2010-07-0819-31/+107
|\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | 4.7-integration * '4.7' of scm.dev.nokia.troll.no:qt/qt-s60-public: Use lower case for including system header files Added trace statements to Phonon MMF backend MMF Phonon backend: call winId() from VideoWidget constructor Fixed crash which occurs when switching between video clips Close media clip before creating new player object Enable bufferStatus signal during video clip loading on NGA platforms Prevent crash when video is played without a VideoWidget Add partial update deployment rules to QtNetwork Fix crash when handleCommand() called before softkeys are updated
| * Use lower case for including system header filesGareth Stockwell2010-07-076-6/+6
| | | | | | | | | | | | | | | | | | | | | | All platform includes are now lower case, i.e. '#include <foobar.h>' rather than '#include <FooBar.h>'. Note that Qt includes are still camel case, e.g. '#include <QtGui/QWidget>' Task-number: QTBUG-6528 Reviewed-by: trustme
| * Added trace statements to Phonon MMF backendGareth Stockwell2010-07-071-0/+17
| | | | | | | | Reviewed-by: trustme
| * MMF Phonon backend: call winId() from VideoWidget constructorGareth Stockwell2010-07-072-4/+2
| | | | | | | | | | | | | | | | This is to be consistent with the backends for other platforms, which also call QWidget::winId() on the VideoWidget (or one of its children) during construction. Reviewed-by: Thierry Bastian
| * Fixed crash which occurs when switching between video clipsGareth Stockwell2010-07-072-13/+32
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | When Phonon::MediaObject::setCurrentSource() is called when the MediaObject is connected to a Phonon::VideoWidget, the MMF::AbstractVideoOutput pointer is propagated inside the backend from the first MMF::AbstractVideoPlayer to the second. If the VideoWidget is subsquently re-sized, the code path enters the ScaleFactors branch of the MMF::SurfaceVideoPlayer::handleParametersChanged function. At this point, m_displayWindow is still set to the inital null value, and the assertion therefore fails. This change ensures that m_displayWindow is updated before attempting to apply the scale factor change. Task-number: QTBUG-11377 Reviewed-by: Thierry Bastian
| * Close media clip before creating new player objectGareth Stockwell2010-07-075-1/+9
| | | | | | | | | | | | | | | | | | | | Failure to Close() an existing MMF player utility object before creating a new one - which happens in the MMF backend's implementation of Phonon::MediaObject::setCurrentSource() - causes intialization of the newly-created utility to fail later on. Task-number: QTBUG-11377 Reviewed-by: Thierry Bastian
| * Enable bufferStatus signal during video clip loading on NGA platformsGareth Stockwell2010-07-072-2/+2
| | | | | | | | | | | | | | | | CVideoPlayerUtility::RegisterForVideoLoadingNotification() was only called in the DSA, not the NGA, variant of the Phonon MMF backend. Task-number: QTBUG-11378 Reviewed-by: Thierry Bastian