| Commit message (Collapse) | Author | Age | Files | Lines |
| |
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
| |
The change in http://trac.webkit.org/changeset/48412/ introduced a fix
to avoid leaking thread specific data by ensuring get() on ThreadSpecific
works even during the thread destruction phase. The fix worked by setting the
local data again.
However as we can see in the backtrace from QTBUG-22926, the local data should
not be set unconditionally, otherwise our destroy function will be called
recursively when the local data is still set.
Task-number: QTBUG-22926
Reviewed-by: Kent Hansen
Tested-and-Reviewed-by: Andy Shaw
|
|\
| |
| |
| |
| |
| |
| | |
master-integration
* 'master' of scm.dev.nokia.troll.no:qt/qt-air-staging:
Updated WebKit to 83439de78841f9569ad78e3a84b7b888337b5d18
|
| | |
|
|\ \
| | |
| | |
| | |
| | | |
Conflicts:
src/s60main/newallocator_hook.cpp
|
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | | |
This patch is contributed by Thanomsub Noppaburana from libthai. It
added a special thai shaping function to handle SARA AM character
for fonts without OpenType rules to support it, like Nokia Pure Text
AS.
With modification to logClusters assignment to make sure that
QTextLine::glyphRuns(int from, int length) returns correct glyphs.
Task-number: QTBUG-21206
Change-Id: I5a78ee1ab2b4c874c7d0df17d4ee6d264ed5a790
Reviewed-by: Lars Knoll <lars.knoll@nokia.com>
|
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | | |
The PNG Development Group explains that libpng 1.5.4 (only) introduced
a divide-by-zero bug in png_handle_cHRM(), which could lead to crashes
(denial of service) for certain malformed PNGs.
Ref. http://www.libpng.org/pub/png/libpng.html
Task-number: QTBUG-22168
|
|\ \ \
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | | |
master-integration
* 'master' of scm.dev.nokia.troll.no:qt/qt-water-staging:
Set execution bits for more scripts.
Set execution bits for .test files.
Fix more permissions (no execute bit).
Fix permission (no execute bit).
QGraphicsLayoutItem - bound constraint the minimum and maximum size
Notify X11 of its resizable state through MWM Hints.
|
| | | | |
|
|\ \ \ \
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | | |
master-integration
* 'master' of scm.dev.nokia.troll.no:qt/qt-symbian-staging:
Symbian-linux crosscompilation case changes
Symbian-linux crosscompilation debug-release align
|
| |/ / /
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | | |
Update the cases to match actual files in Symbian, and add EPOCROOT
prefixes to data files in iby.
Reviewed-by: Juha Kukkonen
Task-number: QTBUG-14361
|
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | | |
If qt is compiled with -qt-libpng then the png symbols
prevent a loading of another libpng. With this patch
the png symbols are hidden and thus it is possible
to load another libpng.
Reviewed-by: hjk <qtc-committer@nokia.com>
|
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | | |
ISO/IEC 14882 2.2 Phases of translations: "user defined string literals"
are recognized as single preprocessor token in Phase 3, left unchanged by
"...preprocessing executed" in Phase 4. Previously, there were no user
defined liteal, and the intended concatanation was done in Phase 6
"adjacent string literal tokens are concatenated", after the macro expansion.
Reviewed-by: Tor Arne Vestbø <tor.arne.vestbo@nokia.com
Task-number: QTBUG-22847
|
|/ / /
| | |
| | |
| | |
| | | |
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com>
Task-number: QTBUG-22847
|
|\ \ \
| | |/
| |/|
| | |
| | |
| | |
| | |
| | |
| | |
| | | |
master-integration
* 'master' of scm.dev.nokia.troll.no:qt/qt-air-staging:
Re-apply change e3208a8d44423bc3b5c32e2e90f68675e51a3b73 by Andreas Kling
Re-apply change 37cde52cb17b57f8ec89c248f06331ed4977e51c by Ademar de Souza Reis Jr
Re-apply change 945c44d0865cf44363e6c860995f971ce952dd5f by Ademar de Souza Reis Jr
Updated WebKit to 52a11cec052aa40d3bbc06861be1177b649b4a99
|
| | |
| | |
| | |
| | | |
Sentences should end with a period! (Poor man's rebuild trigger.)
|
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | | |
Reis Jr
Workaround MSVC2010 problems when linking QtWebKit
Include MSVC2010 in the list of compilers where incremental
build is disabled (INCREMENTAL:NO).
Change suggested by Simo Falt <simo.falt@nokia.com>
|
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | | |
Reis Jr
dos2unix on a webkit source file (fix support for Visual Studio)
webkit/Source/WebCore/bindings/js/JSExceptionBase.h had CRLF
terminations, which Visual Studio didn't like for some reason.
Reported by Simo Falt. Patch is also being submited to upstream
(webkit.org)
|
| | | |
|
|\ \ \
| |/ /
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | | |
master-integration
* 'master' of scm.dev.nokia.troll.no:qt/qt-air-staging:
Re-apply change a14033620fab5edca44293ec6dfcc904e2e0eb20 by Andreas Kling
Re-apply change 3489808c1dcd157ac09dd6da16bc057b56696d59 by Ademar de Souza Reis Jr
Re-apply change 3dd9e66baaa0848bcc2eb7daecf2b63724624358 by Ademar de Souza Reis Jr
Updated WebKit to 99371ddc1d61832131835964a753e1c5817f6916
|
| | |
| | |
| | |
| | | |
Sentences should end with a period! (Poor man's rebuild trigger.)
|
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | | |
Reis Jr
Workaround MSVC2010 problems when linking QtWebKit
Include MSVC2010 in the list of compilers where incremental
build is disabled (INCREMENTAL:NO).
Change suggested by Simo Falt <simo.falt@nokia.com>
|
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | | |
Reis Jr
dos2unix on a webkit source file (fix support for Visual Studio)
webkit/Source/WebCore/bindings/js/JSExceptionBase.h had CRLF
terminations, which Visual Studio didn't like for some reason.
Reported by Simo Falt. Patch is also being submited to upstream
(webkit.org)
|
| | | |
|
|\ \ \
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | | |
master-integration
* 'master' of scm.dev.nokia.troll.no:qt/qt-doc-staging:
Missing icon in the designer documentation
Fridge magnet example code snippet error
qpaintdevice-qt3.html documentation errors
QWebElement example missed information
QSPlitter style-sheet example was invalid
Errors in QSqlDriver::handle examples
QGLColormap example was invalid
QPointer made no mention of QWeakPointer
Invalid links to http://developer.symbian.org
QNetworkDiskCache documentation missed information
QStyleSheet example used a property that is hidden.
QList document referenced to non existing function
QXmlQuery::bindVariable documentation bug
Fix multiple typos in QLineF documentation.
Qmake project file docs lacked information.
Documentation error in SSL document
Fix multiple typos in documentation.
Fix for QVector::toList - code example documentation.
|
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | | |
In the example there was told to use
button.evaluateJavaScript("click()"); which doesn't work.
Instead of "click()" it should be "this.click()".
Changed to "this.click()".
Task-number: QTBUG-17029
Merge-request: 2698
Reviewed-by: Casper van Donderen <casper.vandonderen@nokia.com>
|
|\ \ \ \
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | | |
master-integration
* 'master' of scm.dev.nokia.troll.no:qt/oslo-staging-1:
Harfbuzz shaper: kerning adjustment does not need to be modified by RTL
|
| |/ / /
| | | |
| | | |
| | | |
| | | | |
Merge-request: 1435
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com>
|
|\ \ \ \
| |/ / / |
|
| |\ \ \
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | | |
master-integration
* 'master' of scm.dev.nokia.troll.no:qt/qt-fire-staging:
Fixes: libpng symbols exported from QtGui.dll on Windows
omit unassigned (and too recent codepoints) from the text Normalization process
Fixed broken window surface flush when depth is 24 and bpp is not 32.
|
| |\ \ \ \
| | |_|/ /
| |/| | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | | |
master-integration
* 'master' of scm.dev.nokia.troll.no:qt/qt-doc-staging:
Added text about -random and -seed options in QTest to changelog
Add another part of the source code to the snippet.
Update changes-4.8.0
Update translation sources.
Update the changelog for qdoc in 4.8
|
| | | | |
| | | | |
| | | | |
| | | | | |
Reviewed-By: Geir Vattekar
|
| |_|/ /
|/| | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | | |
The PNG Development Group explains that libpng 1.5.4 (only) introduced
a divide-by-zero bug in png_handle_cHRM(), which could lead to crashes
(denial of service) for certain malformed PNGs.
Ref. http://www.libpng.org/pub/png/libpng.html
This commit contains the patch recommended by the PNG Development
Group, ref. http://www.kb.cert.org/vuls/id/477046
Task-number: QTBUG-22168
(cherry picked from commit 55c2ea18c522bd8700f43884124e02b460cdb5e2)
|
|/ / /
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | | |
The upgrade of the bundled libpng to version 1.5 had the side effect
of causing the png functions to be exported from the QtGUi DLL
when built with the MS Visual C++ compiler.
Task-number: QTBUG-21455
Reviewed-by: Kim
|
| | | |
|
| | |
| | |
| | |
| | |
| | |
| | |
| | | |
Include MSVC2010 in the list of compilers where incremental
build is disabled (INCREMENTAL:NO).
Change suggested by Simo Falt <simo.falt@nokia.com>
|
|/ /
| |
| |
| |
| |
| |
| |
| | |
webkit/Source/WebCore/bindings/js/JSExceptionBase.h had CRLF
terminations, which Visual Studio didn't like for some reason.
Reported by Simo Falt. Patch is also being submited to upstream
(webkit.org)
|
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| | |
Changes since last sync:
[https://webkit.org/b/59927 #59927]: [SH4] AssemblerLabel does not name a type
[https://webkit.org/b/63259 #63259]: Warnings in JSC's JIT on 32 bit
[https://webkit.org/b/67254 #67254]: [Qt][DRT] Normalize file:///tmp/LayoutTests in LayoutTestController::pathToLocalResource()
[https://webkit.org/b/64527 #64527]: [Qt]Update layout test results for newer Qt 4.8.x
[https://webkit.org/b/67644 #67644]: [Qt][Symbian] REGRESSION[94105] DumpRenderTree.exe doesn't build on Symbian
[https://webkit.org/b/67784 #67784]: frame-loading-via-document-write.html test cases have extra slash in path
[https://webkit.org/b/67958 #67958]: (restricted bug)
[https://webkit.org/b/61805 #61805]: (restricted bug)
[https://webkit.org/b/64753 #64753]: (restricted bug)
[https://webkit.org/b/67364 #67364]: (restricted bug)
[https://webkit.org/b/67488 #67488]: (restricted bug)
[https://webkit.org/b/67735 #67735]: (restricted bug)
[https://webkit.org/b/67748 #67748]: (restricted bug)
|
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| | |
Changes since last sync:
[https://webkit.org/b/66016 #66016]: [Qt] Add test for correct order of load signals in QWebPage
[https://webkit.org/b/28851 #28851]: Emit last progress notification before calling dispatchDidFinishLoad
[https://webkit.org/b/67285 #67285]: [Qt] Unskip API test for load signals order
[https://webkit.org/b/67307 #67307]: [Qt][Symbian] REGRESSION(93235) Missing .def update
[https://webkit.org/b/49448 #49448]: (restricted bug)
[https://webkit.org/b/64737 #64737]: (restricted bug)
[https://webkit.org/b/64741 #64741]: (restricted bug)
[https://webkit.org/b/66015 #66015]: (restricted bug)
[https://webkit.org/b/66141 #66141]: (restricted bug)
[https://webkit.org/b/66360 #66360]: (restricted bug)
[https://webkit.org/b/66699 #66699]: (restricted bug)
[https://webkit.org/b/66799 #66799]: (restricted bug)
[https://webkit.org/b/67556 #67556]: (restricted bug)
|
| |
| |
| |
| |
| |
| | |
Changes since last sync:
[https://webkit.org/b/61235 #61235]: JavaScriptCore doesn't build on MinGW-w64
[https://webkit.org/b/67055 #67055]: [Qt] Do not unconditionally use pkg-config in .pro files
|
|\ \ |
|
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | | |
Using the first pkg-config in PATH is prone to errors when
cross compiling. This is a known issue, and `configure' already
avoids using pkg-config for cross compiling (unless -force-pkg-config is
used). However, there was previously no way for a .pro file to test
whether or not the user had passed -force-pkg-config.
Let !contains(QT_CONFIG, no-pkg-config) be used to test whether or not it
is safe to run pkg-config.
|
| | | |
|
| | |
| | |
| | |
| | |
| | | |
This time also including WebKitLibraries/*.a, needed for the
Mac build.
|
| | | |
|
| | |
| | |
| | |
| | |
| | | |
This time including webkit/include/ files generated on a Mac
(thanks to Alexis Menard).
|
| | |
| | |
| | |
| | | |
Signed-off-by: Ademar de Souza Reis Jr <ademar.reis@openbossa.org>
|
| | |
| | |
| | |
| | | |
Signed-off-by: Ademar de Souza Reis Jr <ademar.reis@openbossa.org>
|
|\ \ \
| |/ /
|/| /
| |/
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| | |
Conflicts:
examples/webkit/fancybrowser/fancybrowser.pro
src/3rdparty/libpng/ANNOUNCE
src/3rdparty/libpng/CHANGES
src/3rdparty/libpng/CMakeLists.txt
src/3rdparty/libpng/LICENSE
src/3rdparty/libpng/README
src/3rdparty/libpng/configure.ac
src/3rdparty/libpng/example.c
src/3rdparty/libpng/libpng-manual.txt
src/3rdparty/libpng/libpng.3
src/3rdparty/libpng/libpngpf.3
src/3rdparty/libpng/png.5
src/3rdparty/libpng/png.c
src/3rdparty/libpng/png.h
src/3rdparty/libpng/pngconf.h
src/3rdparty/libpng/pngerror.c
src/3rdparty/libpng/pnginfo.h
src/3rdparty/libpng/pnglibconf.h
src/3rdparty/libpng/pngmem.c
src/3rdparty/libpng/pngpread.c
src/3rdparty/libpng/pngpriv.h
src/3rdparty/libpng/pngread.c
src/3rdparty/libpng/pngrtran.c
src/3rdparty/libpng/pngrutil.c
src/3rdparty/libpng/pngset.c
src/3rdparty/libpng/pngstruct.h
src/3rdparty/libpng/pngtest.c
src/3rdparty/libpng/pngtrans.c
src/3rdparty/libpng/pngvalid.c
src/3rdparty/libpng/pngwrite.c
src/3rdparty/libpng/pngwtran.c
src/3rdparty/libpng/pngwutil.c
src/gui/dialogs/qfiledialog_symbian.cpp
src/gui/kernel/qsoftkeymanager.cpp
src/s60installs/s60installs.pro
|
| |\
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | | |
4.7-integration
* '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-2:
Updating libpng: Patches to libpng 1.5.4 for building it in Qt
Updating libpng: Add libpng version 1.5.4
Updating libpng: Remove version 1.4.0
|