summaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7Alan Alpert2010-06-1655-487/+642
|\
| * Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7Aaron Kennedy2010-06-161-0/+1
| |\
| | * Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7Martin Jones2010-06-1647-472/+577
| | |\
| | * | Stopping a flick resulted in the next click being consumed.Martin Jones2010-06-161-0/+1
| * | | Move knowledge of QGraphicsObject out of qml engineAaron Kennedy2010-06-167-15/+64
| | |/ | |/|
| * | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7-integrationQt Continuous Integration System2010-06-1617-384/+332
| |\ \
| | * | Clean up list examplesBea Lam2010-06-169-348/+240
| | * | Document QML_IMPORT_TRACEBea Lam2010-06-161-2/+29
| | * | Document section.delegateBea Lam2010-06-161-1/+5
| | * | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7-integrationQt Continuous Integration System2010-06-156-33/+58
| | |\ \ | | | |/
| * | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into 4.7-integ...Qt Continuous Integration System2010-06-1618-36/+124
| |\ \ \
| | * | | Fixed QImageReader::format() inconsistency.Samuel Rødal2010-06-159-28/+70
| | * | | Fixed missing stroke for flat ellipses.Samuel Rødal2010-06-153-4/+6
| | * | | Merge branch '4.7' of git@scm.dev.nokia.troll.no:qt/oslo-staging-2 into 4.7Geir Vattekar2010-06-15680-10841/+30906
| | |\ \ \
| | | * | | Added missing sanity checks in qimage.cppSamuel Rødal2010-06-151-0/+13
| | | * | | Fix regression, remove artificial emboldening of monospaced fontsEskil Abrahamsen Blomfeldt2010-06-151-1/+1
| | * | | | Doc: Documented qputenv and qgetenvGeir Vattekar2010-06-151-0/+27
| | * | | | Doc: Said to not access events after they are posted(postEvent).Geir Vattekar2010-06-041-2/+2
| | * | | | Doc: QTreeWidgetItems remove themselves from views when deleted.Geir Vattekar2010-06-041-0/+4
| | * | | | Doc: Removed a link to Qt3 support in QSliderGeir Vattekar2010-06-021-1/+1
| * | | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-s60-public into 4.7-integr...Qt Continuous Integration System2010-06-156-46/+84
| |\ \ \ \ \ | | |_|_|/ / | |/| | | |
| | * | | | ComboBox popuplist is not correctly layouted in fullscreen modeSami Merila2010-06-151-10/+1
| | * | | | Stylus menu for Share (QT app) is different from native S60 appsSami Merila2010-06-151-31/+35
| | * | | | Merge branch '4.7' of git@scm.dev.nokia.troll.no:qt/qt-s60-public into 4.7Sami Merila2010-06-154-10/+5
| | |\ \ \ \
| | | * | | | Change $${EPOCROOT} to also have drive if EPOCROOT env variable has itMiikka Heikkinen2010-06-154-10/+5
| | * | | | | Merge branch '4.7' of git@scm.dev.nokia.troll.no:qt/qt-s60-public into 4.7Sami Merila2010-06-1572-457/+1261
| | |\ \ \ \ \ | | | |/ / / /
| | * | | | | Merge branch '4.7' of git@scm.dev.nokia.troll.no:qt/qt-s60-public into 4.7Sami Merila2010-06-111-1/+1
| | |\ \ \ \ \
| | * | | | | | Stylus menu for Share (QT app) is different from native S60 appsSami Merila2010-06-112-19/+67
| * | | | | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-webkit into 4.7-integrationQt Continuous Integration System2010-06-156-11/+21
| |\ \ \ \ \ \ \ | | |_|_|_|_|/ / | |/| | | | | |
| | * | | | | | Updated WebKit to 40c2d6907ef75288b4f15e7fad334b9138acdbbfSimon Hausmann2010-06-156-11/+21
| * | | | | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into 4.7-integ...Qt Continuous Integration System2010-06-157-28/+74
| |\ \ \ \ \ \ \ | | |/ / / / / / | |/| | | | | |
| | * | | | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into 4.7-integ...Qt Continuous Integration System2010-06-147-28/+74
| | |\ \ \ \ \ \ | | | |_|_|/ / / | | |/| | | | |
| | | * | | | | Fixed error reporting in grayraster and reduced default pool size.Carolina Gomes2010-06-144-22/+35
| | | * | | | | Add QTextOption API to QStaticTextEskil Abrahamsen Blomfeldt2010-06-143-6/+39
* | | | | | | | Write TextInput.positionToRectangle docs.Alan Alpert2010-06-162-4/+10
* | | | | | | | Minor demo fixesAlan Alpert2010-06-162-4/+7
* | | | | | | | Fix autoScroll implementationAlan Alpert2010-06-163-36/+54
* | | | | | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7Alan Alpert2010-06-15662-10770/+30515
|\ \ \ \ \ \ \ \ | | |_|_|_|_|_|/ | |/| | | | | |
| * | | | | | | Remove duplicated code.Michael Brasser2010-06-152-14/+2
| * | | | | | | Fix bug with childrenRect resizing on startup.Michael Brasser2010-06-154-19/+56
| |/ / / / / /
| * | | | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7-integrationQt Continuous Integration System2010-06-14257-1138/+3416
| |\ \ \ \ \ \ | | |/ / / / / | |/| | | | |
| | * | | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7-integrationQt Continuous Integration System2010-06-14257-1138/+3416
| | |\ \ \ \ \
| | | * \ \ \ \ Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7-integrationQt Continuous Integration System2010-06-12257-1138/+3416
| | | |\ \ \ \ \
| | | | * \ \ \ \ Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7-integrationQt Continuous Integration System2010-06-12257-1138/+3416
| | | | |\ \ \ \ \
| | | | | * \ \ \ \ Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7Martin Jones2010-06-1111-0/+26
| | | | | |\ \ \ \ \
| | | | | | * | | | | Move listview/itemlist.qml to a separate visualitemmodel exampleBea Lam2010-06-1111-0/+26
| | | | | * | | | | | ListView.onRemove animation is not played when the list has only one item.Martin Jones2010-06-112-2/+2
| | | | | |/ / / / /
| | | | | * | | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7Martin Jones2010-06-1124-248/+318
| | | | | |\ \ \ \ \
| | | | | | * | | | | Fix test - sizeHint should not change after initial load. Also useBea Lam2010-06-111-5/+3
| | | | | | * | | | | Minor doc fixesBea Lam2010-06-117-8/+11