summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* 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/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.
| * | | | | | Redraw issues when removing a fully transparent QGraphicsItem from the scene.Bjørn Erik Nilsen2010-05-262-0/+61
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This only happened with fully transparent ancestors (item's effectiveOpacity() == 0.0). Problem was that we didn't take into account the ancestors' opacity when removing an item from the scene. More specifically: The calculated effective opacity for the item was zero and we ignored update requests. We have to ignore the opacity if any of the ancestors' ignoreOpacity bit is 1, which means the opacity is set to 0 and the update request has not yet been processed. Auto test included. Task-number: QTBUG-10778
| * | | | | | Fixes a proxymodel sorting odity.Pierre Rossi2010-05-262-1/+37
|/ / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Sort order was modified when sorted according to an empty column always in the same order Reviewed-by: Thierry
* | | | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into ↵Qt Continuous Integration System2010-05-264-8/+47
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 4.7-integration * '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-2: tst_qxmlstream: fix in shadowbuild QXmlStreamWriter: Auto-formatting does not behave properly with processing instructions. Update the state of the keyboard modifiers on drop events.
| * | | | | | tst_qxmlstream: fix in shadowbuildOlivier Goffart2010-05-262-6/+8
| | | | | | |
| * | | | | | QXmlStreamWriter: Auto-formatting does not behave properly with processing ↵Jakub Wieczorek2010-05-262-1/+19
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | instructions. When writing a processing instruction with auto-formatting enabled, it should put it in a new line for readability and apply the indentation properly. Merge-request: 620 Reviewed-by: Olivier Goffart <olivier.goffart@nokia.com>
| * | | | | | Update the state of the keyboard modifiers on drop events.David Faure2010-05-261-1/+20
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | In the case of drag-n-drop between processes we do not get key events for the pressed modifiers, so we need to update the state of the modifiers (using XQueryPointer) to get a correct value of QApplication::keyboardModifiers() and QDropEvent::keyboardModifiers() at drop time. This is necessary for fixing KDE bug 178679. Merge-request: 590 Reviewed-by: Bradley T. Hughes <bradley.hughes@nokia.com> Reviewed-by: Andreas Aardal Hanssen <andreas.aardal.hanssen@nokia.com>
* | | | | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7-integrationQt Continuous Integration System2010-05-2662-250/+900
|\ \ \ \ \ \ \ | | |_|_|_|_|/ | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * '4.7' of scm.dev.nokia.troll.no:qt/qt-qml: Doc fixes, improvements Allow js files with '.pragma library' to be used from WorkerScript Add more examples of XPath expressions to XmlRole. Open input panel on press if TextInput or TextEdit are already focused but panel has been closed Fix horizontal/verticalCenter anchors bug. Fix TextEdit clipping when not wrapped. Rename most-useful-wrap-mode to "Wrap". Fix for qml reloaded in qml viewer not being maximized properly on a device Unify naming of import plugin targets Add a way to control when software input panels are shown in TextInput and TextEdit elements Replace QTime with QElapsedTimer Fix Gradient doc snippet.
| * | | | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7-integrationQt Continuous Integration System2010-05-2662-250/+900
| |\ \ \ \ \ \ |/ / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * '4.7' of scm.dev.nokia.troll.no:qt/qt-qml: Doc fixes, improvements Allow js files with '.pragma library' to be used from WorkerScript Add more examples of XPath expressions to XmlRole. Open input panel on press if TextInput or TextEdit are already focused but panel has been closed Fix horizontal/verticalCenter anchors bug. Fix TextEdit clipping when not wrapped. Rename most-useful-wrap-mode to "Wrap". Fix for qml reloaded in qml viewer not being maximized properly on a device Unify naming of import plugin targets Add a way to control when software input panels are shown in TextInput and TextEdit elements Replace QTime with QElapsedTimer Fix Gradient doc snippet.
| * | | | | | Doc fixes, improvementsBea Lam2010-05-267-77/+72
| | | | | | |
| * | | | | | Allow js files with '.pragma library' to be used from WorkerScriptBea Lam2010-05-268-29/+77
| | | | | | |
| * | | | | | Add more examples of XPath expressions to XmlRole.Bea Lam2010-05-263-10/+118
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Task-number: QTBUG-10852
| * | | | | | Open input panel on press if TextInput or TextEdit are already focused but ↵Joona Petrell2010-05-264-0/+28
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | panel has been closed Task-number: Reviewed-by: Martin Jones
| * | | | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7Warwick Allison2010-05-2639-263/+666
| |\ \ \ \ \ \
| | * | | | | | Fix horizontal/verticalCenter anchors bug.Yann Bodson2010-05-264-18/+43
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Task-number: QTBUG-10999 Reviewed-by: Michael Brasser
| | * | | | | | Fix for qml reloaded in qml viewer not being maximized properly on a deviceJoona Petrell2010-05-261-1/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Task-number: Reviewed-by: Martin Jones
| | * | | | | | Unify naming of import plugin targetsJoona Petrell2010-05-2619-26/+37
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Task-number: QTBUG-10834 Reviewed-by: Warwick Allison
| | * | | | | | Add a way to control when software input panels are shown in TextInput and ↵Joona Petrell2010-05-268-52/+413
| | | |_|/ / / | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | TextEdit elements Task-number: QTBUG-10841 Reviewed-by: Warwick Allison
| | * | | | | Replace QTime with QElapsedTimerAaron Kennedy2010-05-261-2/+2
| | | | | | |
| | * | | | | Fix Gradient doc snippet.Yann Bodson2010-05-262-5/+3
| | | |_|_|/ | | |/| | |
| * | | | | Fix TextEdit clipping when not wrapped. Rename most-useful-wrap-mode to "Wrap".Warwick Allison2010-05-2611-30/+104
| | |_|_|/ | |/| | |
| | | | * 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. ...