summaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into 4.7-integ...Qt Continuous Integration System2011-01-141-3/+2
|\
| * Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into 4.7-integ...Qt Continuous Integration System2011-01-131-3/+2
| |\
| | * Proper fix for QGraphicsItem crash.Yoann Lopes2011-01-131-3/+2
* | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-s60-public into 4.7-integr...Qt Continuous Integration System2011-01-133-10/+25
|\ \ \ | |/ / |/| |
| * | Fix QSharedMemory and QSystemSemaphore autotests for SymbianMiikka Heikkinen2011-01-132-6/+9
| * | Fix QSystemSemaphore handle management issues in SymbianMiikka Heikkinen2011-01-131-4/+16
* | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7-integrationQt Continuous Integration System2011-01-136-4/+42
|\ \ \
| * | | Fix doc typoAlan Alpert2011-01-131-2/+2
| * | | Document centerIn and fill in the anchors docsAlan Alpert2011-01-131-0/+3
| * | | Document level of support for QGraphicsObject propertiesAlan Alpert2011-01-131-0/+9
| * | | Add an autotest for QVariant method paramsAaron Kennedy2011-01-132-0/+18
| * | | Don't crash Qt Creator when debugging an object aliasAaron Kennedy2011-01-131-1/+1
| * | | Consistent DocsAlan Alpert2011-01-131-3/+11
| | |/ | |/|
* | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-s60-public into 4.7-integr...Qt Continuous Integration System2011-01-1327-43/+460
|\ \ \ | |/ / |/| / | |/
| * Fixed build failure on platforms other than SymbianGareth Stockwell2011-01-121-2/+8
| * Fix corelib def files.Miikka Heikkinen2011-01-122-0/+2
| * Fix qglthreads test crash on SymbianJani Hautakangas2011-01-121-2/+18
| * Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-s60-public into 4.7-integr...Qt Continuous Integration System2011-01-1124-41/+434
| |\ |/ /
| * Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-s60-public into 4.7-integr...Qt Continuous Integration System2011-01-1124-41/+434
| |\
| | * Remove sqlite3_selfsigned.sis as it is no longer usable or needed.Miikka Heikkinen2011-01-112-2/+1
| | * Allow use of command line parameters with RApaLsSession::StartApp.Miikka Heikkinen2011-01-115-25/+95
| | * Fixed resource leak in Phonon MMF backendRuth Sadler2011-01-111-0/+2
| | * Allow IAP to be selected in Phonon MMF backendRuth Sadler2011-01-1117-14/+336
* | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.7-integ...Qt Continuous Integration System2011-01-112-2/+2
|\ \ \ | |/ / |/| |
| * | rebuild configureOswald Buddenhagen2011-01-111-0/+0
| * | Doc: Fixed a few misspellings of FlipableThorbjørn Lindeijer2011-01-111-2/+2
|/ /
* | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.7-integ...Qt Continuous Integration System2011-01-112-2/+5
|\ \ | |/ |/|
| * Install each test in a separate directoryAdrian Constantin2011-01-111-1/+1
| * Do not override the target path if already definedLucian Varlan2011-01-111-1/+4
| * Attempt to cure my pathological inability to type the word "package".Jason McDonald2011-01-111-1/+1
* | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-s60-public into 4.7-integr...Qt Continuous Integration System2011-01-111-2/+2
|\ \
| * | OpenVG paint engine doesn't draw glyphs well to non-integer offsets.Jani Hautakangas2011-01-111-2/+2
* | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into 4.7-integ...Qt Continuous Integration System2011-01-111-1/+4
|\ \ \ | |/ / |/| |
| * | QTextCodec::codecForMib: actually use the cacheOlivier Goffart2011-01-111-1/+4
|/ /
* | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.7-integ...Qt Continuous Integration System2011-01-114-585/+20
|\ \ | |/
| * Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.7Lorn Potter2011-01-111-4/+4
| |\ | |/ |/|
* | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into 4.7-integ...Qt Continuous Integration System2011-01-101-4/+4
|\ \
| * | Update QTextOdfWriter test case to match actual (correct) outputBrad Hards2011-01-101-4/+4
| | * Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.7Lorn Potter2011-01-117-9/+56
| | |\ | |_|/ |/| |
* | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.7-integ...Qt Continuous Integration System2011-01-1010434-10534/+10537
|\ \ \
* \ \ \ Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-s60-public into 4.7-integr...Qt Continuous Integration System2011-01-105-3/+54
|\ \ \ \
| * | | | Setting WA_TranslucentBackground after winid() is ineffective on Symbian.Jani Hautakangas2011-01-103-1/+12
| * | | | Fix handle leak in symbian QTimer implementationShane Kearns2011-01-102-2/+42
* | | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into 4.7-integ...Qt Continuous Integration System2011-01-102-6/+2
|\ \ \ \ \ | |/ / / / |/| | / / | | |/ / | |/| |
| * | | Merge branch 'graphics-team-text-4.7' into 4.7Eskil Abrahamsen Blomfeldt2011-01-102-6/+2
| |\ \ \ |/ / / /
| * | | Fix crash in QTextBlock::next()/previous()Jiang Jiang2011-01-071-2/+2
| * | | Fix regression in text rendering in OpenGL2 engineEskil Abrahamsen Blomfeldt2011-01-051-4/+0
| | | * Merge commit 'refs/merge-requests/959' of git://gitorious.org/qt/qt into inte...Lorn Potter2011-01-114-585/+20
| | | |\ | | |/ /
| | | * Fix ConnMan bearer plugin to use new net.connman service name.Leena Gunda2010-12-094-585/+20
| | * | QFont/Windows: restrict the pixel size accuracyJoerg Bornemann2011-01-101-1/+1