summaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* Fixed compile.Rohan McGovern2009-08-141-1/+1
* Merge branch 'master' of git@scm.dev.nokia.troll.no:qt/qtDavid Boddie2009-08-149-69/+206
|\
| * Autotest for correct word wrapping on text next to floating objectEskil Abrahamsen Blomfeldt2009-08-141-0/+39
| * Avoid wrapping outside word boundaries in QTextDocument unless necessaryEskil Abrahamsen Blomfeldt2009-08-141-9/+10
| * Reimplement qSwap and Q_DECLARE_SHARED differently.Thiago Macieira2009-08-146-41/+92
| * Perform license checks on source files.Frans Englich2009-08-141-19/+65
* | Doc: Removed claims that QDialog supports border style sheet settings.David Boddie2009-08-141-3/+3
|/
* Merge branch 'master' of git@scm.dev.nokia.troll.no:qt/qtDavid Boddie2009-08-14357-8753/+20007
|\
| * QVariant: more work on avoinding conversion between float and doublesThierry Bastian2009-08-145-16/+16
| * Fixed Coverity defect CID 1528.Gabriel de Dietrich2009-08-141-1/+1
| * Removing some unused variables.Alessandro Portale2009-08-146-16/+0
| * QCssParser: reordering initializers to match declarationThierry Bastian2009-08-141-1/+1
| * Fixed coverity warningsThierry Bastian2009-08-1416-37/+26
| * QVariant: added toFloat and toRealThierry Bastian2009-08-1414-48/+90
| * Set the QMAKE_BUNDLE_LOCATION to 'Contents/MacOS' only if it's not setTor Arne Vestbø2009-08-141-1/+1
| * Cocoa: Fix several issues with the event dispatcherRichard Moe Gustavsen2009-08-146-193/+308
| * Our modifications to freetypeHarald Fernengel2009-08-148-23/+292
| * Add freetype 2.3.9Harald Fernengel2009-08-14661-0/+292236
| * Deleted freetype 2.3.6Harald Fernengel2009-08-14650-282668/+0
| * Simplify WebKit import into src/3rdparty/webkitSimon Hausmann2009-08-141-2/+2
| * QTextFormat: better use QVariant::userType over QVariant::typeThierry Bastian2009-08-141-15/+15
| * Fix WebKit import into src/3rdparty/webkitSimon Hausmann2009-08-141-0/+3
| * Fix trailing space in snippet file for gesture documentation.Peter Yard2009-08-141-1/+1
| * Gesture Overview DocumentationPeter Yard2009-08-145-0/+1163
| * Make Qt::NoGesture visible. Needed for QGesture subclassing.Peter Yard2009-08-141-1/+1
| * Add stringbuilder auto test to auto.prohjk2009-08-141-0/+1
| * Fix MLS testWarwick Allison2009-08-141-1/+2
| * spelWarwick Allison2009-08-144-14/+14
| * Merge branch 'master' of git@scm.dev.nokia.troll.no:qt/qtWarwick Allison2009-08-147993-16559/+24002
| |\
| | * qmake's include function now supports three argumentsKeith Isdale2009-08-141-2/+4
| | * Fixed audio auto tests.Kurt Korbatits2009-08-134-129/+229
| | * Removed a few bogus includesAlessandro Portale2009-08-133-11/+0
| | * Compile fix.Alessandro Portale2009-08-131-1/+1
| * | QT_NO_URL_CAST_FROM_STRING, like QT_NO_CAST_FROM_ASCIIWarwick Allison2009-08-142-0/+28
| * | Merge branch 'master' of git@scm.dev.nokia.troll.no:qt/qtWarwick Allison2009-08-10536-4513/+25163
| |\ \
| * \ \ Merge branch 'master' of git@scm.dev.nokia.troll.no:qt/qtWarwick Allison2009-08-0491-1030/+1495
| |\ \ \
| * \ \ \ Merge branch 'master' of git@scm.dev.nokia.troll.no:qt/qtWarwick Allison2009-08-03103-883/+1758
| |\ \ \ \
| * \ \ \ \ Merge branch 'master' of git@scm.dev.nokia.troll.no:qt/qtWarwick Allison2009-08-031-3/+3
| |\ \ \ \ \
| * \ \ \ \ \ Merge branch 'master' of git@scm.dev.nokia.troll.no:qt/qtWarwick Allison2009-08-0256-198/+1328
| |\ \ \ \ \ \
| * \ \ \ \ \ \ Merge branch 'master' of git@scm.dev.nokia.troll.no:qt/qtWarwick Allison2009-07-312605-204646/+70134
| |\ \ \ \ \ \ \
| * \ \ \ \ \ \ \ Merge branch 'master' of git@scm.dev.nokia.troll.no:qt/qtWarwick Allison2009-07-17425-1632/+45930
| |\ \ \ \ \ \ \ \
| * | | | | | | | | unwarnWarwick Allison2009-07-171-1/+1
* | | | | | | | | | Doc: Included type information for the Qt::ItemDataRole enum.David Boddie2009-08-142-17/+24
| |_|_|_|_|_|_|_|/ |/| | | | | | | |
* | | | | | | | | Merge branch 'master' of git@scm.dev.nokia.troll.no:qt/qtDavid Boddie2009-08-1362-681/+2382
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | remove unneeded distinction between Windows and Windows CERitt Konstantin2009-08-131-5/+1
| * | | | | | | | | create world TRUSTEE only once in QFSFileEngine (Win)Ritt Konstantin2009-08-131-22/+23
| * | | | | | | | | use BuildTrusteeWithSid instead of BuildTrusteeWithNameRitt Konstantin2009-08-131-52/+13
| * | | | | | | | | remove needless resolvings in qfsfileengine_win.cppRitt Konstantin2009-08-131-53/+31
| * | | | | | | | | Fix build, by adjusting according to how test QProcess is.Frans Englich2009-08-131-1/+16
| * | | | | | | | | Fix coverity warningsThierry Bastian2009-08-134-7/+8