summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* qdoc: Fixed the model/view programming page; tried a style change.Martin Smith2010-05-284-319/+166
|
* 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. ...
| | | * | | | 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
| | | * | | | Remove unused function in QDBusConnectionPrivateThiago Macieira2010-05-252-9/+0
| | | | | | |
| | | * | | | Merge branch '4.7' of git@scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.7Morten Engvoldsen2010-05-251-0/+4
| | | |\ \ \ \
| | | | * | | | Updating 4.7.0 change log.Bjørn Erik Nilsen2010-05-251-0/+4
| | | | | | | |
| | | * | | | | Doc: Fixing bugs in HTML generatorMorten Engvoldsen2010-05-251-4/+4
| | | |/ / / /
| * | | | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7-integrationQt Continuous Integration System2010-05-2610-170/+179
| |\ \ \ \ \ \ | | | |_|_|/ / | | |/| | | / | | |_|_|_|/ | |/| | | | | | | | | | | | | | | | | | | | | | * '4.7' of scm.dev.nokia.troll.no:qt/qt-qml: Mention TextInput/Edit::selectByMouse property in QmlChanges. Add inherits Item to TextEdit and TextInput docs. Clean up and don't allow clicks on already filled places Clean up project files for c++ examples
| | * | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7Bea Lam2010-05-2692-170/+843
| | |\ \ \ \ | | | | |_|/ | | | |/| | | | | | | | | | | | | | Conflicts: examples/declarative/toys/tic-tac-toe/tic-tac-toe.qml
| | | * | | Mention TextInput/Edit::selectByMouse property in QmlChanges.Martin Jones2010-05-253-2/+3
| | | | | |
| | | * | | Add inherits Item to TextEdit and TextInput docs.Martin Jones2010-05-252-2/+4
| | | | | | | | | | | | | | | | | | | | | | | | Task-number: QTBUG-10969
| | * | | | Clean up and don't allow clicks on already filled placesBea Lam2010-05-243-139/+149
| | | | | |
| | * | | | Clean up project files for c++ examplesBea Lam2010-05-244-28/+23
| | | | | |
| * | | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into ↵Qt Continuous Integration System2010-05-251-7/+3
| |\ \ \ \ \ | | |_|_|/ / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | 4.7-integration * '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-2: Doc: Removed a misleading sentence about signals.
| | * | | | Doc: Removed a misleading sentence about signals.David Boddie2010-05-251-7/+3
| | | | | | | | | | | | | | | | | | | | | | | | Reviewed-by: Stephen Kelly
| * | | | | Merge branch 'qt-4.7-from-4.6' of scm.dev.nokia.troll.no:qt/qt-integration ↵Qt Continuous Integration System2010-05-2557-101/+278348
| |\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | into 4.7-integration * 'qt-4.7-from-4.6' of scm.dev.nokia.troll.no:qt/qt-integration: (22 commits) Fix compilation of qegl.cpp after the last merge Fix a race condition with QtDBus blocking for replies. QtDBus: Debug message update Removed DEPLOYMENT from demos/spectrum/spectrum.pro Install source for spectrum demo Fixed path for copying launcher script for spectrum demo My 4.6.3 changes. Updated WebKit from /home/shausman/src/webkit/trunk to qtwebkit/qtwebkit-4.6 ( ecee9d7244ce4f7e7acf723bcef535532780db5f ) Fixed an assert in QMenu Backport multitouch bug fixes to 4.6 tst_bic: Add the Qt 4.5 and 4.6 baselines for x86-64 Call eglTerminate() when the last QEglContext is destroyed to free mem. Removed double EINTR loop from nativeWrite and nativeRead. Fixed qsslkey test deployment for Symbian and fixed compiler warnings. Fixing the race condition in event dispatcher implementation on changes-4.6.3 updated Fixing the compile issue. Fixing the compile issue. Typo. Removed nearest test from qaudiodeviceinfo unit test. ...
| | * | | | | Fix compilation of qegl.cpp after the last mergeThiago Macieira2010-05-251-1/+2
| | | | | | |
| | * | | | | Merge remote branch 'origin/4.6' into qt-4.7-from-4.6Thiago Macieira2010-05-2557-102/+278348
| | |\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: demos/spectrum/app/app.pro src/gui/egl/qegl.cpp tests/auto/qhttpnetworkconnection/qhttpnetworkconnection.pro tests/auto/qmenu/tst_qmenu.cpp
generated by cgit v0.12 at 2025-09-10 15:33:14 (GMT)