summaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* Doc: More work on the QML documentation.David Boddie2010-08-2729-209/+955
* Merge branch '4.7' into qmldocsDavid Boddie2010-08-24201-17039/+16767
|\
| * Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into 4.7David Boddie2010-08-24201-17040/+16767
| |\
| | * Fix mispositioned text with QStaticText and OpenVG graphics systemEskil Abrahamsen Blomfeldt2010-08-241-2/+5
| | * Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into 4.7Gunnar Sletta2010-08-24597-36258/+42775
| | |\
| | | * QGraphicsView: Fix assert that may occurs if there are 'empty' item to draw, ...Olivier Goffart2010-08-242-1/+29
| | | * Fix tst_Collections::QTBUG13079_collectionInsideCollectionOlivier Goffart2010-08-241-2/+2
| | | * Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into 4.7-integ...Qt Continuous Integration System2010-08-247-18/+156
| | | |\
| | | | * Fix assignment of a Q(Explicitly)SharedDataPointer included in the data itselfOlivier Goffart2010-08-232-8/+54
| | | | * Fix assignment of a container included in the container itselfOlivier Goffart2010-08-236-10/+102
| | | * | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7-integrationQt Continuous Integration System2010-08-245-51/+31
| | | |\ \ | | | | |/ | | | |/|
| | | | * Fix PathView when setting an empty model that is later filled.Michael Brasser2010-08-243-2/+30
| | | | * QDeclarativeVisualItemModel code cleanup.Michael Brasser2010-08-242-49/+1
| | | |/
| | | * Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into 4.7-integ...Qt Continuous Integration System2010-08-232-7/+5
| | | |\
| | | | * Doc: QtConcurrent::run. Make sure the example actually compilesOlivier Goffart2010-08-232-7/+5
| | | * | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-s60-public into 4.7-integr...Qt Continuous Integration System2010-08-232-2/+7
| | | |\ \ | | | | |/ | | | |/|
| | | | * On Symbian QGLWidget::glDraw() must do nothing if widget isn't visible.Jani Hautakangas2010-08-231-0/+5
| | | | * QWidget metadata has not been set up yet in QWidgetPrivate::init.Jani Hautakangas2010-08-231-2/+2
| | | * | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into 4.7-integ...Qt Continuous Integration System2010-08-231-4/+3
| | | |\ \
| | | | * | Doc: update the documentation of NOTIFY signal to reflect realityOlivier Goffart2010-08-231-4/+3
| | | * | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.7-integ...Qt Continuous Integration System2010-08-231-3/+5
| | | |\ \ \ | | | | |_|/ | | | |/| |
| | | | * | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.7-integ...Qt Continuous Integration System2010-08-231-3/+5
| | | | |\ \ | | | |/ / /
| | | | * | Doc: changing template menus to better reflect links from the index page.Morten Engvoldsen2010-08-221-3/+5
| | | * | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7-integrationQt Continuous Integration System2010-08-231-1/+1
| | | |\ \ \ | | | | |_|/ | | | |/| |
| | | | * | Move link for Declarative UI Runtime to Using QML with C++ sectionBea Lam2010-08-231-1/+1
| | | * | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.7-integ...Qt Continuous Integration System2010-08-2218-17/+62
| | | |\ \ \ | | | | |/ / | | | |/| / | | | | |/
| | | | * Doc: Adding pages to the overviews and updating the index page.Morten Engvoldsen2010-08-223-8/+17
| | | | * Doc: Updating pages and linking them to the overviews.Morten Engvoldsen2010-08-2215-9/+45
| | | * | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.7-integ...Qt Continuous Integration System2010-08-211-5/+18
| | | |\ \ | | | | |/
| | | | * bindTexture: Replace texture if painting is active on pixmap/imageAndreas Kling2010-08-211-5/+18
| | | |/
| | | * Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into 4.7-integ...Qt Continuous Integration System2010-08-202-5/+3
| | | |\
| | | | * QDeclarativeDebug: stream all the context, including the internals ones.Olivier Goffart2010-08-202-5/+3
| | | * | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.7-integ...Qt Continuous Integration System2010-08-2049-12219/+14008
| | | |\ \
| | | | * | qmake vcxproj generator: fix usage of /Fd in QMAKE_CXXFLAGSJoerg Bornemann2010-08-201-1/+1
| | | | * | qmake: fix vcxproj generator when using /Fd in QMAKE_CXXFLAGSJoerg Bornemann2010-08-201-0/+1
| | | | * | Revised fix for pixmap loadingJens Bache-Wiig2010-08-202-0/+7
| | | | * | Assistant: Clean-up - fix spelling mistakes.Christian Kandeler2010-08-201-1/+1
| | | | * | Assistant: Clean-up: Use const references in foreach loops.Christian Kandeler2010-08-202-3/+3
| | | | * | Assistant: Clean-up: Mark constructors as explicit.Christian Kandeler2010-08-2013-16/+19
| | | | * | Assistant: Clean-up - add newlines to end of files.Christian Kandeler2010-08-202-2/+2
| | | | * | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.7-integ...Qt Continuous Integration System2010-08-2029-12196/+13974
| | | | |\ \
| | | | | * | Doc: Changes to the index page and second level pages linking to the index page.Morten Engvoldsen2010-08-204-7/+11
| | | | | * | Merge branch '4.7' of git@scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.7Morten Engvoldsen2010-08-201-2/+2
| | | | | |\ \
| | | | | | * | Use Ctrl rather than Alt for switching tabs in the demo browserTor Arne Vestbø2010-08-201-2/+2
| | | | | * | | Merge branch '4.7' of git@scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.7Morten Engvoldsen2010-08-2021-12180/+13946
| | | | | |\ \ \ | | | | | | |/ /
| | | | | | * | Update Japanese translationsTakumi ASAKI2010-08-207-8756/+7602
| | | | | | * | Ukrainian translation updatedVictor Ostashevsky2010-08-207-3379/+6261
| | | | | | * | qtconfig and qvfb internationalization fixesTasuku Suzuki2010-08-204-32/+59
| | | | | | * | add full width characters to ending() in linguistTasuku Suzuki2010-08-201-0/+3
| | | | | | * | QFileDialog::HideNameFilterDetails breaks Cocoa QFileDIalog filterRichard Moe Gustavsen2010-08-201-8/+17