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-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
| | | | | | | |\ \
| | | | | | | | * | I10n: Update German translations for 4.7.0Friedemann Kleint2010-06-081-224/+253
| | | | | | | | * | Fix a freetype link failure.Anders Bakken2010-06-081-1/+2
| | | | | | | | * | Fix configure test for DirectFBAnders Bakken2010-06-081-8/+6
| | | | | | | | * | Split Symbian bearer plugin into three platform specfic pluginsAaron McCarthy2010-06-087-47/+81
| | | | | | | | * | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.7-integ...Qt Continuous Integration System2010-06-0856-112/+3937
| | | | | | | | |\ \
| | | | | | | | | * | Doc: Fixed whitespace in the other configuration file for zh_CN.David Boddie2010-06-071-22/+22
| | | | | | | | | * | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.7David Boddie2010-06-079-10/+105
| | | | | | | | | |\ \
| | | | | | | | | | * | Unbreak Linux build when qendian.h is included before qglobal.hAndreas Kling2010-06-071-0/+1
| | | | | | | | | | * | Revert accidental commit of irrelevant stuff. Silly mondays..Andreas Kling2010-06-075-38/+28
| | | | | | | | | | * | Unbreak Linux build when qendian.h is included before qglobal.hAndreas Kling2010-06-075-28/+38
| | | | | | | | | | * | Merge branch '4.7' of git@scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.7-s...Denis Dzyubenko2010-06-07375-7220/+21922
| | | | | | | | | | |\ \
| | | | | | | | | | * | | Fix QApplication/QWidget to really take ownership of input contextsMichael Hasselmann2010-06-074-7/+21
| | | | | | | | | | * | | Added setting a hotspot on standard gesturesDenis Dzyubenko2010-06-071-0/+3
| | | | | | | | | | * | | Fixed GestureOverride event delivery in GraphicsView.Denis Dzyubenko2010-06-072-1/+74
| | | | | | | | | | * | | Reset gesture when in MayBeGesture state.Denis Dzyubenko2010-06-021-2/+6
| | | | | | | | | * | | | Doc: Fixed whitespace in the Simplified Chinese doc configuration.David Boddie2010-06-071-26/+26