summaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* respect UI_DIR when creating image collectionsOswald Buddenhagen2010-07-081-6/+6
* Merge branch '4.7' of git@scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.7Martin Smith2010-07-087-894/+54
|\
| * Doc: more cleaningMorten Engvoldsen2010-07-081-24/+3
| * Doc: fixing escape characterMorten Engvoldsen2010-07-081-1/+1
| * Doc: cleaning html generatorMorten Engvoldsen2010-07-081-26/+0
| * Doc: changing index pageMorten Engvoldsen2010-07-084-856/+62
| * Doc: fixing link to devnetMorten Engvoldsen2010-07-081-1/+1
| * Doc: adding HTML class names and style docs to the generatorMorten Engvoldsen2010-07-081-32/+34
| * Doc: Fixing typo - background file nameMorten Engvoldsen2010-07-081-1/+1
| * Doc: Fixing broken linkMorten Engvoldsen2010-07-081-1/+1
| * Doc: fixing typoMorten Engvoldsen2010-07-081-3/+2
| * Doc: fixing typosMorten Engvoldsen2010-07-082-3/+3
* | doc: Added doc for accessing views and models from delegates.Martin Smith2010-07-081-0/+73
|/
* Merge branch '4.7' of git@scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.7Martin Smith2010-07-089-36/+78
|\
| * SSL backend: load libraries for certificates only oncePeter Hartmann2010-07-073-29/+30
| * immediately set function context when entering a namespaceOswald Buddenhagen2010-07-073-1/+46
| * Phonon MediaSource fails to load when passed as a resource fileJens Bache-Wiig2010-07-072-3/+2
| * Set QT_DEFAULT_TEXTURE_GLYPH_CACHE_WIDTH to default valueAdrian Constantin2010-07-071-3/+0
* | qdoc: Fixed table of contents for namespace pages.Martin Smith2010-07-081-1/+2
|/
* Merge branch '4.7' of git@scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.7Martin Smith2010-07-0725-232/+164
|\
| * Simplify *= to += after contains() testMark Brand2010-07-078-14/+14
| * Consolidate sql driver configuration redundancyMark Brand2010-07-0720-221/+126
| * Fixed whitespace formattingMark Brand2010-07-079-9/+9
| * run dep commands in build dirOswald Buddenhagen2010-07-075-2/+29
* | qdoc: Fixed a few links to QtObject (QML:QtObject)Martin Smith2010-07-075-20/+14
|/
* Merge branch '4.7' of git@scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.7Martin Smith2010-07-074-2/+83
|\
| * Add missing API shimsKent Hansen2010-07-073-0/+39
| * I18n: Complete German translation for 4.7.0Friedemann Kleint2010-07-071-2/+44
* | qdoc: Removed a lot of dead code to minimize confusion.Martin Smith2010-07-072-234/+1
|/
* Merge branch '4.7' of git@scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.7Martin Smith2010-07-0717-107/+407
|\
| * Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.7-integ...Qt Continuous Integration System2010-07-0616-463/+299
| |\
| | * fix autotestOswald Buddenhagen2010-07-061-0/+5
| | * Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.7-integ...Qt Continuous Integration System2010-07-0615-463/+294
| | |\
| | | * Adapt the TapAndHold recognizer to non-touch tooThomas Zander2010-07-061-23/+40
| | | * add setNativeArguments() and nativeArguments()Oswald Buddenhagen2010-07-069-8/+129
| | | * fix bogus return value from qprocess::execute()Oswald Buddenhagen2010-07-062-4/+19
| * | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-s60-public into 4.7-integr...Qt Continuous Integration System2010-07-063-1/+199
| |\ \ \ | | |/ / | |/| |
| | * | Support QSslSocket::systemCaCertificates() on SymbianSimon Hausmann2010-07-063-1/+199
| * | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-s60-public into 4.7-integr...Qt Continuous Integration System2010-07-063-71/+15
| |\ \ \ | | |/ /
| | * | Spectrum demo: fixed installationGareth Stockwell2010-07-062-10/+11
| | * | Spectrum build: fixed DLL rpathGareth Stockwell2010-07-062-60/+3
| |/ /
* | | qdoc: Fixed the case where the property and type names are the same.Martin Smith2010-07-0714-50/+61
| |/ |/|
* | Merge branch '4.7' of git@scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.7Martin Smith2010-07-068-24/+123
|\ \
| * | Doc: fixing img styleMorten Engvoldsen2010-07-061-2/+9
| |/
| * Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-s60-public into 4.7-integr...Qt Continuous Integration System2010-07-054-4/+41
| |\
| | * Support time zone designator in QDateTime::fromString() based on ISO 8601-200...Liang Qi2010-07-054-4/+41
| * | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.7-integ...Qt Continuous Integration System2010-07-0511-36/+161
| |\ \
| | * | Set the registration time while using the collection generator to register.kh12010-07-051-0/+2
| | * | Network: Optimize HTTP proxy lookup on WindowsMarkus Goetz2010-07-051-5/+32
| * | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into 4.7-integ...Qt Continuous Integration System2010-07-051-13/+39
| |\ \ \ | | |_|/ | |/| |