summaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* docWarwick Allison2010-05-0519-205/+210
* Example i18n.Warwick Allison2010-05-056-0/+69
* Allow translations without extra command-line args, and document both.Warwick Allison2010-05-053-27/+68
* Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7Warwick Allison2010-05-0558-467/+874
|\
| * Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7Aaron Kennedy2010-05-0522-119/+251
| |\
| | * Doc improvements, simplify example codeBea Lam2010-05-0519-118/+208
| | * Enable states to be activated via their 'when' clause even if unnamed.Michael Brasser2010-05-053-1/+43
| * | Null objects should appear as JS nullAaron Kennedy2010-05-053-4/+5
| |/
| * Fix a crash with null objects returned from a Q_INVOKABLERhys Weatherley2010-05-051-1/+2
| * Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7-integrationQt Continuous Integration System2010-05-04197-2236/+4507
| |\
| | * Optimization for QDeclarativePaintedItem.Michael Brasser2010-05-042-12/+20
| | * Update childrenRect when children are added or removed.Michael Brasser2010-05-044-3/+95
| | * Optimize childrenRect.Michael Brasser2010-05-042-43/+87
| | * Remove obsolete doc groupings.Michael Brasser2010-05-0415-69/+1
| | * Doc improvementsBea Lam2010-05-044-52/+102
| * | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-webkit into 4.7-integrationQt Continuous Integration System2010-05-049-168/+315
| |\ \
| | * \ Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-webkit into 4.7-integrationQt Continuous Integration System2010-05-039-168/+315
| | |\ \
| | | * | Updated WebKit to 3f0f51f4c87e65bfe04165c6af4c00934b0ca1e2Simon Hausmann2010-05-034-3/+14
| | | * | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-webkit into 4.7-integrationQt Continuous Integration System2010-05-039-168/+304
| | | |\ \
| | | | * | Updated WebKit to 8941bee5706ef2171ed5def63834deefc7440d11Simon Hausmann2010-05-039-168/+304
* | | | | | syntax updateWarwick Allison2010-05-051-1/+1
| |_|_|_|/ |/| | | |
* | | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt into 4.7Warwick Allison2010-05-04656-154657/+259318
|\ \ \ \ \ | |/ / / /
| * | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into 4.7-integ...Qt Continuous Integration System2010-05-0359-367/+1959
| |\ \ \ \ | | |/ / / | |/| | |
| | * | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into 4.7aavit2010-05-0312-89/+215
| | |\ \ \
| | | * \ \ Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into 4.7-integ...Qt Continuous Integration System2010-05-0358-364/+1950
| | | |\ \ \ | | |/ / / / | |/| | | |
| | | * | | QGraphicsView drawing artifacts due to rounding errors.Bjørn Erik Nilsen2010-05-036-80/+194
| * | | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.7-integ...Qt Continuous Integration System2010-05-036-9/+21
| |\ \ \ \ \ | | |_|_|/ / | |/| | | |
| | * | | | Fix a small typo: therfore -> thereforeLaszlo Papp2010-05-031-1/+1
| | * | | | Fix a small typo in setColor description (brush -> color)Laszlo Papp2010-05-031-1/+1
| | * | | | only add phonon and scripttools dependencies if they're available, otherwise ...Romain Pokrzywka2010-05-031-3/+7
| | * | | | s/INCPATH/INCLUDEPATH/Oswald Buddenhagen2010-05-031-2/+2
| | * | | | qdoc: Added breadcrumbs for most other pages.Martin Smith2010-05-032-2/+10
| | | * | | Fixed a QBuffer warning caused by a regression in qjpegJohn Brooks2010-05-031-3/+9
| | | |/ /
| | | * | Fixed OpenGL version flags for versions > 3.2.Kim Motoyoshi Kalland2010-05-031-1/+14
| | | * | Do not link QtGui in benchmarks which don't need itGordon Schumacher2010-05-036-2/+5
| | | * | Revert "Revert "Revert "Implement heightForWidth support for QTabWidget and Q...Jan-Arve Sæther2010-05-0310-149/+16
| | | * | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into 4.7-integ...Qt Continuous Integration System2010-05-0256-297/+1886
| | | |\ \ | | |/ / / | |/| | |
| | | * | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into 4.7-integ...Qt Continuous Integration System2010-05-0258-302/+1913
| | | |\ \ | | |/ / /
| | | * | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into 4.7-integ...Qt Continuous Integration System2010-05-0158-302/+1913
| | | |\ \
| | | | * | Fix project file generation for MSVC 2010Martin Petersson2010-04-302-3/+32
| | | | * | Fix wrong translation and clip for the raster paint-engine on MacTor Arne Vestbø2010-04-301-5/+3
| | | | * | Return the correct library name in qt_gl_library_name for GLES*Tom Cooksey2010-04-301-4/+10
| | | | * | qmake: remove useless evaluation of variables from VS project generatorsJoerg Bornemann2010-04-292-16/+0
| | | | * | Fix QT_NO_LIBRARYTasuku Suzuki2010-04-2915-50/+48
| | | | * | Documentation for the Elastic Nodes example.Andreas Aardal Hanssen2010-04-298-44/+471
| | | | * | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into 4.7Jan-Arve Sæther2010-04-2936-357/+1512
| | | | |\ \
| | | | | * | qmake: fix duplicate linker options in VS project filesJoerg Bornemann2010-04-292-14/+0
| | | | | * | qmake: fix duplicate compiler options in VS project filesJoerg Bornemann2010-04-292-8/+0
| | | | | * | Merge branch '4.7' of scm.dev-nokia.troll.no:qt/oslo-staging-2 into 4.7Andreas Aardal Hanssen2010-04-2927-223/+1008
| | | | | |\ \
| | | | | | * \ Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into 4.7-integ...Qt Continuous Integration System2010-04-2813-25/+669
| | | | | | |\ \