summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Order network configurations in service networks in priority order.Aaron McCarthy2010-07-293-46/+59
| | | | | | | | | It is useful to know the priority order of the sub configurations of a service network. Task-number: QTBUG-11678 RevBy: juhvu <qt-info@nokia.com> (cherry picked from commit 959efa8daab2715d18440ed8b890b9dd2b501fc7)
* Fix compilation error on Symbian^4.Aaron McCarthy2010-07-293-12/+12
| | | | | | The root cause is failing compilation test for SNAP when it shouldn't, but it should still not result in compilation errors in code. (cherry picked from commit 6ca74af0121f6038a20bca363deaf5c3e2d760f9)
* Fix detection of OCC functionality.Aaron McCarthy2010-07-291-1/+1
| | | | (cherry picked from commit ce7ccc93275043a41648a8887525be92420c3acb)
* Cherry pick fix for MOBILITY-1194 from Qt Mobility.Aaron McCarthy2010-07-296-53/+104
| | | | | 2f582953ecfc53f217317f58e4fc75b5b51a1126 (cherry picked from commit 34691d27d03abc0c8f940b4a0a3cda4cd308642e)
* Cherry pick fix for MOBILITY-1077 from Qt Mobility.Aaron McCarthy2010-07-292-4/+13
| | | | | | 7ef45318255c5cf1f10508753c9a2c55fc2cb8c0 321bd8b7b54e34a983b1ba142af836cf3e153a66 (cherry picked from commit c16f0a839743af36b36aea9c35f0d5ddfda3d6ac)
* Fix typo in docs.Aaron McCarthy2010-07-291-1/+1
| | | | (cherry picked from commit e9e0a82b1a5a71cefdd1711c51b786088b40bafd)
* Cherry pick fix for MOBILITY-1145 from Qt Mobility.Aaron McCarthy2010-07-291-1/+3
| | | | | f17d8a5dbef076046ff504fecb1fd445c9b785ac (cherry picked from commit 0664d3ad029b4d80d9ffac75f4f1c6c47bac2641)
* Cherry pick fix for MOBILITY-1144 from Qt Mobility.Aaron McCarthy2010-07-291-2/+15
| | | | | 426ff79e49d4abb659167541bb67846443b9707e (cherry picked from commit a0ae434a452deea022e3b7117e946e95542aa884)
* Revert "Add the chart utility from qtestlib-tools."Rohan McGovern2010-07-2914-1533/+2
| | | | | | | | This reverts commit 453abe70fec02456aba2219025f5202060eaece1. Task-number: QT-3583 Reviewed-by: Jason McDonald
* Revert the change in applicationShouldTerminate().Fabien Freling2010-07-281-1/+0
| | | | | | | | | | | It used to fix an issue during logout but it seems to be fine now. Related issue: QTBUG-6296 Task-number: QTBUG-10993 Reviewed-by: Morten Sorvig (cherry picked from commit 4942890f85e5fa74bf8c37cf7f53f6f3eaf40596)
* Document 'this' as undefined in QMLMartin Jones2010-07-281-0/+25
| | | | | | Task-number: QTBUG-12396 Reviewed-by: Aaron Kennedy (cherry picked from commit b4b0bdda668e9845623995c788d88a774dd52d98)
* Check the gesturemanager pointer before accessing it.Denis Dzyubenko2010-07-283-9/+12
| | | | | | | | | This fixes a crash when a static QWidget is destroyed after the QApplication object. Task-number: QTBUG-12025 Reviewed-by: Zeno Albisser (cherry picked from commit 475a3c275ba173cb130a838b6053cb45d405887e)
* Fixed plugin build key for Symbian builds under Linux.axis2010-07-281-1/+11
| | | | | | Task: QTBUG-8962 RevBy: Jason Barron (cherry picked from commit 71df0ad5c02365e3baf8f6996d4b258f5da52a2f)
* Q_INVOKABLES added to Qt-DBusEvan Nguyen2010-07-285-20/+153
| | | | | Task-number: QTBUG-12397 (cherry picked from commit 3e8597ff6029d33d629191370d9fed7d37d3962a)
* fixed QDBUS export errorEvan Nguyen2010-07-281-1/+1
| | | | (cherry picked from commit 430243688f6cc84da496c3369bfeb1a8685f1016)
* Fix signal emission of QDesktopWidget on Symbian.Jason Barron2010-07-281-6/+16
| | | | | | | | | | | | | | | | | | | QDesktopWidget on Symbian was not properly emitting the resized() and the workAreaResized() signals. Qt was properly translating the system event and sending the QResizeEvent to the widget, but the signal emission is determined solely based on changes in the QVectors of QRects outlining the screen dimensions. On Symbian, these vectors were never being set and as a result the signals were never omitted. The fix is to set the rects correctly in the init() function which is called by the resizeEvent() handler. Also modify the accessor functions to return the rectangles stored in the vector instead of querying for them each time. Task-number: QTBUG-11433 Reviewed-by: axis Autotest: PASSES (cherry picked from commit 61908af46700c7c1f2e59ce98daeadc2529fef1b)
* Modified Symbian def files to be in line with 4.7 branchToby Tomkins2010-07-282-0/+8
| | | | Reviewed-by: Joona Petrell
* Fixed a network hanging bug on Symbian.axis2010-07-271-9/+8
| | | | | | | | | | | | | | | | | | | | | | | The problem happened because of a race condition in the way Qt cancelled the select call from Open C. Under high network loads, a network request could come in, causing the select call to end. Afterwards, the pipe normally used to cancel the select call would be emptied (although it was already empty). If a context switch happened after the pipe was emptied, but before the lock was released in waitCond.wait(), the main thread could try to grab the lock and write to the pipe because it was unsuccessful. This would in turn cause the next call to select to terminate immediately, and without work to do, the select thread would go straight down to waitCond.wait() and get stuck there. Fixed by moving the pipe draining loop from the select thread to the main thread, right after the lock grab. This guarantees that the select thread is empty when returning to the select call. Task: QT-3358 AutoTest: Passed RevBy: Markus Goetz (cherry picked from commit 61daa2f419696881ccdbc1cde2dc197eaf028ff6)
* Added some asserts to avoid race conditions in networking.axis2010-07-271-0/+6
| | | | | | Task: QT-3358 RevBy: Markus Goetz (cherry picked from commit c042003a831ace1ffe4cc399668293200ffe829f)
* Fixed a possible hanging bug in the Symbian networking.axis2010-07-271-1/+2
| | | | | | | | | | | | | | | | | | | | | I haven't seen the bug happening in practice, but I decided to be safe rather than sorry. The rationale is that if a network request comes in, the select thread will signal the active object in the main thread, remove the socket from the set of monitored sockets, and then go to sleep in the waitCond.wait() call, waiting for reactivation by the QSelectMutexGrabber. However, in QEventDispatcherSymbian::socketFired(), if the event causes the socket to be deleted, reactivateSocketNotifier will never be called, and therefore the wait condition will never be terminated. Fixed by only entering the wait condition if a grabber has already written to the pipe, signalling that it wants the lock. AutoTest: Passed RevBy: Markus Goetz (cherry picked from commit fc260f7ce9c139da93e005b2b51ef37c4d23998d)
* Missed some tutorial files because of .gitignore.Toby Tomkins2010-07-2735-0/+1849
| | | | Reviewed-by: Martin Jones
* Copied Qt QML 4.7 branch to release.Toby Tomkins2010-07-27155-2619/+1912
| | | | Reviewed-by: MArtin Jones
* Fixed a parsing error during sis and runonphone target creation.axis2010-07-272-2/+2
| | | | | RevBy: Trust me (cherry picked from commit ebe6a5238947c30a613b61b521cb0d094efa2d02)
* rebuild configure.exeJoerg Bornemann2010-07-271-0/+0
| | | | (cherry picked from commit 9c2b396b2b1fefc10b0ff24c9e33b41278c84ca8)
* QGLBuffer::bind()/release() should not be const functions.Trond Kjernåsen2010-07-272-4/+4
| | | | | | | | | This is more or less the same as in the QGLFramebufferObject::bind()/release() case. Task-number: QTBUG-12319 Reviewed-by: Kim (cherry picked from commit 3a08c5b1682e211bf664c21850187e2b15e89c23)
* Do check after all if we have partialUpdateSupport.Michael Dominic K2010-07-271-4/+3
| | | | | | | Task-number: QTBUG-12266 Merge-request: 752 Reviewed-by: Trond (cherry picked from commit d6203cfeb0e096575c1fc0254dddc07a3d65d24c)
* Fix QLineEdit's Highlight color when inactive.Pierre Rossi2010-07-273-2/+29
| | | | | | | | | This commit also updates QPalette's documentation regarding the current ColorGroup and operator==. Task-number: QTBUG-697 Reviewed-by: ogoffart (cherry picked from commit 24cdab32de2abd8669f281dd54c8da1124514915)
* Remove QDeclarativeItem::childrenChanged() signal overloadMartin Jones2010-07-264-3/+7
| | | | | | | | Broke signal handlers in QML Task-number: QTBUG-12335 Reviewed-by: Aaron Kennedy (cherry picked from commit ddb5e1eef379c7f32a594d91b00ff3514c46b62a)
* QML focus API updates.Michael Brasser2010-07-2632-246/+330
| | | | | | | | | | The wantsFocus property has been renamed to activeFocus, to better reflect its value. Reading and writing the focus property is also now consistent -- this property represents focus within a scope. Other small changes were made to keep things consistent with the new naming. Reviewed-by: Aaron Kennedy (cherry picked from commit 21806ff0921641b4e4d9d39721ab4ebeae74dddc)
* wantsFocus should be based on FocusScope chain, not parent chain.Michael Brasser2010-07-268-15/+62
| | | | | | | | | Ancestors of the item with focus should only report wantsFocus as true when they are a FocusScope or a top-level item. Reviewed-by: Aaron Kennedy Reviewed-by: Yann Bodson (cherry picked from commit 686fca1c78e6d4d2ba597dd75d982c76647c7707)
* Allow MouseArea dragging to filter mouse events from descendantsMartin Jones2010-07-266-6/+189
| | | | | | | | | This allows dragging a MouseArea that contains a clickable MouseArea, for example. Task-number: QTBUG-12323 Reviewed-by: Michael Brasser (cherry picked from commit 5dd0dfcd7a079065f99c6149c15b58e69f302729)
* Compile: include <float.h> for usage of FLT_MAX.Michael Brasser2010-07-262-8/+2
| | | | (cherry picked from commit b325c90e5a0e5088aa8723d943f4c38b14048bd7)
* Restore the FLT_MAX define.Martin Jones2010-07-262-0/+8
| | | | | Seems some platforms don't have it. (cherry picked from commit 7725da34a828df00feb289515c11fa8aea1a55d8)
* Better defaults for MouseArea's drag.Michael Brasser2010-07-262-5/+3
| | | | | | | | | | | Allow essentially unbounded dragging once drag.target is set. The previous default of contraining the dragging to 0,0 (i.e. no drag) was unintuitive for learners. It's rare that unbounded is actually what you want, but it makes it much easier to get started with the element. Task-number: QTBUG-11184 Reviewed-by: Martin Jones (cherry picked from commit b2f90dedbeac285338af07fbffaec97ceaf0876f)
* improvements to docs and examplesBea Lam2010-07-2613-82/+115
| | | | (cherry picked from commit 07ebc9161263c04dc072b9fc2a922b9665cbe7be)
* Only ignore the same target value for a Behavior when it is running.Michael Brasser2010-07-263-1/+45
| | | | | | | | | | | Otherwise a Behavior may mistakenly not be triggered. This situation can arise when the property in question has been manipulated via the property system, followed by a direct function call (which correctly bypasses the Behavior), followed by a another change via the property system. Task-number: QTBUG-12295 (cherry picked from commit 64833c0a648211f3fe7547436f022edc0ceb51ac)
* Autotest for QTBUG-5491 (Animation in a Behavior doesn't update running)Michael Brasser2010-07-262-0/+38
| | | | (cherry picked from commit 5efd577b1aea64f422e08ca8d54e041fa4b20783)
* Bounding rect of text was not always calculated correctly.Martin Jones2010-07-263-53/+64
| | | | | | | | | The boundingRect depended upon the image cache which may not become valid until after boundingRect is called. Task-number: QTBUG-12291 Reviewed-by: Michael Brasser (cherry picked from commit 3aeafb4839f49f524f10eae65be27fd189d37060)
* Ensure the boundingRect() of Text is correctly calculated.Michael Brasser2010-07-262-0/+3
| | | | | | | | We need to create our cached image in boundingRect() if it doesn't already exist, to prevents painting errors. Reviewed-by: Warwick Allison (cherry picked from commit 6c3cf7e2c5868bc77ffa66059889eda3132531b3)
* Fix TextEdit text attribute and text stored in the internal QTextDocument ↵Joona Petrell2010-07-262-2/+37
| | | | | | | | having different contents Task-number: QTBUG-12339 Reviewed-by: Martin Jones (cherry picked from commit 0767c2ff719a35c16c72fac97e6ff612e8c71e21)
* Make rootContext and engine pointers in QDeclarativeView API constJoona Petrell2010-07-264-14/+15
| | | | | | Task-number: QTBUG-12322 Reviewed-by: Aaron Kennedy (cherry picked from commit 0b83a2161261be525f01359397ab1c8c34827749)
* Fix clock example: make sure hands always moves forward.Michael Brasser2010-07-261-3/+3
| | | | | Task-number: QTBUG-12292 (cherry picked from commit 6d8b3453b6b4b151c777ad541ab25ca6bacc7381)
* font.letterSpacing used percentage rather than absolute values.Martin Jones2010-07-268-16/+16
| | | | | | | | ... and percentage is useless. Task-number: QTBUG-12282 Reviewed-by: Warwick Allison (cherry picked from commit 78a01438e5a37fd1778924f73ca8bfa55960b0d0)
* Rewinding AnchorChanges should not make target item's implicit width and ↵Joona Petrell2010-07-263-2/+78
| | | | | | | | height explicit Task-number: QTBUG-12273 Reviewed-by: Michael Brasser (cherry picked from commit 164b2b54922d87a44a60efe6dbbe2fa3b7716820)
* fixes for dynamic object creation docsBea Lam2010-07-264-63/+84
| | | | (cherry picked from commit c95889b7896dc5418841ef72326d99296943e616)
* Improve documentation on setting arbitray transform origin pointsMartin Jones2010-07-261-0/+7
| | | | | | | | | transformOriginPoint is undocumented for a reason. It shouldn't be used by Item. Added some docs to assist find the right way, i.e. Scale and Rotation elements. Task-number: QTBUG-12265 (cherry picked from commit 06ef198e0812b514c261ef8f7c82db754450f1fa)
* Make Item::transformOriginPoint read-onlyMartin Jones2010-07-261-0/+1
| | | | | | | | | | Using this property on Item will break transformOrigin property. We have never documented it. It should not have been used. Now it is enforced as best we can. Task-number: QTBUG-12265 Reviewed-by: Aaron Kennedy (cherry picked from commit 7fb140b63f03b96064ded4ec6f2ec7c93e87b825)
* Ensure released VisualItemModel items are removed from the scene.Martin Jones2010-07-263-7/+39
| | | | | | | Also parent them back to the VIM to ensure correct destruction. Task-number: QTBUG-12261 (cherry picked from commit 17cc89e918a969d85d2b46631ee8743288c7586d)
* doc: Fixed broken "Getting Started" link.Martin Smith2010-07-261-2/+2
| | | | | | | Geir will replace it soon with a link to a new "Getting Started" page. Task-number: QTBUG-12176 (cherry picked from commit eaee97cf48feecc18d6154d3939fd4adb93ba74f)
* doc: Added missing \since 4.7 to effect propertyu.Martin Smith2010-07-261-0/+1
| | | | | Task-number: QTBUG-12132 (cherry picked from commit d9f5b8742f84124c3c0e2bdbd7b860dce2bc2225)