summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Doc: Removed a misleading sentence about a class constructor.David Boddie2010-05-311-4/+2
| | | | | Reviewed-by: Trust Me Task-number: QTBUG-10479
* Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into 4.7David Boddie2010-05-28233-1772/+3159
|\
| * Fixed bug where testlib would not respect the -iterations option.Samuel Rødal2010-05-281-1/+1
| | | | | | | | Reviewed-by: Morten Sørvig
| * Improve precision of testlib benchmarking.Samuel Rødal2010-05-282-1/+7
| | | | | | | | | | | | | | | | | | | | | | | | | | 20 ms is a bit too to get a precise measurement due to limited timer resolution. We increase the limit to 50 ms and introduce a warm-up iteration to prevent any state or cache-related issues which can be hard to account for in the tests. On the N900 this seems to decrease the variance of test results by 30 %, and fixes some cases where the results were way off due to hidden state. Task-number: QT-3390 Reviewed-by: Morten Sørvig
| * QMetaMethod::invoke: Document that the function does not check the argumentsOlivier Goffart2010-05-281-0/+7
| | | | | | | | | | | | And added an assert to ease debugging Task-number: QTBUG-10945
| * add test for QMetaMethod::invokeOlivier Goffart2010-05-281-0/+51
| |
| * Make QGLBuffer copiableRhys Weatherley2010-05-282-11/+90
| | | | | | | | Reviewed-by: Gunnar
| * Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into ↵Qt Continuous Integration System2010-05-288-102/+146
| |\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 4.7-integration * '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-2: Wrong QGraphicsItem::childrenBoundingRect() when applying effects. Fix a bug in QDirectFBPixmapData::fromImage Replace memmove with memcpy Fixed compilation of QtOpenGL. Optimize initialization of QStaticText
| | * Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into ↵Qt Continuous Integration System2010-05-278-102/+146
| | |\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 4.7-integration * '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-2: Wrong QGraphicsItem::childrenBoundingRect() when applying effects. Fix a bug in QDirectFBPixmapData::fromImage Replace memmove with memcpy Fixed compilation of QtOpenGL. Optimize initialization of QStaticText
| | | * Wrong QGraphicsItem::childrenBoundingRect() when applying effects.Bjørn Erik Nilsen2010-05-272-3/+32
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Problem was that we used the children's raw bounding rect instead of using their effective bounding rect when calculating the bounds. Auto test included. Task-number: QTBUG-10756
| * | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into ↵Qt Continuous Integration System2010-05-2810-83/+103
| |\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 4.7-integration * '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1: fix escaping - by not using eval escape backslashes in QMAKE_PRL_LIBS fix & unify path separator escaping Removed unused variable Upgrade harfbuzz to the latest version
| | * | | fix escaping - by not using evalOswald Buddenhagen2010-05-273-19/+19
| | | | | | | | | | | | | | | | | | | | | | | | | the left-hand-side of qmake assignments is expanded, so there is no need to use eval.
| | * | | escape backslashes in QMAKE_PRL_LIBSOswald Buddenhagen2010-05-271-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | they may contain (absolute) windows paths, which need escaping now. Reviewed-by: mauricek
| | * | | fix & unify path separator escapingOswald Buddenhagen2010-05-273-49/+58
| | | | | | | | | | | | | | | | | | | | Reviewed-by: mauricek
| | * | | Removed unused variableThorbjørn Lindeijer2010-05-271-1/+0
| | | | | | | | | | | | | | | | | | | | Reviewed-by: Olivier Goffart
| | * | | Upgrade harfbuzz to the latest versionLars Knoll2010-05-272-13/+25
| | |/ / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge the folling changes from harfbuzz: commit 85ad0ddd092522b4cff251f324128662f100991f Author: Lars Knoll <lars.knoll@nokia.com> Date: Thu May 27 16:05:00 2010 +0200 use unsigned char instead of unsigned in the bitfield. This saves significant memory, as the HB_CharAttributes and HB_GlyphAttributes structures are not 4 byte aligned anymore, by aligned to 1 resp. 2 bytes. The change is not compliant with ISO C, but accepted by almost all compilers. commit 30f0e6c3d0aa67ab9ff95c60903fe28c4df80fbc Author: Behdad Esfahbod <behdad@behdad.org> Date: Mon May 17 15:43:46 2010 -0400 [hangul] Fix typo Reviewed-By: Thiago Macieira
| * | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7-integrationQt Continuous Integration System2010-05-2710-188/+130
| |\ \ \ | | |/ / | |/| | | | | | | | | | | | | | | | | | * '4.7' of scm.dev.nokia.troll.no:qt/qt-qml: Tweak aesthetics of QML viewer inside QtDemo Add key event handling to the declarative web view Improve gradient docs
| | * | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7Alan Alpert2010-05-27209-1531/+2875
| | |\ \
| | * | | Tweak aesthetics of QML viewer inside QtDemoAlan Alpert2010-05-278-175/+118
| | | | | | | | | | | | | | | | | | | | | | | | | Make the UX more controlled from QML, and tweak the frame to be better. Blur mechanism has been reworked, but still disabled by default.
| | * | | Add key event handling to the declarative web viewAlan Alpert2010-05-261-13/+8
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This is a very simple approach, I don't know if a more nuanced system would be appropriate. Task-number: QTBUG-11025
| | * | | Improve gradient docsAlan Alpert2010-05-261-0/+4
| | | | |
| * | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into ↵Qt Continuous Integration System2010-05-277-7/+52
| |\ \ \ \ | | |_|/ / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 4.7-integration * '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1: Remove superfluous forward declaration. Update documentation for the -font command line option Fixed a crash when creating QGtkStyle before QApplication Added support for Indonesian language on Symbian. Ensure that activation object has been created before popping scope of native context
| | * | | Remove superfluous forward declaration.kh12010-05-271-3/+0
| | | | | | | | | | | | | | | | | | | | | | | | | Task-number: QTBUG-11049 Reviewed-by: ck
| | * | | Update documentation for the -font command line optionBradley T. Hughes2010-05-271-1/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This option is ignored when Qt is built with fontconfig support, make sure it is documented. Task-number: QTBUG-3671
| | * | | Fixed a crash when creating QGtkStyle before QApplicationJens Bache-Wiig2010-05-272-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | | Task-number: QTBUG-10758 Reviewed-by: ogoffart
| | * | | Added support for Indonesian language on Symbian.Denis Dzyubenko2010-05-271-1/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | We have support for ELangIndonesian, but we also need to support new ELangIndonesian_Apac which has appeared in Symbian^3. Task-number: QT-3369 Reviewed-by: trustme
| | * | | Ensure that activation object has been created before popping scope of ↵Kent Hansen2010-05-272-0/+46
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | native context One shouldn't have to call activationObject() or scopeChain() before calling popScope(); the scope chain should always have 2 items (activation and global object) before we start popping anything from the internal chain. Task-number: QTBUG-11020 Reviewed-by: Olivier Goffart
| * | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7-integrationQt Continuous Integration System2010-05-2720-89/+321
| |\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * '4.7' of scm.dev.nokia.troll.no:qt/qt-qml: Improve QML framerate debugging If a pathview delegate changes size, reposition center on path Remove deprecated Flickable::overshoot property. Don't display unnecessary copyright headers in doc
| | * \ \ \ Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7Aaron Kennedy2010-05-27130-391/+279302
| | |\ \ \ \
| | | * | | | If a pathview delegate changes size, reposition center on pathMartin Jones2010-05-275-6/+46
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Task-number: QTBUG-11006
| | | * | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7Martin Jones2010-05-26120-358/+279251
| | | |\ \ \ \ | | | | | |/ / | | | | |/| |
| | | * | | | Remove deprecated Flickable::overshoot property.Martin Jones2010-05-262-24/+0
| | | | | | |
| | | * | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7Martin Jones2010-05-267-166/+172
| | | |\ \ \ \
| | | * | | | | Don't display unnecessary copyright headers in docMartin Jones2010-05-267-10/+10
| | | | | | | |
| | * | | | | | Improve QML framerate debuggingAaron Kennedy2010-05-276-49/+265
| | | | | | | |
| * | | | | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into ↵Qt Continuous Integration System2010-05-27181-1433/+2409
| |\ \ \ \ \ \ \ | | | |_|_|_|/ / | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 4.7-integration * '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1: (57 commits) escape quotes meant for the shell escape backslashes complain about unescaped backslashes qaccessibility::eventTest(...) was failing. qdoc: Fixed the French version of the address book tutorial qdoc: Improved the address book tutorial Fix build when snap functionality is not available. Dont crash when assigning the same input context twice. Fixed a typo in variable name in qlocale data generator. Fix for Norwegian and Korean languages on symbian. Remove unused function in QDBusConnectionPrivate Doc: Fixing bugs in HTML generator Updating 4.7.0 change log. Doc: Correcting style to class lists qdoc: Improved class index page. Added MSVC 2010 project files to .gitignore Fix architecture detection on GNU/Hurd. Revert "tst_bic: make it possible to test for cross-compilation" fix typo in documentation Improve Bearer Management related documentation in QNetworkAccessManager ...
| | * | | | | | Merge remote branch 'origin/4.7' into oslo-staging-1Aaron McCarthy2010-05-2770-259/+1045
| | |\ \ \ \ \ \ | | |/ / / / / / | |/| | | | | | | | | | | | | | | | | | | | | | Conflicts: doc/src/declarative/advtutorial.qdoc
| * | | | | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into ↵Qt Continuous Integration System2010-05-264-1/+98
| |\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 4.7-integration * '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-2: Redraw issues when removing a fully transparent QGraphicsItem from the scene. Fixes a proxymodel sorting odity.
| | | * | | | | | escape quotes meant for the shellOswald Buddenhagen2010-05-261-1/+1
| | | | | | | | |
| | | * | | | | | escape backslashesOswald Buddenhagen2010-05-2656-142/+142
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | this makes windows-style path specs *ugly*. that's intentional. :-P
| | | * | | | | | complain about unescaped backslashesOswald Buddenhagen2010-05-262-0/+7
| | | | | | | | |
| | | * | | | | | qaccessibility::eventTest(...) was failing.Carlos Manuel Duclos Vergara2010-05-261-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The problem here is the fact that to test the mouse click the test depended on some "magical" coordinates which are not valid anymore. But since QTest::mouseClick(...) will target the center of the button, there is no need to calculate coordinates. Reviewed-by: Richard Moe Gustavsen
| | | * | | | | | qdoc: Fixed the French version of the address book tutorialMartin Smith2010-05-261-23/+7
| | | | | | | | |
| | | * | | | | | Merge branch '4.7' of git@scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.7Martin Smith2010-05-26142-464/+279266
| | | |\ \ \ \ \ \
| | | | * \ \ \ \ \ Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into ↵Qt Continuous Integration System2010-05-26119-1140/+2140
| | | | |\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 4.7-integration * '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1: (51 commits) Fix build when snap functionality is not available. Dont crash when assigning the same input context twice. Fixed a typo in variable name in qlocale data generator. Fix for Norwegian and Korean languages on symbian. Remove unused function in QDBusConnectionPrivate Doc: Fixing bugs in HTML generator Updating 4.7.0 change log. Doc: Correcting style to class lists qdoc: Improved class index page. Added MSVC 2010 project files to .gitignore Fix architecture detection on GNU/Hurd. Revert "tst_bic: make it possible to test for cross-compilation" fix typo in documentation Improve Bearer Management related documentation in QNetworkAccessManager Compile with QT_NO_ACTION. Unbreak compilation outside Mac QDBusAbstractInterface: don't set lastError outside the object's own thread tst_bic: make it possible to test for cross-compilation Remove Q_PACKED from QChar and QLocale::Data. QDebug operator for QFlags ...
| | | | | * | | | | | Fix build when snap functionality is not available.Aaron McCarthy2010-05-251-2/+2
| | | | | | | | | | |
| | | | | * | | | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into ↵Qt Continuous Integration System2010-05-25118-1138/+2138
| | | | | |\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 4.7-integration * '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1: (50 commits) Dont crash when assigning the same input context twice. Fixed a typo in variable name in qlocale data generator. Fix for Norwegian and Korean languages on symbian. Remove unused function in QDBusConnectionPrivate Doc: Fixing bugs in HTML generator Updating 4.7.0 change log. Doc: Correcting style to class lists qdoc: Improved class index page. Added MSVC 2010 project files to .gitignore Fix architecture detection on GNU/Hurd. Revert "tst_bic: make it possible to test for cross-compilation" fix typo in documentation Improve Bearer Management related documentation in QNetworkAccessManager Compile with QT_NO_ACTION. Unbreak compilation outside Mac QDBusAbstractInterface: don't set lastError outside the object's own thread tst_bic: make it possible to test for cross-compilation Remove Q_PACKED from QChar and QLocale::Data. QDebug operator for QFlags Removing unneeded qDebug statement. ...
| | | | | | * | | | | | Dont crash when assigning the same input context twice.Denis Dzyubenko2010-05-252-4/+10
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Added a guard check to return if the given input context is the same is we already have. Explicitly mention in the doc that we take ownership of the given input context object. Task-number: QTBUG-10780 Reviewed-by: Thomas Zander
| | | | | | * | | | | | Fixed a typo in variable name in qlocale data generator.Denis Dzyubenko2010-05-251-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Reviewed-by: trustme
| | | | | | * | | | | | Fix for Norwegian and Korean languages on symbian.Denis Dzyubenko2010-05-252-60/+62
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Last commits added Norwegian Nynorsk and Korean locales support, however the array that contains the mapping between symbian locale constant and locale string should be sorted to work. Task-number: QT-3368 Task-number: QT-3370 Reviewed-by: trustme