summaryrefslogtreecommitdiffstats
path: root/src/3rdparty
Commit message (Expand)AuthorAgeFilesLines
* Merge branch '4.6' of git@scm.dev.nokia.troll.no:qt/qt into kinetic-declarati...Michael Brasser2009-10-251359-45303/+94012
|\
| * Correct line ending chars imported from webkit.Jocelyn Turcotte2009-10-232-107/+107
| * Doc: Fixed and synchronized QWebView related documentation.David Boddie2009-10-232-7/+91
| * fix line endingOswald Buddenhagen2009-10-231-1/+1
| * Temporary fix in qt.git to allow build on s60.Jocelyn Turcotte2009-10-221-1/+3
| * Temporary fix in qt.git to allow build on s60.Jocelyn Turcotte2009-10-221-0/+5
| * Re-apply change 0f8bff1970d4b0f10e98ce7d6ab341620f4ce76b by Martin SmithMartin Smith2009-10-221-1/+1
| * Re-apply change 8e0fbc2caa3edefb78d6667721235b783bc1a850 by IainIain2009-10-221-0/+13
| * Re-apply change 6b8ac349b9a477863a8c8388dcc0658f3284bc54 by Jocelyn TurcotteJocelyn Turcotte2009-10-221-2/+6
| * Updated WebKit from /home/jturcott/dev/webkit/ to qtwebkit-4.6-snapshot-22102...Jocelyn Turcotte2009-10-221270-11675/+33732
| * Qt patches to libpng sources.aavit2009-10-221-2/+12
| * Upgrade libpng to version 1.2.40aavit2009-10-2286-3626/+6428
| * VXWorks changes.Bill King2009-10-211-5/+24
| * Fixes: WebKit Windows CE buildBill King2009-10-211-1/+1
| * Trolltech modifications to SQLite.Bill King2009-10-211-2/+17
| * Update sqlite to 3.6.19Bill King2009-10-212-30056/+53754
| * Fix bug introduced by cleanup commit.Frans Englich2009-10-201-2/+0
| * Merge branch 'mmfphonon' into 4.6Frans Englich2009-10-202-3/+5
| |\
| | * Does not disable full screen when end of video playlist is reached.Frans Englich2009-10-191-1/+1
| | * Kill warning, simplify code.Frans Englich2009-10-161-2/+4
* | | Merge branch '4.6' of git@scm.dev.nokia.troll.no:qt/qt into kinetic-declarati...Michael Brasser2009-10-1932-395/+660
|\ \ \ | |/ /
| * | doc: Changed Trolltech to NokiaMartin Smith2009-10-161-1/+1
| |/
| * Replace tabs with whitespace.Frans Englich2009-10-155-65/+65
| * sed -i -e 's/for(/for (/g' `find -name "*.cpp" -or -name "*.h" -or -nameFrans Englich2009-10-154-5/+5
| * sed -i -e 's/if(/if (/g' `find -name "*.cpp" -or -name "*.h" -or -nameFrans Englich2009-10-157-45/+45
| * Use QT_NO_DEBUG, not _DEBUG.Frans Englich2009-10-154-9/+9
| * Remove trailing whitespace.Frans Englich2009-10-157-108/+108
| * Merge commit 'origin/4.6' into mmfphononFrans Englich2009-10-1511-12/+168
| |\
| | * Temporary workaround to get WebKit to pick up DEF file from std locationIain2009-10-131-0/+13
| | * Re-applying commit ee0a43fee20cc398b505eb65218ebed56dfc8f39Jocelyn Turcotte2009-10-131-2/+6
| | * 2009-10-09 Joe Ligman <joseph.ligman@nokia.com>Joe Ligman2009-10-117-5/+116
| | * Fix compilation with aCC 6: this compiler has broken for scopingThiago Macieira2009-10-091-0/+5
| | * Fix compilation with aCC 6: cannot redefine a variable in the same scopeThiago Macieira2009-10-091-1/+1
| | * Conservative fix for link error with ARM RVCT compiler on symbian sbsv2Shane Kearns2009-10-081-4/+19
| | * Revert "Fix linker error with Symbian/ARM RVCT ABIv2 toolchain"Shane Kearns2009-10-071-4/+12
| * | Modified video widget to respond to WinIdChange eventsGareth Stockwell2009-10-092-0/+12
| * | Reformatting to comply with Qt code styleGareth Stockwell2009-10-092-9/+9
| * | Refactored event-handling code in video widgetGareth Stockwell2009-10-092-13/+15
| * | Modified ObjectDump annotator for Symbian window informationGareth Stockwell2009-10-091-35/+35
| * | Added ObjectDump annotator which prints Symbian-specific internal widget flagsGareth Stockwell2009-10-092-0/+40
| * | Modified getDsaRegion to be compiled only in debug buildsGareth Stockwell2009-10-091-4/+9
| * | Preventing unnecessary calls to CVideoPlayerUtility::SetDisplayWindowLGareth Stockwell2009-10-092-18/+30
| * | Simplified handling of native window information in VideoPlayerGareth Stockwell2009-10-092-64/+55
| |/
| * Merge commit 'qt/4.6' into mmfphononFrans Englich2009-10-075-13/+33
| |\
| | * Fix linker error with Symbian/ARM RVCT ABIv2 toolchainShane Kearns2009-10-071-12/+4
| | * 2009-10-07 Janne Koskinen <janne.p.koskinen@digia.com>Janne Koskinen2009-10-072-0/+15
| | * 2009-10-06 Janne Koskinen <janne.p.koskinen@digia.com>Janne Koskinen2009-10-072-1/+14
| * | Use QScopedPointer for AudioPlayer's CPlayerType.Frans Englich2009-10-072-7/+7
| * | mediaplayer: crash in settings dialog.Frans Englich2009-10-073-15/+42
| |/
* | Merge branch 'kinetic-declarativeui' of git@scm.dev.nokia.troll.no:qt/kinetic...Aaron Kennedy2009-10-0755-552/+1378
|\ \ | |/