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-1132-8750/+3254
|\
| * Fix some #ifdefs to compile for a specific combination of featuress that was ...Trever Fischer2010-08-111-0/+6
| * update Russian translations for Qt and toolsRitt Konstantin2010-08-118-4911/+305
| * Updated Slovenian translations for Qt 4.7Jure Repinc2010-08-112-3662/+2478
| * Merge branch '4.7' of git@scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.7Martin Smith2010-08-1112-150/+347
| |\
| | * 64-bit versions of PREMUL, BYTE_MUL and INTERPOLATE_PIXEL_256Andreas Kling2010-08-111-73/+67
| | * QXmlStreamReader: avoid unnecessary detachingPeter Hartmann2010-08-111-1/+1
| | * QSslCertificate: support expiration dates > 2049Peter Hartmann2010-08-113-50/+101
| | * Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.7David Boddie2010-08-11245-9474/+18075
| | |\
| | | * Doc: Fixing typoMorten Engvoldsen2010-08-111-1/+1
| | | * Doc: Fixing bug involving header misplacement in Creator styleMorten Engvoldsen2010-08-111-2/+2
| | * | qdoc: Ensured that text is encoded correctly.David Boddie2010-08-101-9/+9
| | * | qdoc: Fixed non-well-formed markup.David Boddie2010-08-092-14/+13
| | * | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.7David Boddie2010-08-0585-348/+2415
| | |\ \
| | * \ \ Merge commit 'refs/merge-requests/2443' of git://gitorious.org/qt/qt into int...David Boddie2010-08-052-5/+4
| | |\ \ \
| | | * | | Remove useless QString::clear() from QSharedData example snippet.Robin Burchell2010-07-271-1/+1
| | | * | | Move note on connectToBus() not actually being able to reconnect toRobin Burchell2010-07-271-4/+3
| | * | | | Doc: Fixed typo in a shortcut string.David Boddie2010-08-041-1/+1
| | * | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.7David Boddie2010-08-04909-8752/+29584
| | |\ \ \ \
| | * | | | | Doc: Added more license information.David Boddie2010-07-162-8/+161
| * | | | | | doc: The QML Qt element was missing from the documentation.Martin Smith2010-08-112-3/+5
| | |_|_|_|/ | |/| | | |
| * | | | | Merge branch '4.7' of git@scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.7Martin Smith2010-08-1118-46/+55
| |\ \ \ \ \
| * | | | | | qdoc: Added list of all members (including inherited) page to QML elements.Martin Smith2010-08-118-24/+113
* | | | | | | Merge branch 'qt-4.7-from-4.6' of scm.dev.nokia.troll.no:qt/qt-integration in...Qt Continuous Integration System2010-08-1111-28/+437
|\ \ \ \ \ \ \
| * \ \ \ \ \ \ Merge remote branch 'origin/4.6' into qt-4.7-from-4.6Thiago Macieira2010-08-1111-28/+437
| |\ \ \ \ \ \ \
| | * \ \ \ \ \ \ Merge branch '4.6' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.6-integ...Qt Continuous Integration System2010-08-113-4/+70
| | |\ \ \ \ \ \ \
| | | * | | | | | | QSslSocket: fix security vulnerability with wildcard IP addressesPeter Hartmann2010-08-102-0/+7
| | | * | | | | | | fix build for -no-qt3supportPeter Hartmann2010-08-101-2/+2
| | | * | | | | | | Fix handling of SSL certificates with wildcard domain namesRichard J. Moore2010-08-103-4/+63
| | * | | | | | | | Merge branch '4.6' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.6-integ...Qt Continuous Integration System2010-08-101-1/+1
| | |\ \ \ \ \ \ \ \ | | | |/ / / / / / /
| | | * | | | | | | Doc: typo fixed in qlibraryinfo.cppJoerg Bornemann2010-08-091-1/+1
| | |/ / / / / / /
| | * | | | | | | Merge branch '4.6' of scm.dev.nokia.troll.no:qt/qt-s60-public into 4.6-integr...Qt Continuous Integration System2010-08-066-17/+398
| | |\ \ \ \ \ \ \
| | | * | | | | | | Fixes for combining multiple Qt::ImhXXXOnly with S60 FEPShane Kearns2010-08-061-22/+30
| | | * | | | | | | fix compile errorShane Kearns2010-08-061-1/+1
| | | * | | | | | | Test code for input method hintsShane Kearns2010-08-065-0/+366
| | | * | | | | | | Make input methods work correctly with Symbian^3 FEP in numeric modeShane Kearns2010-08-061-6/+13
| | |/ / / / / / /
| | * | | | | | | Merge branch '4.6' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.6-integ...Qt Continuous Integration System2010-08-055-3/+47
| | |\ \ \ \ \ \ \
| | | * | | | | | | Updated WebKit from /home/shausman/src/webkit/trunk to qtwebkit/qtwebkit-4.6 ...Simon Hausmann2010-08-055-3/+47
| | |/ / / / / / /
| | * | | | | | | Merge branch '4.6' of scm.dev.nokia.troll.no:qt/qt-s60-public into 4.6-integr...Qt Continuous Integration System2010-08-041-3/+7
| | |\ \ \ \ \ \ \
| | | * | | | | | | Improving text coordinate rounding in the OpenVG paint engineAlessandro Portale2010-08-041-3/+7
| | * | | | | | | | Merge branch '4.6' of scm.dev.nokia.troll.no:qt/qt-s60-public into 4.6-integr...Qt Continuous Integration System2010-08-031-3/+13
| | |\ \ \ \ \ \ \ \ | | | |/ / / / / / /
| | | * | | | | | | Add QDir::homePath() for the log file in QTestFileLogger in testlib on Symbia...Liang Qi2010-08-031-3/+13
| | * | | | | | | | Merge branch '4.6' of scm.dev.nokia.troll.no:qt/qt-s60-public into 4.6-integr...Qt Continuous Integration System2010-08-0313-23/+126
| | |\ \ \ \ \ \ \ \ | | | |/ / / / / / /
| | | * | | | | | | Fixed test regression on MacGareth Stockwell2010-08-031-0/+5
| | | * | | | | | | Merge branch '4.6' of scm.dev.nokia.troll.no:qt/qt-s60-public into 4.6-integr...Qt Continuous Integration System2010-08-0313-26/+124
| | | |\ \ \ \ \ \ \ | | |/ / / / / / / /
| | | * | | | | | | Merge branch '4.6' of scm.dev.nokia.troll.no:qt/qt-s60-public into 4.6-integr...Qt Continuous Integration System2010-08-0313-26/+124
| | | |\ \ \ \ \ \ \
| | | | * | | | | | | Fixed build break on Symbian versions earlier than S^3Gareth Stockwell2010-08-021-1/+1
| | | | * | | | | | | Enabled tst_mediaobject::testPlayFromResource on SymbianGareth Stockwell2010-08-021-18/+2
| | | | * | | | | | | Added support to Phonon MMF backend for playback of Qt resource filesGareth Stockwell2010-08-023-9/+9
| | | | * | | | | | | Updated tst_mediaobject resource playback test casesGareth Stockwell2010-08-021-6/+17