summaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* Merge remote branch 'origin/4.6' into qt-4.7-from-4.6Olivier Goffart2010-05-17182-1109/+15785
|\
| * Merge branch '4.6' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.6-integ...Qt Continuous Integration System2010-05-172-0/+10
| |\
| | * re-add overriding of tool paths to configureOswald Buddenhagen2010-05-172-0/+10
| * | Merge branch '4.6' of scm.dev.nokia.troll.no:qt/qt-s60-public into 4.6-integr...Qt Continuous Integration System2010-05-144-9/+19
| |\ \
| | * \ Merge branch '4.6' of scm.dev.nokia.troll.no:qt/qt-s60-public into 4.6-integr...Qt Continuous Integration System2010-05-144-9/+19
| | |\ \ | |/ / /
| | * | Support linked fonts (.ltt) from standard font locations.Alessandro Portale2010-05-141-0/+1
| | * | Merge branch '4.6' of scm.dev.nokia.troll.no:qt/qt-s60-public into 4.6-integr...Qt Continuous Integration System2010-05-143-9/+18
| | |\ \
| | | * | QS60Style: In S60 3.x and 5.0 Qt itemviews behaviour is not nativelikeSami Merila2010-05-142-4/+11
| | | * | Fix anomaly demo control strip icon placementMiikka Heikkinen2010-05-141-5/+7
| * | | | Merge branch '4.6' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.6-integ...Qt Continuous Integration System2010-05-1416-52/+43
| |\ \ \ \ | | |/ / / | |/| | / | | | |/ | | |/|
| | * | fix regexpOswald Buddenhagen2010-05-141-1/+1
| | * | Merge branch '4.6' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.6-integ...Qt Continuous Integration System2010-05-1416-52/+43
| | |\ \ | |/ / /
| | * | fix path separators in install targets for MinGW+shJoerg Bornemann2010-05-141-1/+1
| | * | fix QMAKE_QMAKE path separator under mingw+sh in the qmake specOswald Buddenhagen2010-05-141-0/+1
| | * | define qtPrepareTool() function and use it throughoutOswald Buddenhagen2010-05-1412-50/+22
| | * | QNAM HTTP: And one more testcaseMarkus Goetz2010-05-141-0/+18
| | * | QNetworkAccessManager: Backends were tried in wrong orderMarkus Goetz2010-05-141-1/+1
| * | | Merge branch '4.6' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into 4.6-integ...Qt Continuous Integration System2010-05-142-11/+36
| |\ \ \
| | * | | Fix QUrl::isValid if the host contains invalid caracter.Olivier Goffart2010-05-142-9/+28
| | * | | QUrl: parsing of host name with an undercore.Olivier Goffart2010-05-142-2/+8
| * | | | Merge branch '4.6' of scm.dev.nokia.troll.no:qt/qt-multimedia-staging into 4....Qt Continuous Integration System2010-05-146-140/+1
| |\ \ \ \ | | |_|/ / | |/| | |
| | * | | Fixed race condition compiling xmlpatterns tests.Rohan McGovern2010-05-141-0/+1
| | * | | Remove qdbusserver from tests/auto/dbus.proRohan McGovern2010-05-141-1/+0
| | * | | Merge branch '4.6' of scm.dev.nokia.troll.no:qt/qt-multimedia-staging into 4....Qt Continuous Integration System2010-05-134-139/+0
| | |\ \ \ | |/ / / /
| | * | | Merge branch '4.6' of scm.dev.nokia.troll.no:qt/qt-multimedia-staging into 4....Qt Continuous Integration System2010-05-134-139/+0
| | |\ \ \ | | | |_|/ | | |/| |
| | | * | Merge branch '4.6' of scm.dev.nokia.troll.no:qt/qt-multimedia-staging into 4....Qt Continuous Integration System2010-05-134-139/+0
| | | |\ \ | | | | |/ | | | |/|
| | | | * Remove garbage test.Rohan McGovern2010-05-134-139/+0
| * | | | Merge branch '4.6' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.6-integ...Qt Continuous Integration System2010-05-133-0/+94
| |\ \ \ \ | | |/ / / | |/| | |
| | * | | QNAM HTTP: Preemptive anti crash if() statementMarkus Goetz2010-05-131-0/+3
| | * | | QNAM HTTP: More testcasesMarkus Goetz2010-05-132-0/+91
| * | | | Merge branch '4.6' of scm.dev.nokia.troll.no:qt/qt-s60-public into 4.6-integr...Qt Continuous Integration System2010-05-131-1/+5
| |\ \ \ \ | | |_|/ / | |/| | |
| | * | | Fixing compiling issues.Aleksandar Sasha Babic2010-05-131-1/+5
| * | | | Merge branch '4.6' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into 4.6-integ...Qt Continuous Integration System2010-05-123-8/+121
| |\ \ \ \ | | |/ / / | |/| | |
| | * | | OpenVG blending modes from VG_KHR_advanced_blending extensionRhys Weatherley2010-05-123-8/+121
| * | | | Merge branch '4.6' of scm.dev.nokia.troll.no:qt/qt-s60-public into 4.6-integr...Qt Continuous Integration System2010-05-121-4/+6
| |\ \ \ \ | | |/ / / | |/| | |
| | * | | Fix spurious mouse click when dismissing a native menuShane Kearns2010-05-121-4/+6
| * | | | Merge branch '4.6' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into 4.6-integ...Qt Continuous Integration System2010-05-122-5/+6
| |\ \ \ \ | | |/ / / | |/| | |
| | * | | Workaround for ATI driver bug when using QGraphicsEffect with GL.Kim Motoyoshi Kalland2010-05-122-5/+6
| * | | | Merge branch '4.6' of scm.dev.nokia.troll.no:qt/qt-s60-public into 4.6-integr...Qt Continuous Integration System2010-05-122-2/+2
| |\ \ \ \ | | |/ / / | |/| | |
| | * | | Fix wins def file for qtguiShane Kearns2010-05-121-1/+1
| | * | | Merge branch '4.6' of scm.dev.nokia.troll.no:qt/qt-s60-public into 4.6-integr...Qt Continuous Integration System2010-05-121-1/+1
| | |\ \ \
| | | * | | Compilation fix for Metrowerks compilerGareth Stockwell2010-05-121-1/+1
| * | | | | Merge branch '4.6' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into 4.6-integ...Qt Continuous Integration System2010-05-121-0/+3
| |\ \ \ \ \
| | * | | | | Fixed QFont to respect the italics constructor flag.Trond Kjernåsen2010-05-121-0/+3
| * | | | | | Merge branch '4.6' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.6-integ...Qt Continuous Integration System2010-05-121-0/+4
| |\ \ \ \ \ \ | | |_|/ / / / | |/| | | / / | | | |_|/ / | | |/| | |
| | * | | | fix install of default mkspec from shadow build under windowsOswald Buddenhagen2010-05-121-0/+4
| |/ / / /
| * | | | Merge branch '4.6' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.6-integ...Qt Continuous Integration System2010-05-121-1/+2
| |\ \ \ \ | | |_|/ / | |/| | |
| | * | | QNAM HTTP: Only force read when actual bytes availableMarkus Goetz2010-05-121-1/+2
| * | | | Merge branch '4.6' of scm.dev.nokia.troll.no:qt/qt-s60-public into 4.6-integr...Qt Continuous Integration System2010-05-121-1/+3
| |\ \ \ \ | | |_|_|/ | |/| | |
| | * | | Don't crash when applications set Qt::WA_TranslucentBackground.Jason Barron2010-05-121-1/+3