summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Merge branch 'master' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into ↵Qt Continuous Integration System2010-07-281-1/+4
|\ | | | | | | | | | | | | master-integration * 'master' of scm.dev.nokia.troll.no:qt/oslo-staging-1: Fix a memory leak in the QTestLib.
| * Fix a memory leak in the QTestLib.Jedrzej Nowacki2010-07-271-1/+4
| | | | | | | | | | | | A comment string wasn't deleted in expectedFailMode. Reviewed-by: Harald Fernengel
* | Merge branch 'master' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into ↵Qt Continuous Integration System2010-07-274-56/+4
|\ \ | |/ | | | | | | | | | | | | master-integration * 'master' of scm.dev.nokia.troll.no:qt/oslo-staging-1: QNAM: Stop half-supporting wrong way of deleting QAbstractSocket: Remove old workaround
| * QNAM: Stop half-supporting wrong way of deletingMarkus Goetz2010-07-272-31/+4
| | | | | | | | | | | | | | | | We clearly state that deleteLater() should be used. Therefore stop the usage of QPointer to track deletion since it is bad for performance and only worked in some cases anyway. Reviewed-by: Peter Hartmann
| * QAbstractSocket: Remove old workaroundMarkus Goetz2010-07-272-25/+0
|/ | | | | | | | This old workaround hurts performance on Linux but is only needed on old kernels and in corner cases (using a local socket with QAbstractSocket). Removing it. Reviewed-by: Peter Hartmann
* Merge branch 'master' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into ↵Qt Continuous Integration System2010-07-234-30/+26
|\ | | | | | | | | | | | | | | | | master-integration * 'master' of scm.dev.nokia.troll.no:qt/oslo-staging-2: Revert "Make QPalette::operator== return false if the currentColorGroup differs" Make QPalette::operator== return false if the currentColorGroup differs Fix the CGContext on Mac OS X. Sometimes we got
| * Revert "Make QPalette::operator== return false if the currentColorGroup differs"Pierre Rossi2010-07-234-36/+4
| | | | | | | | | | | | | | This reverts commit d9d877326b13c55dc33b1cac13f3ee70e8de62bf. The behavior change it implied was bigger than expected and made too many autotests fail. Will document better that the currentColorGroup is not taken into account when comparing palettes.
| * Make QPalette::operator== return false if the currentColorGroup differsPierre Rossi2010-07-224-4/+36
| | | | | | | | | | | | | | | | This was affecting QLineEdit's selected text color when the window is inactive. Task-number: QTBUG-697 Reviewed-by: ogoffart
| * Fix the CGContext on Mac OS X. Sometimes we gotFabien Freling2010-07-224-30/+26
|/ | | | | | | | a bad context, resulting in wrong paintings. It also unify the raster engine behavior among platforms. Reviewed-by: Jason Barron
* Merge branch 'qt-master-from-4.7' of ↵Qt Continuous Integration System2010-07-19705-14561/+20469
|\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | scm.dev.nokia.troll.no:qt/qt-integration into master-integration * 'qt-master-from-4.7' of scm.dev.nokia.troll.no:qt/qt-integration: (351 commits) Fix compilation after merge fix for looping crash log on data abort Allow commenting of individual files in generated pkg files. Removed README.s60-mkspec. Fixed install docs for Qt for Symbian on Linux. Performance docs. Added symbian defs for e55781212532e2abcdd1cef8548b146fb14f0713 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. 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. ...
| * Fix compilation after mergeOlivier Goffart2010-07-151-10/+10
| | | | | | | | | | | | viewport has been renamed contentItem in 4.7 (commit 9d6ccfea89ae99b747f70ece71185868f189d0f9) (the code in master was added in commit 8c08c737837389f5ff2641219eb901ad217d3f24)
| * Merge remote branch 'origin/master' into qt-master-from-4.7Thiago Macieira2010-07-155-26/+268
| |\ | |/ |/| | | | | Conflicts: src/opengl/qgl_p.h
* | Merge branch 'master' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into ↵Qt Continuous Integration System2010-07-155-26/+268
|\ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | master-integration * 'master' of scm.dev.nokia.troll.no:qt/oslo-staging-2: Compile with qmlscene. Support glyphs that are wider than default width in texture glyph cache Support RTL text in QGlyphs Support text decoration in QPainter::drawGlyphs()
| * | Compile with qmlscene.Bjørn Erik Nilsen2010-07-151-1/+1
| | | | | | | | | | | | Reviewed-by: kim
| * | Support glyphs that are wider than default width in texture glyph cacheEskil Abrahamsen Blomfeldt2010-07-151-2/+6
| | | | | | | | | | | | | | | | | | We need to reserve space for the widest possible glyph in the font Reviewed-by: Kim
| * | Merge branch 'master' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into ↵Qt Continuous Integration System2010-07-143-23/+261
| |\ \ |/ / / | | | | | | | | | | | | | | | | | | master-integration * 'master' of scm.dev.nokia.troll.no:qt/oslo-staging-2: Support RTL text in QGlyphs Support text decoration in QPainter::drawGlyphs()
| * | Support RTL text in QGlyphsEskil Abrahamsen Blomfeldt2010-07-142-1/+53
| | | | | | | | | | | | | | | | | | | | | | | | | | | RTL text would be positioned wrong with QGlyphs, as we would not correctly detect the direction of the text and pass it into getGlyphPositions(). The bidi analysis is the same as in the QTextLine::draw() method. Reviewed-by: Kim
| * | Support text decoration in QPainter::drawGlyphs()Eskil Abrahamsen Blomfeldt2010-07-143-22/+208
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | In order to support text decorations (overline, underline and strikeout) in QPainter::drawGlyphs(), we need to call drawTextItemDecoration() from this function. To support this, it has been generalized to no longer require a QTextItemInt. We also need to propagate the decoration attributes of the font from QTextLayout to QGlyphs, since this is not part of the QFontEngine. Task-number: QTBUG-12122 Reviewed-by: Kim
| | * Merge remote branch 'origin/4.7' into qt-master-from-4.7Thiago Macieira2010-07-15705-14551/+20459
| | |\ | |/ / |/| | | | | | | | Conflicts: src/gui/kernel/qapplication.h
| | * Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-s60-public into ↵Qt Continuous Integration System2010-07-154-108/+22
| | |\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 4.7-integration * '4.7' of scm.dev.nokia.troll.no:qt/qt-s60-public: fix for looping crash log on data abort Allow commenting of individual files in generated pkg files. Removed README.s60-mkspec. Fixed install docs for Qt for Symbian on Linux.
| | | * fix for looping crash log on data abortShane Kearns2010-07-151-7/+20
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | When a thread panics, calling resume allows the thread to proceed to the exit handler and shut down. When a thread takes an exception, calling resume continues from the same point so the exception happens again. To avoid this, we add crashed thread ids to a list. If we see the same thread crash again, we terminate the process without trying to fetch the call stack a second time. Reviewed-by: Jason Barron
| | | * Allow commenting of individual files in generated pkg files.axis2010-07-151-1/+1
| | | | | | | | | | | | | | | | RevBy: Jason Barron
| | | * Removed README.s60-mkspec.axis2010-07-151-99/+0
| | | | | | | | | | | | | | | | The instructions are old, and should now be found in the qdoc docs.
| | | * Fixed install docs for Qt for Symbian on Linux.axis2010-07-151-1/+1
| | | |
| | * | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7-integrationQt Continuous Integration System2010-07-153-0/+23
| | |\ \ | | | |/ | | |/| | | | | | | | | | | | | * '4.7' of scm.dev.nokia.troll.no:qt/qt-qml: Performance docs. Added symbian defs for e55781212532e2abcdd1cef8548b146fb14f0713
| | | * Performance docs.Michael Brasser2010-07-151-0/+21
| | | |
| | | * Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7-integrationQt Continuous Integration System2010-07-142-0/+2
| | | |\ | | |/ / | | | | | | | | | | | | * '4.7' of scm.dev.nokia.troll.no:qt/qt-qml: Added symbian defs for e55781212532e2abcdd1cef8548b146fb14f0713
| | | * Added symbian defs for e55781212532e2abcdd1cef8548b146fb14f0713Lasse Holmstedt2010-07-142-0/+2
| | | | | | | | | | | | | | | | | | | | Reviewed-by: Jason McDonald Submitted-by: Alessandro Portale
| | * | 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
generated by cgit v0.12 at 2024-12-10 12:17:06 (GMT)