summaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-multimedia-staging into 4....Qt Continuous Integration System2010-06-166-0/+0
|\
| * Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-multimedia-staging into 4....Qt Continuous Integration System2010-06-166-0/+0
| |\
| | * Attribute change to allow inclusion of image files.Toby Tomkins2010-06-166-0/+0
* | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.7-integ...Qt Continuous Integration System2010-06-16144-4171/+6212
|\ \ \
| * \ \ Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.7-integ...Qt Continuous Integration System2010-06-15144-4171/+6212
| |\ \ \
| | * | | Use native locale aware string comparison on Symbian.Denis Dzyubenko2010-06-151-0/+4
| | * | | Temporary fix for regression in QSslCertificate::fromPath()Zeno Albisser2010-06-152-3/+11
| | * | | Merge branch '4.7' of git@scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.7Martin Smith2010-06-15264-1143/+3480
| | |\ \ \
| | | * | | Fix symbian building of TARGET with a slashThomas Zander2010-06-152-3/+3
| | | * | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.7-integ...Qt Continuous Integration System2010-06-15138-3792/+6089
| | | |\ \ \
| | | | * | | Fix a minor typo in QAbstractItemModel's documentation.Robin Burchell2010-06-141-1/+1
| | | | * | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.7-integ...Qt Continuous Integration System2010-06-14137-3791/+6088
| | | | |\ \ \
| | | | | * | | QXmlSchema: allow usage of xsd:allPeter Hartmann2010-06-142-0/+37
| | | | | * | | QSslSocket: fix build for MinGW and VS 2005Peter Hartmann2010-06-141-0/+4
| | * | | | | | doc: Added more DITA output to the XML generatorMartin Smith2010-06-154-446/+178
| | | |_|/ / / | | |/| | | |
| | * | | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.7-integ...Qt Continuous Integration System2010-06-14135-3791/+6047
| | |\ \ \ \ \
| | | * \ \ \ \ Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.7-integ...Qt Continuous Integration System2010-06-12135-3791/+6047
| | | |\ \ \ \ \
| | | | * | | | | Fix symbian-abld build failure with bearer pluginsMiikka Heikkinen2010-06-114-2/+4
| | | | * | | | | remove certificate bundlePeter Hartmann2010-06-113-1992/+0
| | | | * | | | | make QSslSocket::systemCaCertificates() use system certsPeter Hartmann2010-06-113-20/+138
| | | | * | | | | Adjusted RegExp in QSslCertificate::fromPath()Zeno Albisser2010-06-111-1/+1
| | | | * | | | | Fix QSystemTrayIcon::supportsMessages() on Windowsminiak2010-06-117-22/+31
| | | | * | | | | Use NIM_SETVERSION to get the latest behaviorminiak2010-06-111-16/+71
| | | | * | | | | Cleanup obsolete stuffminiak2010-06-112-58/+4
| | | | * | | | | Merge branch '4.7' of git@scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.7Martin Smith2010-06-11482-8230/+22567
| | | | |\ \ \ \ \
| | | | | * | | | | Fixed a broken merge.Denis Dzyubenko2010-06-112-66/+0
| | | | | * | | | | Changed the way we detect touch screen on Windows.Denis Dzyubenko2010-06-112-32/+36
| | | | | * | | | | Fixed error deploying qsymbianbearer.qtplugin on Symbian.Rohan McGovern2010-06-111-1/+1
| | | | | * | | | | Revert "Attempt to fix build failure on Symbian."Aaron McCarthy2010-06-111-2/+2
| | | | | * | | | | Attempt to fix build failure on Symbian.Aaron McCarthy2010-06-111-2/+2
| | | | | * | | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.7-integ...Qt Continuous Integration System2010-06-10114-868/+5026
| | | | | |\ \ \ \ \
| | | | | | * | | | | Replaced redundant "!contains" scopes in "contains(A, B) {...} !contains(A, B...Constantin Makshin2010-06-103-6/+3
| | | | | | * | | | | Updated leading whitespace to make indentation more consistentConstantin Makshin2010-06-103-3/+3
| | | | | | * | | | | Updated project files so it is now possible to use "-system-zlib" configurati...Constantin Makshin2010-06-1012-28/+52
| | | | | | * | | | | Merge remote branch 'mainline/4.7' into 4.7Oswald Buddenhagen2010-06-102-2/+3
| | | | | | |\ \ \ \ \
| | | | | | * | | | | | make postgresql support sensitive to PSQL_LIBSMark Brand2010-06-104-1/+8
| | | | | | * | | | | | support for cross building Qt for MinGW (win32-g++) on UnixMark Brand2010-06-1012-19/+241
| | | | | | * | | | | | use "win32-g++*" scope to match all MinGW makespecsMark Brand2010-06-1021-36/+34
| | | | | | * | | | | | Demos: Fix compilation with namespace.ck2010-06-101-1/+0
| | | | | | * | | | | | actually fix namespaced compileOswald Buddenhagen2010-06-101-2/+0
| | | | | | * | | | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.7-integ...Qt Continuous Integration System2010-06-1069-774/+4688
| | | | | | |\ \ \ \ \ \
| | | | | | | * \ \ \ \ \ Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.7-integ...Qt Continuous Integration System2010-06-0969-774/+4688
| | | | | | | |\ \ \ \ \ \
| | | | | | | | * | | | | | Attempt to fix build failure on Linux introduced by 09c6a81109Andreas Kling2010-06-091-3/+2
| | | | | | | | * | | | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.7-integ...Qt Continuous Integration System2010-06-0969-774/+4689
| | | | | | | | |\ \ \ \ \ \
| | | | | | | | | * | | | | | minor cosmetic improvementsMark Brand2010-06-091-2/+2
| | | | | | | | | * | | | | | designer: add sorting in signal-slot editor windowMarek Wieckowski2010-06-092-3/+9
| | | | | | | | | * | | | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.7-integ...Qt Continuous Integration System2010-06-0967-769/+4678
| | | | | | | | | |\ \ \ \ \ \
| | | | | | | | | | * | | | | | deprecate header files in $$QT_BUILD_TREE/include/QtJoerg Bornemann2010-06-081-4/+26
| | | | | | | | | | * | | | | | syncqt: change tabs to spacesJoerg Bornemann2010-06-081-376/+376
| | | | | | | | | | * | | | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.7-integ...Qt Continuous Integration System2010-06-0866-392/+4279
| | | | | | | | | | |\ \ \ \ \ \