summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* 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
| | |
* | | 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
| | * \ \ \ Merge branch '4.6' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into ↵Qt Continuous Integration System2010-05-244-35/+84
| | |\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 4.6-integration * '4.6' of scm.dev.nokia.troll.no:qt/oslo-staging-1: Fix a race condition with QtDBus blocking for replies. QtDBus: Debug message update
| | | * | | | Fix a race condition with QtDBus blocking for replies.Thiago Macieira2010-05-244-34/+83
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | If an auxiliary thread tried to block on waiting for a reply, and at the same time the main thread handled the reply, there's room for a race condition. So ensure only one thread is stopped at dbus_pending_call_block(). The other thread(s) will be waiting on the QWaitCondition. It's not a race condition for the main thread to process (and finish processing) the reply while the auxiliary thread hasn't even started to wait. The code will ensure that the reply is properly seen. Task-Id: https://projects.maemo.org/bugzilla/show_bug.cgi?id=155306 Reviewed-By: Trust Me
| | | * | | | QtDBus: Debug message updateThiago Macieira2010-05-241-1/+1
| | | | | | |
| | * | | | | Merge branch '4.6' of scm.dev.nokia.troll.no:qt/qt-s60-public into ↵Qt Continuous Integration System2010-05-213-14/+19
| | |\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 4.6-integration * '4.6' of scm.dev.nokia.troll.no:qt/qt-s60-public: Removed DEPLOYMENT from demos/spectrum/spectrum.pro Install source for spectrum demo Fixed path for copying launcher script for spectrum demo
| | | * | | | | Removed DEPLOYMENT from demos/spectrum/spectrum.proGareth Stockwell2010-05-211-13/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | DEPLOYMENT was added to demos/spectrum/spectrum.pro as a workaround for QTBUG-5312, in order to allow 'make sis' to be executed from the demos/spectrum directory. While this workaround is OK for SBSv2, it causes a build failure when using SBSv1. Task-number: QTBUG-10833
| | | * | | | | Install source for spectrum demoGareth Stockwell2010-05-213-0/+18
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Task-number: QTBUG-10880 Reviewed-by: Thomas Zander
| | | * | | | | Fixed path for copying launcher script for spectrum demoGareth Stockwell2010-05-211-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Task-number: QTBUG-10879 Reviewed-by: Thomas Zander
| | * | | | | | Merge branch '4.6' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into ↵Qt Continuous Integration System2010-05-213-15/+88
| | |\ \ \ \ \ \ | | | |_|/ / / / | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 4.6-integration * '4.6' of scm.dev.nokia.troll.no:qt/oslo-staging-2: Fixed an assert in QMenu Call eglTerminate() when the last QEglContext is destroyed to free mem.
| | | * | | | | Merge branch '4.6' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into ↵Qt Continuous Integration System2010-05-213-15/+88
| | | |\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 4.6-integration * '4.6' of scm.dev.nokia.troll.no:qt/oslo-staging-2: Fixed an assert in QMenu Call eglTerminate() when the last QEglContext is destroyed to free mem.
| | | | * | | | | Fixed an assert in QMenuThierry Bastian2010-05-212-11/+55
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The code was changed and changed the behaviour. This is basically a kind of revert. Reviewed-By: gabi Task-Number: QTBUG-10735
| | | | * | | | | Call eglTerminate() when the last QEglContext is destroyed to free mem.Trond Kjernåsen2010-05-211-4/+33
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | We never called eglTerminate() to free memory allocated by eglInitialize() since it was a fixed allocation that would be used for the lifetime of an application. The new behavior is to call eglTerminate() when the last EGL context in the app is destroyed. Task-number: QT-3383 Reviewed-by: Rhys Weatherley
| | * | | | | | | Merge branch '4.6' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into ↵Qt Continuous Integration System2010-05-2143-17/+278235
| | |\ \ \ \ \ \ \ | | | |_|_|/ / / / | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 4.6-integration * '4.6' of scm.dev.nokia.troll.no:qt/oslo-staging-1: My 4.6.3 changes. Updated WebKit from /home/shausman/src/webkit/trunk to qtwebkit/qtwebkit-4.6 ( ecee9d7244ce4f7e7acf723bcef535532780db5f ) tst_bic: Add the Qt 4.5 and 4.6 baselines for x86-64
| | | * | | | | | My 4.6.3 changes.Yoann Lopes2010-05-211-0/+21
| | | | | | | | |
| | | * | | | | | Updated WebKit from /home/shausman/src/webkit/trunk to qtwebkit/qtwebkit-4.6 ↵Simon Hausmann2010-05-217-17/+206
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | ( ecee9d7244ce4f7e7acf723bcef535532780db5f ) Changes in WebKit/qt since the last update: * [Qt] Nested overflow div does not scroll https://bugs.webkit.org/show_bug.cgi?id=38641 * [Qt] Non animated gifs are animated in QtWebKit https://bugs.webkit.org/show_bug.cgi?id=35955 * [Qt] startAnimation() is not needed to preceede nativeImageForCurrentFrame() https://bugs.webkit.org/show_bug.cgi?id=37844 * Animated GIF images does not animate 10x as expected by default. https://bugs.webkit.org/show_bug.cgi?id=36818 Plus updated/fixed def files
| | | * | | | | | tst_bic: Add the Qt 4.5 and 4.6 baselines for x86-64Thiago Macieira2010-05-2135-0/+278008
| | | |/ / / / /
| | * | | | | | Merge branch '4.6' of scm.dev.nokia.troll.no:qt/qt-s60-public into ↵Qt Continuous Integration System2010-05-217-30/+86
| | |\ \ \ \ \ \ | | | |/ / / / / | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 4.6-integration * '4.6' of scm.dev.nokia.troll.no:qt/qt-s60-public: Backport multitouch bug fixes to 4.6 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
| | | * | | | | Backport multitouch bug fixes to 4.6Shane Kearns2010-05-212-7/+19
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | commit 24b811e53b30546279346ab7b16799be119ab8c4 on 4.7 includes bug fixes which are needed for 4.6 as well. 1. TouchEnd event was missing 2. pressure in touchpoints was set to 0.0 for non pressure sensitive touch screens, it should be set to 1.0 for consistency with existing Qt ports (e.g. mac). Task-number: QTBUG-10885 Reviewed-by: Bradley T. Hughes
| | | * | | | | Removed double EINTR loop from nativeWrite and nativeRead.Janne Anttila2010-05-211-8/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | qt_safe_write and and qt_safe_read already contain EINTR_LOOP. It seems that this loop has been added to code due to merge/clean-up errors in commits: 4aafbd6222e7aeafd59a4a4356ba8c53b2bfa1d1 f0a8feed9e9b4de10df76faa350201edaef98f1d Reviewed-by: Aleksandar Sasha Babic Reviewed-by: Markus Goetz
| | | * | | | | Fixed qsslkey test deployment for Symbian and fixed compiler warnings.Janne Anttila2010-05-212-5/+9
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Reviewed-by: Aleksandar Sasha Babic
| | | * | | | | Fixing the race condition in event dispatcher implementation onAleksandar Sasha Babic2010-05-212-10/+56
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Symbian platform New socket related requests are comming into QSelectThread by interrupting the select call by writing to pipe. One of the criteria is that m_mutex (from QSelectThread) could be locked, meaninig that QSelectThread is in m_waitCond.wait() call. However, the m_mutex can be locked by other contenders trying to post new requests in burst. This would trigger writing to pipe in false situations, making QSelectThread to hang in waitCond as no wakeAll will come until some next request (in future) kicks in. Task-number: QT-3358 Reviewed-by: Janne Anttila
| | * | | | | | Merge branch '4.6' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into ↵Qt Continuous Integration System2010-05-211-1/+21
| | |\ \ \ \ \ \ | | | |/ / / / / | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 4.6-integration * '4.6' of scm.dev.nokia.troll.no:qt/oslo-staging-1: changes-4.6.3 updated
| | | * | | | | changes-4.6.3 updatedJoerg Bornemann2010-05-211-1/+21
| | | | | | | |
| | * | | | | | Merge branch '4.6' of scm.dev.nokia.troll.no:qt/qt-s60-public into ↵Qt Continuous Integration System2010-05-212-1/+5
| | |\ \ \ \ \ \ | | | |/ / / / / | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 4.6-integration * '4.6' of scm.dev.nokia.troll.no:qt/qt-s60-public: Fixing the compile issue. Fixing the compile issue.
| | | * | | | | Fixing the compile issue.Aleksandar Sasha Babic2010-05-211-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Private headers have to be included in consistent and proper way: not like "name_p.h" or "../name_p.h" but <private/name_p.h>
| | | * | | | | Fixing the compile issue.Aleksandar Sasha Babic2010-05-211-0/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | We have to explicitely specify the include path to the MW headers for Symbian. The compiler always gets confused if the private headers get in the way. Reviewed-by: TrustMe
| | * | | | | | Merge branch '4.6' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into ↵Qt Continuous Integration System2010-05-211-1/+1
| | |\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 4.6-integration * '4.6' of scm.dev.nokia.troll.no:qt/oslo-staging-1: Typo.
generated by cgit v0.12 at 2024-10-27 10:39:47 (GMT)