summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into ↵Qt Continuous Integration System2010-07-144-4/+53
|\ | | | | | | | | | | | | | | 4.7-integration * '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-2: Fixes QGraphicsItem::focusItem() returning incorrect value. Fixes crash in QGraphicsScene::addItem().
| * Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into ↵Qt Continuous Integration System2010-07-134-4/+53
| |\ | | | | | | | | | | | | | | | | | | | | | 4.7-integration * '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-2: Fixes QGraphicsItem::focusItem() returning incorrect value. Fixes crash in QGraphicsScene::addItem().
| | * Fixes QGraphicsItem::focusItem() returning incorrect value.Yoann Lopes2010-07-132-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>
| | * Fixes crash in QGraphicsScene::addItem().Yoann Lopes2010-07-132-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>
* | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7-integrationQt Continuous Integration System2010-07-1435-427/+711
|\ \ \ | |/ / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * '4.7' of scm.dev.nokia.troll.no:qt/qt-qml: Check for binding having been deleted in more places Position GridView and ListView footer correctly when model cleared. Clean up particle motion documentation Finish QML for Qt Programmers section Distinguish Qt Quick, Qt Declarative and QML on the landing page Split responsibilities in QDeclarativeExpression more cleanly improvements to docs and examples Fix test for get() to check for undefined return values Enter key performs same action as Return key in QML demos.
| * | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7Aaron Kennedy2010-07-149-10/+174
| |\ \
| | * \ Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7Alan Alpert2010-07-146-3/+144
| | |\ \
| | | * \ Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7Martin Jones2010-07-1421-417/+522
| | | |\ \
| | | * | | Position GridView and ListView footer correctly when model cleared.Martin Jones2010-07-146-3/+144
| | | | | | | | | | | | | | | | | | | | | | | | Task-number: QTBUG-12167
| | * | | | Clean up particle motion documentationAlan Alpert2010-07-141-3/+16
| | | | | | | | | | | | | | | | | | | | | | | | Task-number: QTBUG-11917
| | * | | | Finish QML for Qt Programmers sectionAlan Alpert2010-07-141-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
| | * | | | Distinguish Qt Quick, Qt Declarative and QML on the landing pageAlan Alpert2010-07-141-2/+4
| | | |/ / | | |/| | | | | | | | | | | | Task-number: QTBUG-11916
| * | | | Check for binding having been deleted in more placesAaron Kennedy2010-07-141-0/+6
| |/ / /
| * | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7Aaron Kennedy2010-07-1424-123/+154
| |\ \ \
| | * | | improvements to docs and examplesBea Lam2010-07-1413-82/+115
| | | | |
| | * | | Fix test for get() to check for undefined return valuesBea Lam2010-07-141-4/+6
| | |/ / | | | | | | | | | | | | Task-number: QTBUG-10658
| | * | Enter key performs same action as Return key in QML demos.Martin Jones2010-07-145-0/+9
| |/ / |/| | | | | | | | N900 has an Enter key, not a return key
* | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-s60-public into ↵Qt Continuous Integration System2010-07-131-18/+12
|\ \ \ | |_|/ |/| | | | | | | | | | | | | | | | | | | | | | | 4.7-integration * '4.7' of scm.dev.nokia.troll.no:qt/qt-s60-public: Revert "Making network reconnect happen after teardown." Revert "Adding some error checking for setdefaultif" Fixed a possible hanging bug in the Symbian networking. Fixed a network hanging bug on Symbian.
| * | Merge branch 'networkHangFixes' into 4.7-s60axis2010-07-131-18/+12
| |\ \ |/ / /
| * | Revert "Making network reconnect happen after teardown."axis2010-07-131-6/+2
| | | | | | | | | | | | | | | | | | This reverts commit 1e91d6b79cba488fa5c6f7d954de611903837f76. Should not be necessary anymore after 61daa2f41969688.
| * | Revert "Adding some error checking for setdefaultif"axis2010-07-131-3/+1
| | | | | | | | | | | | | | | | | | This reverts commit 0b56799601690a747c42dfbbefe95f18e837eb3f. Should not be necessary anymore after 61daa2f41969688.
| * | Fixed a possible hanging bug in the Symbian networking.axis2010-07-131-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
| * | Fixed a network hanging bug on Symbian.axis2010-07-131-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
* | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7-integrationQt Continuous Integration System2010-07-131-1/+6
|\ \ \ | | | | | | | | | | | | | | | | * '4.7' of scm.dev.nokia.troll.no:qt/qt-qml: Ensure the section header isn't shown twice.
| * \ \ Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7Martin Jones2010-07-134-18/+10
| |\ \ \
| * | | | Ensure the section header isn't shown twice.Martin Jones2010-07-131-1/+6
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Happened when currentItem was on a section boundary. Task-number: QTBUG-12089
* | | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7-integrationQt Continuous Integration System2010-07-133-18/+6
|\ \ \ \ \ | | |/ / / | |/| | | | | | | | | | | | | * '4.7' of scm.dev.nokia.troll.no:qt/qt-qml: Only support portrait and landscape orientations on Symbian when updating the runtime.orientation property
| * | | | Only support portrait and landscape orientations on Symbian when updating ↵Joona Petrell2010-07-133-18/+6
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | the runtime.orientation property Task-number: QTBUG-12036 Reviewed-by: Martin Jones
* | | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7-integrationQt Continuous Integration System2010-07-131-0/+4
|\ \ \ \ \ | |/ / / / | | | | | | | | | | | | | | | * '4.7' of scm.dev.nokia.troll.no:qt/qt-qml: Fix TextInput selectionColor or selectedTextColor -based animations
* | | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7-integrationQt Continuous Integration System2010-07-1311-36/+119
|\ \ \ \ \ | | |/ / / | |/| | | | | | | | | | | | | | | | | | | | | | | * '4.7' of scm.dev.nokia.troll.no:qt/qt-qml: Autotest for QTBUG-5491 (Animation in a Behavior doesn't update running) Private variable cleanup. wantsFocus should be based on FocusScope chain, not parent chain.
| | | | * Split responsibilities in QDeclarativeExpression more cleanlyAaron Kennedy2010-07-147-331/+401
| | | |/ | | |/|
| | * | Fix TextInput selectionColor or selectedTextColor -based animationsJoona Petrell2010-07-131-0/+4
| |/ / | | | | | | | | | | | | Task-number: QTBUG-12115 Reviewed-by: Martin Jones
| * | Autotest for QTBUG-5491 (Animation in a Behavior doesn't update running)Michael Brasser2010-07-132-0/+38
| | |
| * | Private variable cleanup.Michael Brasser2010-07-133-21/+19
| | |
| * | wantsFocus should be based on FocusScope chain, not parent chain.Michael Brasser2010-07-138-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
* | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into ↵Qt Continuous Integration System2010-07-121-5/+7
|\ \ | | | | | | | | | | | | | | | | | | 4.7-integration * '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-2: Doc: Removed links to Qt3 support in QHostAddress
| * | Doc: Removed links to Qt3 support in QHostAddressGeir Vattekar2010-07-121-5/+7
| | | | | | | | | | | | Task-number: QTBUG-12004
* | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-s60-public into ↵Qt Continuous Integration System2010-07-121-0/+6
|\ \ \ | | |/ | |/| | | | | | | | | | | | | 4.7-integration * '4.7' of scm.dev.nokia.troll.no:qt/qt-s60-public: Added some asserts to avoid race conditions in networking.
| * | Added some asserts to avoid race conditions in networking.axis2010-07-121-0/+6
| | | | | | | | | | | | | | | Task: QT-3358 RevBy: Markus Goetz
* | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7-integrationQt Continuous Integration System2010-07-123-50/+40
|\ \ \ | |_|/ |/| | | | | | | | * '4.7' of scm.dev.nokia.troll.no:qt/qt-qml: Calling setMinimumSize(0, 0) on a top-level window sometimes triggers a bug
| * | Calling setMinimumSize(0, 0) on a top-level window sometimes triggers a bugRobert Griebl2010-07-123-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
* | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into ↵Qt Continuous Integration System2010-07-123-19/+23
|\ \ \ | |_|/ |/| | | | | | | | | | | | | | | | | 4.7-integration * '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-2: Fix qdoc error. Quiet qmake warnings during configure.
| * | Merge remote branch 'oslo-staging-2/4.7' into qtbug-11996Aaron McCarthy2010-07-12143-1147/+5629
| |\ \
| | * | Fix qdoc error.Jason McDonald2010-07-121-2/+2
| | | | | | | | | | | | | | | | | | | | Task-number: QTBUG-12078 Reviewed-By: Trust Me
| * | | Quiet qmake warnings during configure.Aaron McCarthy2010-07-082-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
* | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-s60-public into ↵Qt Continuous Integration System2010-07-127-281/+513
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 4.7-integration * '4.7' of scm.dev.nokia.troll.no:qt/qt-s60-public: Minor modifications and optimizations to the Symbian HW glyph cache. Convert to new EGL API. Don't invert glyphs for the default VG font cache on Symbian. Move QVGFontGlyphCache from source file into a separate header Ensure glyphs are upright instead of upside-down. Enable cross-process glyph cache for OpenVG graphics system on Symbian. Factor out RSgImage -> VGImage conversion to separate function. Add new file for Symbian specific VG stuff and add Symbian glyph cache. Move QVGFontGlyphCache from source file into a separate header Make cacheGlyphs() function (and the destructor) virtual.
| * | | | Minor modifications and optimizations to the Symbian HW glyph cache.Jason Barron2010-07-121-49/+60
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | After the latest round of API reviews, the Symbian glyph cache has now been moved from GDI to FBS and this required some changes in Qt's implementation. Also incorporate an optimization where we first iterate over the glyph vector to eliminate glyphs that are already cached in Qt's glyph cache. This way we only open the glyph iterator on glyphs that we need. Reviewed-by: Alessandro Portale
| * | | | Convert to new EGL API.Jason Barron2010-07-122-47/+42
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Recent changes in Qt's EGL layer required some changes in the code used to convert RSgImage to/from VGImage. Reviewed-by: Gunnar Sletta
| * | | | Don't invert glyphs for the default VG font cache on Symbian.Jason Barron2010-07-121-0/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | If the hardware glyph cache API is not represent and in use, then the glyphs will not be inverted. Reviewed-by: TrustMe
| * | | | Move QVGFontGlyphCache from source file into a separate headerJason Barron2010-07-121-1/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Needed in order to subclass and override in the Symbian specific implementation. Reviewed-by: Rhys Weatherley
generated by cgit v0.12 at 2024-11-25 20:27:28 (GMT)