summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Move includes after copyright blockMartin Jones2010-09-221-5/+2
|
* Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7-integrationQt Continuous Integration System2010-09-2216-15/+554
|\ | | | | | | | | | | | | | | | | | | | | | | * '4.7' of scm.dev.nokia.troll.no:qt/qt-qml: Mitigate private header problems in QtCreator by adding semi-private API Mitigate private header problems in QtCreator by adding semi-private API Update QtDeclarative def files Add exports for Bauhaus Fix corkboards example for smaller screens Fix easing example having wrong contentHeight Fix a crash in QDeclarativeVisualDataModel Small optimization for QDeclarativeVisualDataModel.
| * Mitigate private header problems in QtCreator by adding semi-private APIKai Koehne2010-09-224-0/+187
| | | | | | | | | | | | | | | | | | | | Add a semi-private API to get QScriptEngine for a QDeclarativeEngine. So far the qmljsdebugger lib in QtCreator accessed the script engine via QDeclarativeEnginePrivate. Replace this by a minimal API that is still in a private header, where we nevertheless can make some BC checks/guarantees. Aaron Kennedy agreed with the idea. Task-number: QTCREATORBUG-2179
| * Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7-integrationQt Continuous Integration System2010-09-2216-15/+367
| |\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * '4.7' of scm.dev.nokia.troll.no:qt/qt-qml: Mitigate private header problems in QtCreator by adding semi-private API Update QtDeclarative def files Add exports for Bauhaus Fix corkboards example for smaller screens Fix easing example having wrong contentHeight Fix a crash in QDeclarativeVisualDataModel Small optimization for QDeclarativeVisualDataModel.
| | * Mitigate private header problems in QtCreator by adding semi-private APIKai Koehne2010-09-227-3/+140
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Add a semi-private API to get QScriptEngine for a QDeclarativeEngine. So far the qmljsdebugger lib in QtCreator accessed the script engine via QDeclarativeEnginePrivate. Replace this by a minimal API that is still in a private header, where we nevertheless can make some BC checks/guarantees. Aaron Kennedy agreed with the idea. Task-number: QTCREATORBUG-2179
| | * Update QtDeclarative def filesJoona Petrell2010-09-222-0/+167
| | |
| | * Add exports for BauhausThomas Hartmann2010-09-212-2/+2
| | | | | | | | | | | | | | | | | | The QmlDesigner(Bauhaus) should not rely on -nokia-developer Reviewed-by: Marco Bubke
| | * Fix corkboards example for smaller screensJoona Petrell2010-09-211-4/+11
| | | | | | | | | | | | | | | Task-number: Reviewed-by: Martin Jones
| | * Fix easing example having wrong contentHeightJoona Petrell2010-09-211-1/+1
| | |
| | * Fix a crash in QDeclarativeVisualDataModelJoona Petrell2010-09-213-3/+44
| | | | | | | | | | | | | | | Task-number: QTBUG-13754 Reviewed-by: Martin Jones
| | * Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7-integrationQt Continuous Integration System2010-09-211-2/+2
| | |\ | | | | | | | | | | | | | | | | * '4.7' of scm.dev.nokia.troll.no:qt/qt-qml: Small optimization for QDeclarativeVisualDataModel.
| | | * Small optimization for QDeclarativeVisualDataModel.Michael Brasser2010-09-211-2/+2
| | | | | | | | | | | | | | | | Reviewed-by: Martin Jones
* | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into ↵Qt Continuous Integration System2010-09-227-58/+76
|\ \ \ \ | |/ / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 4.7-integration * '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1: We also don't need to watch for org.freedesktop.DBus changing owners Avoid adding match rules for NameAcquired and NameLost We don't need to add a match rule to receive messages targetted at us. Save the D-Bus's base service earlier. Pre-populate the watched services hash with org.freedesktop.DBus Quick performance optimisation: cache a QString with "org.freedesktop.DBus" XML schema internals: fix memory leak QNAM: Use QFileNetworkReply for qrc:/ URL schema Make the de-inlined isRightToLeft not get called from updateProperties Update the ICC mkspec: keep the stack aligned to 16-byte
| * | | We also don't need to watch for org.freedesktop.DBus changing ownersThiago Macieira2010-09-221-0/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | It never does. Task-number: QT-3881 Reviewed-By: Robin Burchell Reviewed-By: Ritt Konstantin
| * | | Avoid adding match rules for NameAcquired and NameLostThiago Macieira2010-09-221-9/+17
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | These two signals from org.freedesktop.DBus are delivered no matter what, because they are directed signals. So we don't need to add match rules for it. QDBusConnectionPrivate::connectSignal builds a match rule and adds it, so we shouldn't use it. Task-number: QT-3881 Reviewed-By: Robin Burchell Reviewed-By: Ritt Konstantin
| * | | We don't need to add a match rule to receive messages targetted at us.Thiago Macieira2010-09-221-18/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This wasn't explicit in the D-Bus specification until recently. The reference implementation of the daemon already does it. Task-number: QT-3881 Reviewed-By: Robin Burchell Reviewed-By: Ritt Konstantin
| * | | Save the D-Bus's base service earlier.Thiago Macieira2010-09-221-2/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | It's impossible for it not to be present, so there's no need to test for it. Reviewed-By: Robin Burchell Reviewed-By: Ritt Konstantin
| * | | Pre-populate the watched services hash with org.freedesktop.DBusThiago Macieira2010-09-222-0/+7
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The D-Bus specification doesn't require GetNameOwner("org.freedesktop.DBus") to return anything in specific, but the reference implementation always returns "org.freedesktop.DBus". The Python D-Bus bindings even require it. So add the same assumption to QtDBus, which saves a round-trip at the application start to ask the server what its own owner is Reviewed-By: Robin Burchell Reviewed-By: Ritt Konstantin
| * | | Quick performance optimisation: cache a QString with "org.freedesktop.DBus"Thiago Macieira2010-09-221-9/+17
| | | | | | | | | | | | | | | | | | | | Reviewed-By: Robin Burchell Reviewed-By: Ritt Konstantin
| * | | XML schema internals: fix memory leakPeter Hartmann2010-09-221-0/+1
| | | | | | | | | | | | | | | | | | | | Patch-by: Tobias König Task-number: QTBUG-8948
| * | | QNAM: Use QFileNetworkReply for qrc:/ URL schemaMisha Tyutyunik2010-09-222-3/+6
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Resources do not need network access and can be quicker loaded with QFileNetworkReply. Reviewed-by: Markus Goetz
| * | | Make the de-inlined isRightToLeft not get called from updatePropertiesThiago Macieira2010-09-221-20/+23
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Before Qt 4.7, QString::isRightToLeft was an inline function that called QString::updateProperties(). In Qt 4.7, QString::isRightToLeft was de-inlined and is now called from QString::updateProperties(). According to the Binary Compatibility Guidelines, it's ok to de-inline a function provided that it's ok the old method is called. Under some rare circumstances nowadays, the old method could be called from updateProperties(), which would result in an infinite loop (updateProperties -> isRightToLeft -> updateProperties -> ...) This is usually prevented by -fvisibility-inlines-hidden in GCC (automatic in Qt) and also by -Wl,-Bsymbolic-functions (not automatic, must pass -reduced-relocations to configure). Reviewed-by: Bradley T. Hughes
| * | | Update the ICC mkspec: keep the stack aligned to 16-byteThiago Macieira2010-09-221-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | After discussing with Intel, turns out that ICC defaults to aligning the stack when it needs to (e.g., when issuing aligned operations), but doesn't care otherwise. GCC, on the other hand, expects the stack to always be aligned and will issue instructions without checking. We'll probably add __attribute__((force_align_arg_pointer)) to some functions in our code, but we won't be able to catch everything. Reviewed-By: Bradley T. Hughes
* | | | 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-08-26 23:59:52 (GMT)