summaryrefslogtreecommitdiffstats
path: root/src/3rdparty
Commit message (Collapse)AuthorAgeFilesLines
* 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
| | | | |
| | * | | Upgrading zlib: Add zlib version 1.2.5aavit2011-03-2444-0/+18973
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This commit contains a clean copy of zlib 1.2.5. The Qt building modifications will follow in a separate commit. As usual, the extraneous stuff in the official distribution (examples etc.) have been removed.
| | * | | Upgrading zlib: Remove zlib version 1.2.3aavit2011-03-2459-20763/+0
| | |/ /
* | | | Merge remote branch 'origin/master' into 4.8-earthDenis Dzyubenko2011-03-311-4/+4
|\ \ \ \ | |/ / /
| * | | Merge branch 'master' of scm.dev.nokia.troll.no:qt/qt-fire-staging into ↵Qt Continuous Integration System2011-03-281-4/+4
| |\ \ \ | | |/ / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | master-integration * 'master' of scm.dev.nokia.troll.no:qt/qt-fire-staging: Fix crash and infinite recursion caused by previous commits Fix remaining regressions in QWS Take Xft.hintstyle by default to match the behavior of GTK+ Fixed remaining issues in subpixel positioning with FreeType Fix QTransform debug output qFloor the decoration line width before painting Let QTextLine decide its own x position in QPainter Avoid repeatedly trying to load unloadable plugins, causing slowness Reset GL glyph cache when texture limit is reached unlockFace was put in the wrong place in previous patch Implement subpixel positioning with FreeType
| | * | Implement subpixel positioning with FreeTypeJiang Jiang2011-03-221-4/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | QFontEngineFT are used in raster/OpenGL paint engine and QGLWidget, also in Symbian, etc. We want to make sure it works well in raster and QGLWidget first. Regardless subpixel antialiasing (LCD filtering) is enabled or not (though it does look better when subpixel antialiasing is on). We also need to support transformations. The tricky part here is that, under X11, we have a different code path for QFontEngineFT and other font engines in raster engine, which uses QFontEngineFT's own glyph cache system. While in other platforms (Windows and Mac) and QGLWidget, we will use the generic QTextureGlyphCache. The generic QTextureGlyphCache already has support for subpixel positions, this solution is ported to QFontEngineFT for its QGlyphSet: the key for QGlyphSet hash table has been extended from glyph_t to <glyph_t, QFixed subPixelPosition> pair. The real work to enable subpixel positioning with FreeType is in fact really simple, we just set the horizontal translation to the subpixel position * 64 (FreeType uses a coordinate system of 1/64 of a pixel resolution internally) immediately before loading the glyph. A slight tweek to bitmap width is applied when we are getting the bitmap ourselves instead of using FT_Render_Glyph to accommodate the subpixel translation, which will only be used in non-LCD filtering cases (grayscale antialiasing). From what we have observed, FreeType can generate different bitmaps for at least 12 different subpixel positions (each with a slight difference). To limit the memory consumption, we restrict the number of subpixel positions to be 4 (hardcoded), which should be good enough for most low resolution displays. Subpixel positioning (and fractional glyph advances) will only be enabled when the hintingPreference for the font being used is PreferNoHinting or PreferVerticalHinting. We will use fontconfig hintstyle setting by default when no hintingPreference is set for the font. Task-number: QTBUG-12279 Reviewed-by: Eskil
* | | | Fix errors when compiling Qt with STLportCédric OCHS2011-03-281-1/+3
|/ / / | | | | | | | | | | | | | | | Task-number: QTBUG-18374 Reviewed-by: Olivier Goffart Merge-request: 1157
* | | Merge remote-tracking branch 'origin/4.7' into qt-master-from-4.7Olivier Goffart2011-03-221-2/+2
|\ \ \ | |/ / |/| / | |/ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: examples/declarative/positioners/layoutdirection/layoutdirection.qml src/corelib/global/qglobal.h src/plugins/qpluginbase.pri src/qbase.pri src/s60installs/bwins/QtOpenGLu.def src/s60installs/eabi/QtOpenGLu.def tests/auto/selftests/expected_cmptest.txt tests/auto/selftests/expected_crashes_3.txt tests/auto/selftests/expected_longstring.txt tests/auto/selftests/expected_maxwarnings.txt tests/auto/selftests/expected_skip.txt tools/assistant/tools/assistant/doc/assistant.qdocconf tools/qdoc3/test/assistant.qdocconf tools/qdoc3/test/designer.qdocconf tools/qdoc3/test/linguist.qdocconf tools/qdoc3/test/qdeclarative.qdocconf tools/qdoc3/test/qmake.qdocconf tools/qdoc3/test/qt-build-docs_ja_JP.qdocconf tools/qdoc3/test/qt-build-docs_zh_CN.qdocconf
| * Bump Qt version to 4.7.4Timo Turunen2011-03-211-2/+2
| | | | | | | | Reviewed-by: Trust Me
* | Merge remote branch 'qt/master' into staging-masterSamuel Rødal2011-03-211-0/+3
|\ \ | | | | | | | | | | | | | | | Conflicts: src/gui/image/qpnghandler.cpp src/opengl/qwindowsurface_gl.cpp
| * \ Merge remote-tracking branch 'origin/master' into lighthouse-masterJørgen Lind2011-03-172-6/+8
| |\ \ | | | | | | | | | | | | | | | | Conflicts: mkspecs/qws/macx-nacl-g++/qplatformdefs.h
| * | | Build JavaScriptCore also under unusual platform combination.con2011-03-101-0/+3
| | | | | | | | | | | | | | | | | | | | Reviewed-by: Jedrzej Nowacki Reviewed-by: Simon Hausmann
* | | | Merge remote branch 'qt-mainline/master'aavit2011-03-151-2/+2
|\ \ \ \ | | |/ / | |/| |
| * | | Merge remote-tracking branch 'origin/master' into qt-master-from-4.7Thiago Macieira2011-03-111-4/+6
| |\ \ \ | | | | | | | | | | | | | | | | | | | | Conflicts: src/s60installs/eabi/QtOpenVGu.def
| * \ \ \ Merge remote-tracking branch 'origin/4.7' into qt-master-from-4.7Thiago Macieira2011-03-111-2/+2
| |\ \ \ \ | | |_|/ / | |/| | / | | | |/ | | |/| | | | | | | | | Conflicts: mkspecs/common/symbian/symbian.conf src/s60installs/bwins/QtGuiu.def src/s60installs/eabi/QtGuiu.def
| | * | Bump Qt version to 4.7.3Timo Turunen2011-03-091-2/+2
| | | | | | | | | | | | | | | | Reviewed-by: Trust Me
* | | | Fix hebrew shaping of characters with multiple diacritics.Lars Knoll2011-03-141-2/+2
| | | | | | | | | | | | | | | | | | | | The old code would work for a maximum of one diacritic and insert dotted circles in valid syllables.
* | | | Fix combining marks shaping without GPOS feature in HarfBuzzJiang Jiang2011-03-141-1/+1
| |_|/ |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | For certain OpenType fonts like DejaVu Sans Mono, not all combining marks has GPOS feature applied, U+0062 U+0332 is one of the case. Only getting the advances for indivivual glyphs is not enough, we should also do heuristic positioning to put the combining mark in the right place. Task-number: QTBUG-15675 Reviewed-by: Lars Knoll
* | | Merge branch 'master' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into ↵Qt Continuous Integration System2011-03-081-4/+6
|\ \ \ | |/ / |/| | | | | | | | | | | | | | | | | | | | | | | | | | master-integration * 'master' of scm.dev.nokia.troll.no:qt/oslo-staging-1: Fix preprocessor directive. Fix compiling issue on Lion. Add support for Mac OS X 10.7 "Lion". Unbreak build on Mac OS X 10.5 after b0b80d9e8d11c38d Don't treat Objective-C property references as l-values
| * | Unbreak build on Mac OS X 10.5 after b0b80d9e8d11c38dTor Arne Vestbø2011-03-041-1/+1
| | | | | | | | | | | | Reviewed-by: Fabien Freling
| * | Don't treat Objective-C property references as l-valuesTor Arne Vestbø2011-03-021-4/+6
| | | | | | | | | | | | | | | | | | | | | Fixes Clang compile issue as Clang is stricter than gcc on this. See http://llvm.org/bugs/show_bug.cgi?id=8770 Reviewed-by: Fabien Freling <fabien.freling@nokia.com>
* | | Don't assert in abortEvaluation() autotestKent Hansen2011-03-011-2/+11
|/ / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | When QtScript is built without NDEBUG defined, the tst_QScriptEngine::abortEvaluation() test would assert. This was due to commit 716e0284c8f569d71e42354fd6fc3b965233e019, which fixed the tst_QScriptEngine::throwErrorFromProcessEvents() autotest for a script containing an infinite while-loop with an empty body. The CHECK_FOR_EXCEPTION_AT_END() that we added should only be done if the timeout checker did not report a timeout; otherwise the JSC state becomes corrupted due to returnToThrowTrampoline() being called twice. This caused an assert later when calculating the line number of the exception. Also add test cases for scripts with try-catch statements. For abortEvaluation(), scripts should not be able to observe (i.e. catch) the interrupted exception, but if an error is thrown using QScriptContext::throwError(), the script should be able to catch it. Task-number: QTBUG-17854 Reviewed-by: Olivier Goffart
* | Merge branch 'qt-master-from-4.7' of ↵Qt Continuous Integration System2011-02-251-2/+2
|\ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | scm.dev.nokia.troll.no:qt/qt-integration into master-integration * 'qt-master-from-4.7' of scm.dev.nokia.troll.no:qt/qt-integration: (60 commits) Fix QTBUG-17627: build break in mobility bearer applications Add the missing image for doc of QNetworkSession. Remove Qt dependancy to SYMBIAN_GRAPHICS_WSERV_QT_EFFECTS Fix QPlainTextEdit corruption/crash with scrolling DelayRemove of list delegate on section boundary duplicated section add gsm to connectable bearer for networkmanager. ListView and GridView indexAt should use qreal coordinates. Prevent infinite loop in raster engine on zero dash pattern length. Cocoa: Sheets looses focus when moving parent window Removing tabs from 7388fcb83592a90aace054314e0c3e7e7a94fdae changeset Fix QNetworkConfigurationManager crash due to null private pointer. Fix animations with alwaysRunToEnd that are frequently stopped/started. Fix auto test failure on mac. Update QtGui def files Another stab at fixing compilation on old Symbian platforms Prevent an animation from being registered to run twice. Add missing test file. Add selected P1 tasks to changes file. Added support for QMAKE_CLEAN in symbian-sbsv2 Only add NetworkServices capability automatically if no caps are set. ...
| * \ Merge remote-tracking branch 'origin/4.7' into qt-master-from-4.7Olivier Goffart2011-02-231-2/+2
| |\ \ | | |/ | | | | | | | | | | | | | | | | | | Conflicts: src/gui/kernel/qcocoaview_mac.mm src/s60installs/bwins/QtGuiu.def src/s60installs/eabi/QtGuiu.def src/testlib/qtestcase.cpp
| | * Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into ↵Qt Continuous Integration System2011-02-201-2/+2
| | |\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 4.7-integration * '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1: (21 commits) Autotest: make at least one update before checking if more are needed Fix warning about id maybe used when uninitialised Doc: setSslConfiguration also sets the CA certificates Autotest: check that the type received is the expected one Attempt to fix symbian 3.1 and 3.2 compile break. Prevents crashing when ICO file has bad color table value directfb: fix crash in client/server mode of qws Make Qt/DirectFB less verbose about failing to load pixmaps. Autotest: don't use the deprecated signal from QDBusConnectionInterface Autotest: be nicer to the subprocess and SIGTERM it Fix warnings in QtDeclarative Autotest: avoid memory leaks if test fails QtDBus: Make sure we can receive unknown types QtDBus meta object: keep methods, signals and props with unknown types Autotest: add a new test for parsing an introspection with unknown types Make the QtDBus parser not complain about unknown things fix-layer-getsurface-result-check-for-screen-size-determination Bump QtWebKit version to 2.0.2 SSL: fix memory leak when loading certificates on Mac OS X Add a mutex to protect the access to the QSet. ...
| | | * Bump QtWebKit version to 2.0.2Ademar de Souza Reis Jr2011-02-171-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | QtWebKit 2.0.1 was part of Qt-4.7.1, QtWebKit as included in 4.7.2 should be 2.0.2. Merge-request: 1095 Task-number: QTBUG-17480 Reviewed-by: Jason McDonald
generated by cgit v0.12 at 2025-01-13 22:42:09 (GMT)