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-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
|\ \ | |/
| * Merge commit 'qt/4.6' into mmfphononFrans Englich2009-10-0654-540/+1371
| |\
| | * Needed to set ENABLE_YARR_JIT to not compile MacroAssembler.cppJørgen Lind2009-10-062-4/+16
| | * Prospective build fix for SolarisKent Hansen2009-10-061-1/+1
| | * Updated JavaScriptCore from /home/khansen/dev/qtwebkit to jsc-for-qtscript-4....Kent Hansen2009-10-063-9/+6
| | * Updated JavaScriptCore from /home/khansen/dev/qtwebkit to jsc-for-qtscript-4....Kent Hansen2009-10-062-3/+2
| | * Updated JavaScriptCore from /home/khansen/dev/qtwebkit to jsc-for-qtscript-4....Kent Hansen2009-10-053-33/+2
| | * Updated JavaScriptCore from /home/khansen/dev/qtwebkit to jsc-for-qtscript-4....Kent Hansen2009-10-0550-494/+1346
| * | Fix crash related to audio equalizer.Frans Englich2009-10-062-17/+14
* | | Compile against updated JSCAaron Kennedy2009-10-052-7/+14
| |/ |/|
* | Doc: Document HTML and status as properties.Volker Hilsheimer2009-10-031-5/+7
|/
* Merge branch '4.6' into mmfphononFrans Englich2009-10-0234-67/+72
|\
| * doc: Fixed numerous qdoc errors.Martin Smith2009-10-022-0/+3
| * Fix compiler warnings on VS2008Prasanth Ullattil2009-10-0232-67/+69
* | Remove TODO.txt, we've moved to Jira.Frans Englich2009-10-021-29/+0
|/
* Merge commit 'qt/4.6' into mmfphononFrans Englich2009-10-02955-2463/+6340
|\
| * Add configure flags to force turning on or off JavaScriptCore JITJørgen Lind2009-10-022-0/+5
| * Make Software Input Panel requests work with QGraphicsWebView _and_ QWebView ...Simon Hausmann2009-10-013-1/+19
| * Merge branch '4.5' of scm.dev.nokia.troll.no:qt/qt into 4.6Simon Hausmann2009-10-011-2/+20
| |\
| | * Fixes: Phonon-gst: Respect device MediaSource property.Dmytro Poplavskiy2009-10-011-0/+5
| | * Fixes: Phonon-gst: use correct URLs for different disk types.Dmytro Poplavskiy2009-10-011-2/+15