summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Stop other mouse buttons propagatingAlan Alpert2010-06-241-0/+1
|
* Expand on warning messageAlan Alpert2010-06-241-1/+1
|
* Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7Alan Alpert2010-06-241675-46144/+35320
|\
| * Fix import path in cppextensions declarative example.Christian Kamm2010-06-241-1/+1
| | | | | | | | Reviewed-by: Erik Verbruggen
| * Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7-integrationQt Continuous Integration System2010-06-2458-410/+1039
| |\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * '4.7' of scm.dev.nokia.troll.no:qt/qt-qml: Update tests following QDeclarativeFlickable::viewport() -> contentIem() Prevent value source animations from being registered to start twice. Make compile. More script benchmarking. Expose the Flickable's internal contentItem Script benchmarking. Update lupdate to recognize concatenated text in QML files. Ensure sourcesize is in pixmap cache key. Use ugly but reliable bitmaps fonts in test. doc: note that calling methods before component completion may have no effect Fix unstable qdeclarativeviewer tests Use Pen with Qt::MiterJoin when drawing Rectangles with gradients Update screenshot Fix and better test Text / TextEdit alignments. Ensure the view is correctly positioned at component complete. Support for non-literal plural arguments to qsTr() in lupdate (QML). References to undefined variables throws a ReferenceError
| | * Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7Martin Jones2010-06-247-5/+79
| | |\
| | | * Prevent value source animations from being registered to start twice.Michael Brasser2010-06-243-0/+47
| | | | | | | | | | | | | | | | | | | | If the animation had an explicit "running: true", the animation would be registered with the engine twice, which prevented a proper start.
| | | * Make compile.Michael Brasser2010-06-241-1/+1
| | | |
| | | * More script benchmarking.Michael Brasser2010-06-243-4/+31
| | | |
| | * | Update tests following QDeclarativeFlickable::viewport() -> contentIem()Martin Jones2010-06-243-214/+214
| | |/
| | * Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7Martin Jones2010-06-2424-53/+291
| | |\
| | | * Script benchmarking.Michael Brasser2010-06-244-4/+157
| | | |
| | | * Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7-integrationQt Continuous Integration System2010-06-2445-154/+527
| | | |\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * '4.7' of scm.dev.nokia.troll.no:qt/qt-qml: Update lupdate to recognize concatenated text in QML files. Ensure sourcesize is in pixmap cache key. Use ugly but reliable bitmaps fonts in test. doc: note that calling methods before component completion may have no effect Fix unstable qdeclarativeviewer tests Use Pen with Qt::MiterJoin when drawing Rectangles with gradients Update screenshot Fix and better test Text / TextEdit alignments. Ensure the view is correctly positioned at component complete. Support for non-literal plural arguments to qsTr() in lupdate (QML). References to undefined variables throws a ReferenceError
| | | | * Update lupdate to recognize concatenated text in QML files.Michael Brasser2010-06-241-16/+56
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Also fixes a potential crash with non-string-literal nodes. Task-number: QTBUG-11580
| | * | | Expose the Flickable's internal contentItemMartin Jones2010-06-247-41/+70
| | | |/ | | |/| | | | | | | | | | | | | | | | | | | | | | | | | So that dynamically created items can be parented to the contentItem and be flicked with the rest of the content. Task-number: QTBUG-11674 Reviewed-by: Aaron Kennedy
| | * | Ensure sourcesize is in pixmap cache key.Warwick Allison2010-06-241-0/+6
| | | | | | | | | | | | | | | | Task-number: QTBUG-11645
| | * | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7Warwick Allison2010-06-243-0/+36
| | |\ \
| | | * | doc: note that calling methods before component completion may have no effectMartin Jones2010-06-233-0/+36
| | | | | | | | | | | | | | | | | | | | So use Component.onCompleted:
| | * | | Use ugly but reliable bitmaps fonts in test.Warwick Allison2010-06-2420-0/+2
| | |/ /
| | * | Fix unstable qdeclarativeviewer testsBea Lam2010-06-231-2/+2
| | | |
| | * | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7-integrationQt Continuous Integration System2010-06-2342-138/+427
| | |\ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * '4.7' of scm.dev.nokia.troll.no:qt/qt-qml: Use Pen with Qt::MiterJoin when drawing Rectangles with gradients Update screenshot Fix and better test Text / TextEdit alignments. Ensure the view is correctly positioned at component complete. Support for non-literal plural arguments to qsTr() in lupdate (QML). References to undefined variables throws a ReferenceError
| | | * \ Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7Warwick Allison2010-06-232-0/+1
| | | |\ \
| | | | * | Use Pen with Qt::MiterJoin when drawing Rectangles with gradientsBea Lam2010-06-231-0/+1
| | | | | | | | | | | | | | | | | | | | | | | | Task-number: QTBUG-11624
| | | | * | Update screenshotBea Lam2010-06-231-0/+0
| | | | | |
| | | * | | Fix and better test Text / TextEdit alignments.Warwick Allison2010-06-2327-56/+326
| | | |/ / | | | | | | | | | | | | | | | | | | | | | | | | | Various clipping and refresh bugs. Task-number: QTBUG-11492
| | | * | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7Martin Jones2010-06-232-12/+5
| | | |\ \
| | | | * | Support for non-literal plural arguments to qsTr() in lupdate (QML).Michael Brasser2010-06-231-12/+4
| | | | | | | | | | | | | | | | | | | | | | | | Task-number: QTBUG-11579
| | | | * | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7-integrationQt Continuous Integration System2010-06-236-25/+31
| | | | |\ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | * '4.7' of scm.dev.nokia.troll.no:qt/qt-qml: References to undefined variables throws a ReferenceError
| | | * | | | Ensure the view is correctly positioned at component complete.Martin Jones2010-06-236-45/+65
| | | | |/ / | | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | If a currentIndex has been specified, ensure the view starts at the correct position immediately, rather than scrolling to it after startup.
| | | * | | References to undefined variables throws a ReferenceErrorAaron Kennedy2010-06-236-25/+31
| | | | | | | | | | | | | | | | | | | | | | | | This is consistent with normal JavaScript
| * | | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-webkit into 4.7-integrationQt Continuous Integration System2010-06-248-5/+46
| |\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | * '4.7' of scm.dev.nokia.troll.no:qt/qt-webkit: Updated WebKit to b3589e88fb8d581fb523578763831109f914dc2e
| | * \ \ \ \ Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-webkit into 4.7-integrationQt Continuous Integration System2010-06-248-5/+46
| | |\ \ \ \ \ | | | |_|_|_|/ | | |/| | | | | | | | | | | | | | | | | | * '4.7' of scm.dev.nokia.troll.no:qt/qt-webkit: Updated WebKit to b3589e88fb8d581fb523578763831109f914dc2e
| | | * | | | Updated WebKit to b3589e88fb8d581fb523578763831109f914dc2eSimon Hausmann2010-06-238-5/+47
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * Build fixes for package builds * Fix build with QT_NO_COMBOBOX * Upstream David's doc fix
| * | | | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into ↵Qt Continuous Integration System2010-06-2426-374/+1128
| |\ \ \ \ \ \ | | |/ / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 4.7-integration * '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1: Abort open early if network session is in the process of openning. Cherry pick fix for MOBILITY-800 from Qt Mobility. Cherry pick fix for MOBILITY-1063 from Qt Mobility. Cherry pick fix for QTMOBILITY-253 from Qt Mobility. Cherry pick fix for MOBILITY-1063 from Qt Mobility. Cherry pick fix for MOBILITY-965 from Qt Mobility. Cherry pick fix for MOBILITY-800 from Qt Mobility. Cherry pick fix for MOBILITY-853 from Qt Mobility. Cherry pick fix for MOBILITY-1047 from Qt Mobility. Merge bearermanagement changes from Qt Mobility. Cherry pick fix for MOBILITY-1031 from Qt Mobility. Cherry pick fix for MOBILITY-938 from Qt Mobility. Cherry pick fix for QTMOBILITY-240 from Qt Mobility. Make QtFontFamily::symbol_checked a bitfield.
| | * | | | | Abort open early if network session is in the process of openning.Aaron McCarthy2010-06-242-5/+20
| | | | | | |
| | * | | | | Cherry pick fix for MOBILITY-800 from Qt Mobility.Aaron McCarthy2010-06-243-70/+61
| | | | | | | | | | | | | | | | | | | | | | | | | | | | 21abc07dc396f08c888bf3cac96b535cc296cb00
| | * | | | | Cherry pick fix for MOBILITY-1063 from Qt Mobility.Aaron McCarthy2010-06-241-6/+29
| | | | | | | | | | | | | | | | | | | | | | | | | | | | 4713262c16cb3eba1f4beccb6962a1ae210479c0
| | * | | | | Cherry pick fix for QTMOBILITY-253 from Qt Mobility.Aaron McCarthy2010-06-245-5/+5
| | | | | | | | | | | | | | | | | | | | | | | | | | | | f3d7f49b7f6975cbfa65adeb10b281e2b37172ce
| | * | | | | Cherry pick fix for MOBILITY-1063 from Qt Mobility.Aaron McCarthy2010-06-242-57/+96
| | | | | | | | | | | | | | | | | | | | | | | | | | | | 37ad80914f7acb8d4f3364d78e75d48cd14e8e2a
| | * | | | | Cherry pick fix for MOBILITY-965 from Qt Mobility.Aaron McCarthy2010-06-243-10/+147
| | | | | | | | | | | | | | | | | | | | | | | | | | | | 50de830ded2dcc1c6b4d8be71428d9a2bfed6ae7
| | * | | | | Cherry pick fix for MOBILITY-800 from Qt Mobility.Aaron McCarthy2010-06-243-7/+31
| | | | | | | | | | | | | | | | | | | | | | | | | | | | a05504d2a0c643c6f253527f07bcc0dba8a799b4
| | * | | | | Cherry pick fix for MOBILITY-853 from Qt Mobility.Aaron McCarthy2010-06-242-0/+71
| | | | | | | | | | | | | | | | | | | | | | | | | | | | 256e67963c4cb0fc150e6c47193e7c9b17296611
| | * | | | | Cherry pick fix for MOBILITY-1047 from Qt Mobility.Aaron McCarthy2010-06-241-2/+9
| | | | | | | | | | | | | | | | | | | | | | | | | | | | 4f74cd44d77349759096bed091913b188a9167e4
| | * | | | | Merge bearermanagement changes from Qt Mobility.Aaron McCarthy2010-06-2410-8/+358
| | | | | | | | | | | | | | | | | | | | | | | | | | | | cba220f177154428d6103a93a819668be689a591
| | * | | | | Cherry pick fix for MOBILITY-1031 from Qt Mobility.Aaron McCarthy2010-06-243-22/+29
| | | | | | | | | | | | | | | | | | | | | | | | | | | | 7e8b55524bd8a00e49e11103e8c8091e1e59e612
| | * | | | | Cherry pick fix for MOBILITY-938 from Qt Mobility.Aaron McCarthy2010-06-246-159/+223
| | | | | | | | | | | | | | | | | | | | | | | | | | | | 216f4016d1b447d51630086afca179df11fd6997
| | * | | | | Cherry pick fix for QTMOBILITY-240 from Qt Mobility.Aaron McCarthy2010-06-242-62/+88
| | | | | | | | | | | | | | | | | | | | | | | | | | | | c84a6d828bcb7f66d1ac06e1a7a84c5a8ba9cec4
| | * | | | | Make QtFontFamily::symbol_checked a bitfield.Andreas Kling2010-06-241-1/+1
| |/ / / / / | | | | | | | | | | | | | | | | | | Reviewed-by: Benjamin Poulain <benjamin.poulain@nokia.com>
| * | | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into ↵Qt Continuous Integration System2010-06-2314-33/+68
| |\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 4.7-integration * '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1: We need to swallow the event, otherwise it might pop up several times. Set the item data thru the model, so we actually emit dataChanged. There where still references to the old Assistant. Newly created folders in QFileDialog are disabled on Cocoa. don't remove the path from the name of included files add some comments remove support for QMAKE_POST_INCLUDE_FILES remove unused function fix prompt() stdin safety check Improve text performance with QtWebKit in Qt 4.7 Removed support for static linking of QtWebKit. When a drag is finished with on Mac, then it should delete itself
| | * \ \ \ \ Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt into 4.7Simon Hausmann2010-06-231-2/+2
| | |\ \ \ \ \ | | | |/ / / /
generated by cgit v0.12 at 2025-01-07 19:23:47 (GMT)