summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Always place PathView delegates centered on the pathMartin Jones2010-07-192-0/+10
| | | | | | | | | | The scale of the delegate was used to offset the item. This was a bad way of making the item appear to be positioned correctly when the default transform origin was the top-left. Now that transform origin is center, it is obvious that it was a bad idea. Task-number: QTBUG-12245 Reviewed-by: Michael Brasser
* Add a PathView example.Martin Jones2010-07-1910-0/+125
|
* Minor animation doc improvementMartin Jones2010-07-162-1/+6
|
* Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7-integrationQt Continuous Integration System2010-07-1553-595/+1282
|\ | | | | | | | | | | | | | | | | | | | | * '4.7' of scm.dev.nokia.troll.no:qt/qt-qml: Fix .pro file Add files missing from last commit fix doc link Add chapter on creating list property types fix spelling Change tutorial from using "Musician" etc. types to using "PieChart" Text element does not clip even with clip=true
| * Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7-integrationQt Continuous Integration System2010-07-1553-595/+1282
| |\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * '4.7' of scm.dev.nokia.troll.no:qt/qt-qml: Fix .pro file Add files missing from last commit fix doc link Add chapter on creating list property types fix spelling Change tutorial from using "Musician" etc. types to using "PieChart" Text element does not clip even with clip=true
| | * Fix .pro fileBea Lam2010-07-151-1/+2
| | |
| | * Add files missing from last commitBea Lam2010-07-157-0/+446
| | |
| | * fix doc linkBea Lam2010-07-151-1/+1
| | |
| | * Add chapter on creating list property typesBea Lam2010-07-1515-51/+136
| | |
| | * fix spellingBea Lam2010-07-151-1/+1
| | |
| | * Change tutorial from using "Musician" etc. types to using "PieChart"Bea Lam2010-07-1534-503/+652
| | | | | | | | | | | | | | | etc. types to make a more practical example that shows how to do painting as well. Also includes some tutorial improvments.
| | * Text element does not clip even with clip=trueYann Bodson2010-07-152-8/+14
| | | | | | | | | | | | | | | Task: QTBUG-12201 Reviewed-by: Michael Brasser
* | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into ↵Qt Continuous Integration System2010-07-1514-13/+131
|\ \ \ | |/ / |/| | | | | | | | | | | | | | | | | | | | | | | | | | 4.7-integration * '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-2: QFileDialog : Fix completer showing up on the MyComputer view. Amend previous commit 4e2eb2945dbc3865e2901f12d663ed89e8f0dfbf to fix compilation with QT_NO_DEBUG_STREAM Compile with QT_NO_DEBUG_STREAM Docs: HTML comments marks so Creator can extract data efficiently. Work around memory leak issue in grid and linear layouts.
| * | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into ↵Qt Continuous Integration System2010-07-1514-13/+131
| |\ \ |/ / / | | | | | | | | | | | | | | | | | | | | | | | | | | | 4.7-integration * '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-2: QFileDialog : Fix completer showing up on the MyComputer view. Amend previous commit 4e2eb2945dbc3865e2901f12d663ed89e8f0dfbf to fix compilation with QT_NO_DEBUG_STREAM Compile with QT_NO_DEBUG_STREAM Docs: HTML comments marks so Creator can extract data efficiently. Work around memory leak issue in grid and linear layouts.
| * | QFileDialog : Fix completer showing up on the MyComputer view.Alexis Menard2010-07-152-1/+25
| | | | | | | | | | | | | | | | | | Only complete if there is a text to complete Reviewed-by:janarve
| * | Amend previous commit 4e2eb2945dbc3865e2901f12d663ed89e8f0dfbf to fix ↵Olivier Goffart2010-07-154-4/+10
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | compilation with QT_NO_DEBUG_STREAM Qt in debug need to stay binary compatible with Qt in release. See also commit cbbd7e084c7e46fd906db26b13032b8368c59093 that introduced the problem Task-number: QTBUG-11510
| * | Compile with QT_NO_DEBUG_STREAMOlivier Goffart2010-07-144-6/+8
| | | | | | | | | | | | Task-number: QTBUG-11510
| * | Docs: HTML comments marks so Creator can extract data efficiently.Leandro Melo2010-07-144-1/+75
| | | | | | | | | | | | Reviewed-by: Martin Smith
| * | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into 4.7Jan-Arve Sæther2010-07-1435-427/+711
| |\ \
| * | | Work around memory leak issue in grid and linear layouts.Andreas Aardal Hanssen2010-07-144-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>
* | | | 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.