summaryrefslogtreecommitdiffstats
path: root/src/3rdparty
Commit message (Collapse)AuthorAgeFilesLines
* Fix the in-tree build by not letting qtbase.pri add explicitlib or staticlib ↵Andras Becsi2011-06-091-0/+5
| | | | | | to CONFIG. Reviewed by Andreas Kling
* Hack RenderBlock's continuation() and setContinuation() for RVCT 2.x.Andreas Kling2011-06-081-2/+2
|
* Use WTF::notFound instead of -1 to check for Vector::find() errors.Andreas Kling2011-06-081-2/+2
|
* The autotests don't even build on Symbian, skip them for now.Andreas Kling2011-06-081-1/+3
|
* Hack SystemTimeWin.cpp to build on MSVC2005.Andreas Kling2011-06-081-0/+4
|
* Make Float32Array and Int16Array build on RVCT 2.x.Andreas Kling2011-06-082-3/+5
| | | | Partial merge of <http://trac.webkit.org/changeset/88336>.
* Fix build with RVCT 2.xAndreas Kling2011-06-071-1/+2
|
* Updated WebKit to cbc99535043a2abc98d6701943595f52fbaf5b19Andreas Kling2011-06-064-4/+14
| | | | Reviewed-by: Alexis Menard
* Updated WebKit to 4e7dfbab30278b0427e699baaadbf3e5aab88203Alexis Menard2011-06-0365-367/+1772
| | | | Reviewed-by: Andreas Kling
* Updated WebKit to dbda3e9596b836ab6eb88c500766dba6745759beAlexis Menard2011-06-0313-12/+143
|
* Some qmake black magic to pick up the right file.Alexis Menard2011-06-031-1/+0
| | | | | | I deleted the old hack of Andreas, it's not needed. Reviewed-by: Andreas Kling
* Add a dummy Source.pro that simply includes WebKit.proAndreas Kling2011-06-031-0/+1
| | | | | | This is my sneaky attempt at making Symbian build. Reviewed-by: Alexis Menard
* Updated WebKit to 7e7119292e94f55a66d391cd183a4dd6ec1a8d65Alexis Menard2011-06-028-119/+5
| | | | Reviewed by: Andreas Kling
* Updated WebKit to 7e7119292e94f55a66d391cd183a4dd6ec1a8d65Alexis Menard2011-06-0282-4251/+1705
| | | | Reviewed-by: Andreas Kling
* Updated WebKit to efbf910ad7c49e8cdf81411b4ac0abeea0efd8f8Alexis Menard2011-06-0219-58/+324
| | | | Reviewed by: Andreas Kling
* Updated WebKit to 9b4474ac44ee2f3311b435bd45630f5c2c357217Alexis Menard2011-06-012-0/+251
|
* Updated WebKit to 9b4474ac44ee2f3311b435bd45630f5c2c357217Alexis Menard2011-05-3115-131/+58
|
* Make QtWebKit build properly. QtWebKit is not just build by WebCore.pro butAlexis Menard2011-05-312-127/+0
| | | | | | | | by QtWebKit.pro. We should read that one instead. I also removed some files which should not be here. Reviewed by: Andreas Kling
* Updated WebKit to 65360d3d3377f120aecccf1bf9b9ae9444d488e1Alexis Menard2011-05-3127-72/+232
|
* Updated WebKit to af58e9520937cc6fc3e31fe5d6682d19842e044dAlexis Menard2011-05-3119-37/+217
|
* Updated WebKit to d14495f006a09eaee01d155fa57c80537408a835Alexis Menard2011-05-309313-0/+2836062
| | | | Reviewed-by: Andreas Kling
* Remove old QtWebKit.Alexis Menard2011-05-305254-1758183/+0
| | | | Reviewed-by: Andreas Kling
* Merge remote-tracking branch 'qt/4.8'Jyri Tahtela2011-05-191-0/+6
|\
| * Fix crashes with regular expressions QtScript on ARM traditional architecturesSimon Hausmann2011-05-161-0/+6
| | | | | | | | | | | | | | | | Save and restore the r8 register properly. Backport of http://trac.webkit.org/changeset/65242 from WebKit trunk Reviewed-by: Jedrzej Nowacki
* | Update licenseheader text in source files for qt4.8Jyri Tahtela2011-05-132-34/+34
|/ | | | | | | Updated version of LGPL and FDL licenseheaders. Apply release phase licenseheaders for all source files. Reviewed-by: Trust Me
* Merge branch 4.7 into qt-4.8-from-4.7Qt Continuous Integration System2011-05-041-0/+1
|\
| * Don't rely on uninitialized dataJoão Abecasis2011-05-031-0/+1
| | | | | | | | | | | | | | | | | | | | HB_GetCharAttributes used to require a zero-initialized array for attributes, as it selectively sets relevant bits for each character. We ease that requirement by always initializing the attributes buffer explicitly with memset. Task-number: QT-4911 Reviewed-by: Ritt Konstantin
* | Merge branch 4.7 into qt-4.8-from-4.7Qt Continuous Integration System2011-04-282-0/+50
|\ \ | |/
| * Legal: add the license header to the hand-editsThiago Macieira2011-04-272-0/+50
| | | | | | | | Reviewed-by: Trust Me
* | Merge remote-tracking branch 'origin/4.7' into qt-master-from-4.7Olivier Goffart2011-04-182-10/+9
|\ \ | |/ | | | | | | | | | | | | | | Conflicts: qmake/generators/makefile.cpp qmake/generators/win32/msbuild_objectmodel.cpp qmake/generators/win32/msvc_vcxproj.cpp src/corelib/global/qnamespace.h src/gui/text/qtextcontrol.cpp
| * Enable webkit build for the makefile build system with gcceLiang Qi2011-04-072-10/+9
| | | | | | | | | | | | | | Task-number: QTBUG-18484 Task-number: WEBKIT-57841 Reviewed-by: axis Reviewed-by: Janne Koskinen
* | Merge earth-team into origin/master'Olivier Goffart2011-04-123-3/+5
|\ \
| * | Avoid compilation warnings on Symbianaavit2011-04-063-3/+5
| | |
* | | Merge branch 'master' of scm.dev.nokia.troll.no:qt/qt into earth-masteraxis2011-04-07267-68608/+28173
|\ \ \ | |/ / | | | | | | | | | Conflicts: src/corelib/thread/qthread_unix.cpp
| * | Really avoid compiler warnings on Windowsaavit2011-04-054-2/+13
| | |
| * | Avoid some compiler warnings on Windowsaavit2011-04-041-0/+2
| | |
| * | Merge branch 'jpeg8c'aavit2011-04-0465-7524/+393
| |\ \
| | * | Updating libjpeg: Add Qt building modificationsaavit2011-03-282-0/+170
| | | |
| | * | Updating libjpeg: Add version 8c.aavit2011-03-2887-0/+45145
| | | | | | | | | | | | | | | | | | | | | | | | | | | | This is a clean copy of the official distribution of libjpeg version 8c, except that various extraneous stuff (examples, tests, etc.) have been removed, as usual. Modifications to build it in Qt will follow in a separate commit.
| | * | Updating libjpeg: Removing libjpeg version 8aavit2011-03-28136-52446/+0
| | | |
| * | | Another compilation fix for WinCEaavit2011-04-041-0/+2
| | | |
| * | | Remove obsolete patch fileaavit2011-04-031-433/+0
| | | | | | | | | | | | | | | | | | | | Obsolete after upgrade to zlib version 1.2.5. Intentionally not replaced: patches can be found by reviewing the public git repo instead.
| * | | Compilation fix for WinCEaavit2011-04-021-1/+1
| | | |
| * | | Merge branch 'png151'aavit2011-04-01127-51389/+20278
| |\ \ \
| | * | | Updating libpng: Patches to libpng for building it in Qtaavit2011-03-253-5/+190
| | | | |
| | * | | Updating libpng: Add libpng version 1.5.1aavit2011-03-2540-0/+54714
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This is a clean copy of the official libpng 1.5.1 distribution, except that various extraneous stuff (examples, tests, etc) have been removed, as usual. The minor modifications to build it in Qt will follow in a separate commit.
| | * | | Updating libpng: Remove version 1.4.0aavit2011-03-25124-86010/+0
| | |/ /
| * | | Fix compilation of libtiff with zlib 1.2.5aavit2011-04-011-0/+2
| | | | | | | | | | | | | | | | | | | | Configuration wrongly claimed to have unistd.h also on Windows, and the new zlib.h incidentally checks for the same #define symbol.
| * | | Merge branch 'zlib125'aavit2011-04-0172-9263/+7486
| |\ \ \
| | * | | Upgrading zlib: Patches to build internal zlib in Qtaavit2011-03-242-1/+14
| | | | |