summaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.7-integ...Qt Continuous Integration System2010-08-0253-843/+618
|\
| * Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.7-integ...Qt Continuous Integration System2010-08-0253-843/+618
| |\
| | * Merge branch '4.7' of git@scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.7Morten Engvoldsen2010-08-024-8/+42
| | |\
| | | * Added notice that some links are online documents.Kevin Wright2010-08-021-3/+3
| | | * Merge branch '4.7' of http://git.scm.dev.nokia.troll.no/qt/oslo-staging-1 int...Kevin Wright2010-08-022-3/+37
| | | |\
| | | | * Fix Japanese characters not displayed in webkit on Mac Cocoa 64 (Regression)Simon Hausmann2010-08-021-3/+29
| | | | * configure: don't symlink the mkspecs/features directoryJoerg Bornemann2010-08-021-0/+8
| | | * | Modified qtdemo so error does not appear when there is no demo/example descri...Kevin Wright2010-08-021-2/+2
| | | |/
| | * | Doc: updating index page, x platform and platform spec. Removing redundant st...Morten Engvoldsen2010-08-024-340/+61
| | |/
| | * Merge branch '4.7' of git@scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.7Morten Engvoldsen2010-08-0213-77/+142
| | |\
| | | * Merge branch '4.7' of git@scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.7Martin Smith2010-08-021-2/+3
| | | |\
| | | | * Fixed potential infinite loop in QFileSystemWatcher on Mac.Denis Dzyubenko2010-08-021-2/+3
| | | * | doc: Fixed many qdoc errors.Martin Smith2010-08-026-16/+80
| | | |/
| | | * Merge branch '4.7' of git@scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.7Martin Smith2010-08-022-14/+39
| | | |\
| | | * | qdoc: Removed exclusion of declarative directories in qt-api-only.qdocconfMartin Smith2010-08-026-59/+59
| | * | | Doc: adding changes to getting started and fixing redirection linksMorten Engvoldsen2010-08-028-30/+30
| | | |/ | | |/|
| | * | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.7Jerome Pasion2010-08-021-11/+37
| | |\ \
| | | * \ Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.7-integ...Qt Continuous Integration System2010-08-0224-385/+341
| | | |\ \ | | | | |/
| | * | | Fixed comment about all enums being accessible in QML. Fix for QTBUG-12527.Jerome Pasion2010-08-021-3/+2
| | | |/ | | |/|
| | * | Simplify network manager settings code.Aaron McCarthy2010-08-021-112/+46
| | * | Use an enum to return the bearer type of a network configuration.Aaron McCarthy2010-08-0222-261/+271
| | * | Rename QNetworkConfiguration::bearerName() function.Aaron McCarthy2010-08-024-22/+34
* | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-multimedia-staging into 4....Qt Continuous Integration System2010-08-021-1/+1
|\ \ \ \ | |/ / / |/| | |
| * | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-multimedia-staging into 4....Qt Continuous Integration System2010-08-021-1/+1
| |\ \ \ | | |_|/ | |/| |
| | * | Fixed configure on Solaris.Rohan McGovern2010-08-021-1/+1
| | |/
* | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into 4.7-integ...Qt Continuous Integration System2010-08-029-41/+112
|\ \ \
| * | | QDesktopServices crashes when accessing the NULL X11 variableHurewitz Kevin2010-08-021-4/+8
| * | | Revert "Fix the byte order in QImage::fill for 24bpp formats"Olivier Goffart2010-08-023-66/+2
| * | | Merge branch '4.7' of git@scm.dev.nokia.troll.no:qt/oslo-staging-2 into 4.7Eskil Abrahamsen Blomfeldt2010-08-021-11/+37
| |\ \ \
| | * \ \ Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into 4.7-integ...Qt Continuous Integration System2010-08-029-38/+164
| | |\ \ \ | | | |/ / | | |/| |
| * | | | Fix crash when setting font decorations on text drawn with QStaticTextEskil Abrahamsen Blomfeldt2010-08-021-1/+6
| | |/ / | |/| |
| * | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into 4.7-integ...Qt Continuous Integration System2010-07-319-38/+164
| |\ \ \ | | |_|/ | |/| |
| | * | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into 4.7-integ...Qt Continuous Integration System2010-07-319-38/+164
| | |\ \
| | | * \ Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into 4.7-integ...Qt Continuous Integration System2010-07-309-38/+164
| | | |\ \
| | | | * | Fix tst_QPainter::drawImage_task258776Olivier Goffart2010-07-301-1/+1
| | | | * | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into 4.7-integ...Qt Continuous Integration System2010-07-299-37/+163
| | | | |\ \
| | | | | * | Fix the rendering of lines with the X11 paint engineBenjamin Poulain2010-07-292-12/+75
| | | | | * | Fix the byte order in QImage::fill for 24bpp formatsJohn Brooks2010-07-292-1/+65
| | | | | * | QScript: remove JSC::JSLockOlivier Goffart2010-07-291-4/+0
| | | | | * | QScript: document/obsolete things that does not work since the move to JSCOlivier Goffart2010-07-295-20/+23
* | | | | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-s60-public into 4.7-integr...Qt Continuous Integration System2010-08-0214-26/+125
|\ \ \ \ \ \ \
| * | | | | | | Fixed build break on Symbian versions earlier than S^3Gareth Stockwell2010-08-021-1/+1
| * | | | | | | Fixed qsymbianbearer.qtplugin exports in s60installs.proMiikka Heikkinen2010-08-021-2/+2
| * | | | | | | Enabled tst_mediaobject::testPlayFromResource on SymbianGareth Stockwell2010-08-021-4/+0
| * | | | | | | Added support to Phonon MMF backend for playback of Qt resource filesGareth Stockwell2010-08-0212-20/+123
| | |_|_|_|_|/ | |/| | | | |
* | | | | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7-integrationQt Continuous Integration System2010-08-0211-84/+288
|\ \ \ \ \ \ \ | |/ / / / / / |/| | | | | |
| * | | | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7Martin Jones2010-08-025-82/+227
| |\ \ \ \ \ \
| | * | | | | | State doc fixes, improvementsBea Lam2010-08-025-82/+227
| * | | | | | | Ensure currentItem is released when the delegate changesMartin Jones2010-08-022-0/+7
| * | | | | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7Martin Jones2010-08-025-1/+51
| |\ \ \ \ \ \ \ | | |/ / / / / /