summaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt into qt-4.7-from-4.6Simon Hausmann2010-06-1641-466/+540
|\
| * 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
| | |\
| | | * 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/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 'qt-4.7-from-4.6' of scm.dev.nokia.troll.no:qt/qt-integration in...Qt Continuous Integration System2010-06-1517-85/+271
|\ \ \ \ \ \ \ \ | |/ / / / / / / |/| | | | | | |
| * | | | | | | Merge branch '4.6' of scm.dev.nokia.troll.no:qt/qt into qt-4.7-from-4.6Simon Hausmann2010-06-156-19/+59
| |\ \ \ \ \ \ \
| | * \ \ \ \ \ \ Merge branch '4.6' of scm.dev.nokia.troll.no:qt/qt-multimedia-staging into 4....Qt Continuous Integration System2010-06-153-5/+4
| | |\ \ \ \ \ \ \
| | | * | | | | | | Fixed unit test failure in qimagereader.Kurt Korbatits2010-06-152-3/+3
| | | * | | | | | | Merge branch '4.6' of scm.dev.nokia.troll.no:qt/qt-multimedia-staging into 4....Qt Continuous Integration System2010-06-142-2/+1
| | | |\ \ \ \ \ \ \ | | |/ / / / / / / /
| | | * | | | | | | Merge branch '4.6' of scm.dev.nokia.troll.no:qt/qt-multimedia-staging into 4....Qt Continuous Integration System2010-06-142-2/+1
| | | |\ \ \ \ \ \ \
| | | | * \ \ \ \ \ \ Merge branch '4.6' of scm.dev.nokia.troll.no:qt/qt-multimedia-staging into 4....Qt Continuous Integration System2010-06-122-2/+1
| | | | |\ \ \ \ \ \ \
| | | | | * \ \ \ \ \ \ Merge branch '4.6' of scm.dev.nokia.troll.no:qt/qt-multimedia-staging into 4....Qt Continuous Integration System2010-06-122-2/+1
| | | | | |\ \ \ \ \ \ \
| | | | | | * \ \ \ \ \ \ Merge branch '4.6' of scm.dev.nokia.troll.no:qt/qt-multimedia-staging into 4....Qt Continuous Integration System2010-06-122-2/+1
| | | | | | |\ \ \ \ \ \ \
| | | | | | | * \ \ \ \ \ \ Merge branch '4.6' of scm.dev.nokia.troll.no:qt/qt-multimedia-staging into 4....Qt Continuous Integration System2010-06-102-2/+1
| | | | | | | |\ \ \ \ \ \ \
| | | | | | | | * \ \ \ \ \ \ Merge branch '4.6' of scm.dev.nokia.troll.no:qt/qt-multimedia-staging into 4.6Kurt Korbatits2010-06-10155-1611/+280760
| | | | | | | | |\ \ \ \ \ \ \
| | | | | | | | | * \ \ \ \ \ \ Merge branch '4.6' of scm.dev.nokia.troll.no:qt/qt-multimedia-staging into 4....Qt Continuous Integration System2010-06-101-1/+1
| | | | | | | | | |\ \ \ \ \ \ \
| | | | | | | | * | | | | | | | | Regression Qt4.4: QMovie does not render properly some mng filesKurt Korbatits2010-06-101-1/+0
| | | | | | | | | |/ / / / / / / | | | | | | | | |/| | | | | | |
| | | | | | | | * | | | | | | | QMovie cpu usage up to 100%Kurt Korbatits2010-06-101-1/+1
| | * | | | | | | | | | | | | | Merge branch '4.6' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.6-integ...Qt Continuous Integration System2010-06-142-10/+52
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | |/ / / / / / / / / / / / / | | |/| | | | | | | | | | | | |
| | | * | | | | | | | | | | | | beautify tst_QLocalSocket::writeToClientAndDisconnectJoerg Bornemann2010-06-141-9/+2
| | | * | | | | | | | | | | | | QLocalSocket/Win: check for broken pipe in waitForReadyReadJoerg Bornemann2010-06-142-0/+28
| | | * | | | | | | | | | | | | QLocalSocket/Win: call close on async connection lossJoerg Bornemann2010-06-142-1/+22
| | * | | | | | | | | | | | | | Merge branch '4.6' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.6-integ...Qt Continuous Integration System2010-06-141-4/+3
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | |/ / / / / / / / / / / / / | | | | / / / / / / / / / / / / | | | |/ / / / / / / / / / / / | | |/| | | | | | | | | | | |
| | | * | | | | | | | | | | | fix detection of header filesDavid Fries2010-06-141-4/+3
| * | | | | | | | | | | | | | Merge branch 'qt-4.7-from-4.6' of scm.dev.nokia.troll.no:qt/qt-integration in...Qt Continuous Integration System2010-06-1413-75/+221
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |_|_|_|_|_|_|_|_|_|_|_|_|/ | |/| | | | | | | | | | | | |
| | * | | | | | | | | | | | | Merge branch 'qt-4.7-from-4.6' of scm.dev.nokia.troll.no:qt/qt-integration in...Qt Continuous Integration System2010-06-1413-75/+221
| | |\ \ \ \ \ \ \ \ \ \ \ \ \
| | | * | | | | | | | | | | | | Prospective S60 build fixSimon Hausmann2010-06-132-4/+4
| | | * | | | | | | | | | | | | Merge branch '4.6' of scm.dev.nokia.troll.no:qt/qt into qt-4.7-from-4.6Simon Hausmann2010-06-1312-71/+217
| | | |\ \ \ \ \ \ \ \ \ \ \ \ \ | | | | |/ / / / / / / / / / / /