summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Merge commit 'origin/master' into fileEnginesOn47Thomas Zander2010-09-281555-38604/+80420
|\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: qmake/Makefile.win32 qmake/qmake.pri src/corelib/io/qdir.cpp src/corelib/io/qfileinfo.cpp src/corelib/io/qfileinfo_p.h src/corelib/io/qfsfileengine_win.cpp src/s60installs/bwins/QtGuiu.def src/s60installs/eabi/QtCoreu.def src/s60installs/eabi/QtGuiu.def src/tools/bootstrap/bootstrap.pro tests/auto/qfileinfo/tst_qfileinfo.cpp
| * Merge branch 'master' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into ↵Qt Continuous Integration System2010-09-271-1/+1
| |\ | | | | | | | | | | | | | | | | | | master-integration * 'master' of scm.dev.nokia.troll.no:qt/oslo-staging-1: Unbreak configure.exe
| | * Unbreak configure.exeMarius Storm-Olsen2010-09-271-1/+1
| | | | | | | | | | | | Commit 8435ba93 caused compilation error
| * | Merge branch 'master' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into ↵Qt Continuous Integration System2010-09-271-1/+1
| |\ \ | | |/ | | | | | | | | | | | | | | | master-integration * 'master' of scm.dev.nokia.troll.no:qt/oslo-staging-1: Compile when detecting ARMv5
| | * Compile when detecting ARMv5Bradley T. Hughes2010-09-271-1/+1
| | | | | | | | | | | | | | | The macro is called QT_END_INCLUDE_HEADER, not QT_END_INCLUDE_HEADERS (no trailing S).
| * | Merge branch 'master' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into ↵Qt Continuous Integration System2010-09-279-25/+132
| |\ \ | | |/ | | | | | | | | | | | | | | | master-integration * 'master' of scm.dev.nokia.troll.no:qt/oslo-staging-1: Allow fallback to fulltext search when keyword has not been found (remote).
| | * Allow fallback to fulltext search when keyword has not been found (remote).kh12010-09-279-25/+132
| | | | | | | | | | | | | | | Task-number: QTBUG-12963 Reviewed-by: ck
| * | Merge branch 'master' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into ↵Qt Continuous Integration System2010-09-262-0/+10
| |\ \ | | |/ | | | | | | | | | | | | | | | master-integration * 'master' of scm.dev.nokia.troll.no:qt/oslo-staging-1: Fix QPainter::clipBoundingRect() for QRectF clip.
| | * Fix QPainter::clipBoundingRect() for QRectF clip.Andreas Kling2010-09-262-0/+10
| |/ | | | | | | | | | | | | clipBoundingRect() wasn't handling QPainterClipInfo::RectFClip properly, mistaking it for PathClip. Reviewed-by: Samuel Rødal
| * Merge branch 'master' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into ↵Qt Continuous Integration System2010-09-252-10/+18
| |\ | | | | | | | | | | | | | | | | | | master-integration * 'master' of scm.dev.nokia.troll.no:qt/oslo-staging-2: Fix problems in QTextureGlyphCache caused by insufficient merge
| | * Fix problems in QTextureGlyphCache caused by insufficient mergeEskil Abrahamsen Blomfeldt2010-09-242-10/+18
| |/ | | | | | | | | | | | | | | | | | | | | | | Since the logic of QTextureGlyphCache has been changed, it is impossible to do an automatic merge of eb2926a2f9607e985b8bca54346e6fdf91343247. This change fixes problems that occurred with that change: 1. We need to postpone actually resizing the texture until fillInPendingGlyphs() where we are sure to have a context. 2. We have to fall back to a default max texture size when there is no context. Reviewed-by: Trond
| * Merge branch 'master' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into ↵Qt Continuous Integration System2010-09-232-56/+95
| |\ | | | | | | | | | | | | | | | | | | master-integration * 'master' of scm.dev.nokia.troll.no:qt/oslo-staging-1: Designer/QFormBuilder::save(): Fix traversal of QGridLayout/QFormLayout
| | * Designer/QFormBuilder::save(): Fix traversal of QGridLayout/QFormLayoutFriedemann Kleint2010-09-232-56/+95
| | | | | | | | | | | | | | | | | | | | | Remove redundant code in qdesigner_resource ass well. Reviewed-by: Jarek Kobus <jaroslaw.kobus@nokia.com> Task-number: QTBUG-13683
| * | Merge branch 'master' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into ↵Qt Continuous Integration System2010-09-2314-442/+671
| |\ \ | | |/ | | | | | | | | | | | | | | | | | | | | | | | | | | | master-integration * 'master' of scm.dev.nokia.troll.no:qt/oslo-staging-1: Add support for ARMv7 atomic operations Fix usage of QT_ARCH_ARM* after a28ddf6 Merge the armv6 and arm architectures Copy src/corelib/arch/qatomic_arm.h to src/corelib/arch/qatomic_armv5.h Move symbian specific qatomic_generic_armv6.cpp
| | * Add support for ARMv7 atomic operationsBradley T. Hughes2010-09-235-54/+179
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | ARMv7 adds the DMB (data memory barrier) instruction which we can use to enforce memory barriers in QAtomicInt and QAtomicPointer. Other than that, ARMv7 is identical to ARMv6. Adjust the ARMv6 code to relax the compiler memory barriers on the *Relaxed() operations, and use *Relaxed() functions together the appropriate compiler barriers in the *Acquire(), *Release(), and *Ordered() functions. For "pure" ARMv6 code, the barriers are only compiler barriers, but for ARMv7, we also emit the DMB instruction. Reviewed-by: thiago
| | * Fix usage of QT_ARCH_ARM* after a28ddf6Bradley T. Hughes2010-09-232-3/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | Remove unnecessary use of QT_ARCH_ARMV6 from qglobal.h (QT_ARCH_ARM is always defined when QT_ARCH_ARMV6 is defined), and fix the use of QT_ARCH_ARM to assume ARM < v6 in qblendfunctions.cpp (use QT_ARCH_ARMV5 instead). Reviewed-by: thiago
| | * Merge the armv6 and arm architecturesBradley T. Hughes2010-09-238-390/+63
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Instead of having multiple architectures, merge them and select the appropriate implementation based on what the compiler actually supports. The original qatomic_arm.h header has been renamed to qatomic_armv5.h, and qatomic_arm.h now does nothing more than including either qatomic_armv6.h or qatomic_armv5.h Since this changes the build-key for targets that previously used armv6, we need a 3rd compatibility build-key for the architecture. The configure script will always write out this build-key when building for arm (and silently converts -arch armv6 to -arch arm). Reviewed-by: thiago
| | * Copy src/corelib/arch/qatomic_arm.h to src/corelib/arch/qatomic_armv5.hBradley T. Hughes2010-09-231-0/+431
| | | | | | | | | | | | | | | | | | ... in preparation for the next commit Reviewed-by: thiago
| | * Move symbian specific qatomic_generic_armv6.cppBradley T. Hughes2010-09-232-1/+1
| |/ | | | | | | | | | | Put it in src/corelib/arch/symbian/ instead of src/corelib/arch/armv6/ Reviewed-by: thiago
| * Merge branch 'master' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into ↵Qt Continuous Integration System2010-09-221-0/+13
| |\ | | | | | | | | | | | | | | | | | | master-integration * 'master' of scm.dev.nokia.troll.no:qt/oslo-staging-2: Adding C++0x support to MSVC2010
| | * Adding C++0x support to MSVC2010Thierry Bastian2010-09-221-0/+13
| | | | | | | | | | | | Reviewed-by: olivier
| * | Merge branch 'qt-master-from-4.7' of ↵Qt Continuous Integration System2010-09-2244-336/+503
| |\ \ | | |/ | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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: (131 commits) Fix audio glitches in the audiooutput example. apply msvc flags to wince too fix qt static build on wince fix build with QT_NO_GESTURES Fixed drawing a large number of glyphs with the same font under GL. qmake: fix quoting of moc calls Bump version to 4.7.1. Improved output of patch_capabilities.pl script Qt headers must be included before X11 headers Fixes bezier curves not being drawn when it is a line. Button remains pressed if release event happens outside of widget Avoid creating copy of an image in memory when storing as jpeg Use regparm(3) for ICC too, otherwise it's an ABI mismatch in QChar Regenerate the Unicode tables after updates to the generator tool Compile in C++0x mode remove extra includes minor clean-ups minor improvements for data parsers tiny clean-up for generated data move QUnicodeTables:: script() and lineBreakClass() implementations ...
| | * Merge remote branch 'origin/4.7' into qt-master-from-4.7Thiago Macieira2010-09-2244-336/+503
| | |\ | | | | | | | | | | | | | | | | | | | | Conflicts: src/gui/painting/qtextureglyphcache_p.h src/opengl/gl2paintengineex/qtextureglyphcache_gl.cpp
| | | * Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-multimedia-staging into ↵Qt Continuous Integration System2010-09-221-2/+2
| | | |\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 4.7-integration * '4.7' of scm.dev.nokia.troll.no:qt/qt-multimedia-staging: Fix audio glitches in the audiooutput example.
| | | | * Fix audio glitches in the audiooutput example.Andrew den Exter2010-09-221-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The data copy loop didn't advance the write position, resulting in some of the output buffer being overwritten and some of it not written to at all. Task-number: QTBUG-13751 Reviewed-by: Justin McPherson
| | | * | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into ↵Qt Continuous Integration System2010-09-2233-227/+383
| | | |\ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 4.7-integration * '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1: apply msvc flags to wince too fix qt static build on wince fix build with QT_NO_GESTURES qmake: fix quoting of moc calls Use regparm(3) for ICC too, otherwise it's an ABI mismatch in QChar Regenerate the Unicode tables after updates to the generator tool Compile in C++0x mode remove extra includes minor clean-ups minor improvements for data parsers tiny clean-up for generated data move QUnicodeTables:: script() and lineBreakClass() implementations make lupdate test less fragile Enable building Qt/Webkit with debug symbols Add breakpad support
| | | | * | apply msvc flags to wince tooRomain Pokrzywka2010-09-212-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | Reviewed-by: mariusso
| | | | * | fix qt static build on winceRomain Pokrzywka2010-09-212-14/+15
| | | | | | | | | | | | | | | | | | | | | | | | Reviewed-by: mariusso
| | | | * | fix build with QT_NO_GESTURESRomain Pokrzywka2010-09-211-1/+1
| | | | | |
| | | | * | qmake: fix quoting of moc callsJoerg Bornemann2010-09-211-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Task-number: QTBUG-13782 Reviewed-by: ossi
| | | | * | Use regparm(3) for ICC too, otherwise it's an ABI mismatch in QCharThiago Macieira2010-09-211-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | Reviewed-By: Bradley T. Hughes
| | | | * | Regenerate the Unicode tables after updates to the generator toolThiago Macieira2010-09-212-65/+82
| | | | | |
| | | | * | Compile in C++0x modeThiago Macieira2010-09-211-1/+1
| | | | | |
| | | | * | remove extra includesRitt Konstantin2010-09-2111-10/+1
| | | | | |
| | | | * | minor clean-upsRitt Konstantin2010-09-211-26/+21
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | improve readability nicer output
| | | | * | minor improvements for data parsersRitt Konstantin2010-09-211-61/+77
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | improve readability of upperCase/lowerCase/titleCase/caseFolded code paths; additional tests make some parsers more consistent; minor speed-up
| | | | * | tiny clean-up for generated dataRitt Konstantin2010-09-211-2/+4
| | | | | |
| | | | * | move QUnicodeTables:: script() and lineBreakClass() implementationsRitt Konstantin2010-09-212-17/+18
| | | | | | | | | | | | | | | | | | | | | | | | from qchar.cpp to qunicodetables.cpp
| | | | * | make lupdate test less fragileOswald Buddenhagen2010-09-212-2/+8
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | the sensivity to additions of new calls to unimplemented qmake functions to .prf files kinda sucks, so remove it.
| | | | * | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into ↵Qt Continuous Integration System2010-09-2010-23/+150
| | | | |\ \ | | | | | |/ | | | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 4.7-integration * '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1: Enable building Qt/Webkit with debug symbols Add breakpad support
| | | | | * Enable building Qt/Webkit with debug symbolsAnders Bakken2010-09-203-23/+45
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | With this patch one can configure with -webkit-debug to build Webkit with debug symbols without having to manually edit WebCore.pro. Merge-request: 816 Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com>
| | | | | * Add breakpad supportMarco Bubke2010-09-207-0/+105
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Breakpad is a portable crash handler. It sends the raw crash information to a server for analysis. This analysis needs debug information. Consequently, we compile with debug info even in release mode if qt-breakpad integration is requested (via an environment variable). Reviewed-by: ossi
| | | * | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into ↵Qt Continuous Integration System2010-09-2228-131/+96
| | | |\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 4.7-integration * '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-2: (105 commits) Fixed drawing a large number of glyphs with the same font under GL. Bump version to 4.7.1. Qt headers must be included before X11 headers Fixes bezier curves not being drawn when it is a line. Avoid creating copy of an image in memory when storing as jpeg QSslSocketPrivate::systemCaCertificates() hangs sometimes on Symbian Add exception barrier to QCertificateRetriever::RunL() Reference correct declarative elements page. QtWebKit: Update tag files to match the same content on qtwebkit.git QtWebKit: Downstream patch 2 fixing a crash on MSVC 64bit. QtWebKit: Downstream patch 1 fixing a crash on MSVC 64bit. Doc: updating the qdocconf files and the stylesheet Doc: updating details on Tier 2 platforms Doc: adding remark on release of qt quick element support in creator Update configure.exe Revert "let WebKit inject itself into the qt configuration" Revert "fix qt_webkit_version.pri install for in-Qt builds" Revert "Fixed incorrect Symbian scoping." QS60Style: Itemviews are drawn incorrectly Change to commercial license headers in preparation for release. ...
| | | | * | | Fixed drawing a large number of glyphs with the same font under GL.Trond Kjernåsen2010-09-214-9/+30
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Our glyph caching system doesn't take GL texture size limitation into account, and assumes you can create an infinitely large texture. On top of that, the cache will never create a cache that is wider than 256, or QT_DEFAULT_TEXTURE_GLYPH_CACHE_WIDTH, which means we'll hit the texture size limit even faster. With this patch the entire texture is utilized. However, to fix in properly we need to support having multiple texture for each font engine. That will be fixed shortly (see task QTBUG-13784). Task-number: QT-3971 Reviewed-by: Eskil
| | | | * | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into 4.7Jason McDonald2010-09-213-72/+16
| | | | |\ \ \
| | | | | * | | Qt headers must be included before X11 headersBenjamin Poulain2010-09-211-3/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | X11 symbols are conflicting with some of the Qt ones. Qt headers needs to be included before the X11 ones in order to compile on Maemo. Reviewed-by: Samuel Rødal
| | | | | * | | Fixes bezier curves not being drawn when it is a line.Yoann Lopes2010-09-211-41/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Some old work-around code is no longer needed... Task-number: QTBUG-13721 Reviewed-by: Samuel
| | | | | * | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into 4.7aavit2010-09-210-0/+0
| | | | | |\ \ \
| | | | | * | | | Avoid creating copy of an image in memory when storing as jpegaavit2010-09-211-28/+13
| | | | | | |/ / | | | | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | Task-number: QT-3871 Reviewed-by: Kim
| | | | * | | | Bump version to 4.7.1.Jason McDonald2010-09-2121-50/+50
| | | | | |/ / | | | | |/| | | | | | | | | | | | | | | | Reviewed-by: Trust Me
generated by cgit v0.12 at 2025-01-15 08:15:55 (GMT)