summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* doc: Added some \briefs to how-to docs.Martin Smith2010-05-1411-19/+28
|
* Merge remote branch 'staging/4.7' into bearermanagement/mobility-changes-squashAaron McCarthy2010-05-14448-3303/+7308
|\
| * Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.7Peter Yard2010-05-14626-5482/+11067
| |\ | | | | | | | | | | | | Conflicts: examples/declarative/dial/dial-example.qml
| | * Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into ↵Qt Continuous Integration System2010-05-13197-1640/+3632
| | |\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 4.7-integration * '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1: (159 commits) Doc: Adding loading image to search textbox qdoc: Yet another revision of the top doc page. Doc: Update on web template Added QDateTime::msecsTo() Doc: Fixed tables and images for the new docs qdoc: Yet another revision of the top doc page. Revert "Improve QUrl handling of local file paths" Revert "[QNAM FTP] Check for the "ftp" scheme case-insensitively" Revert "QUrl::fromLocalFile: fix silly mistake: it's fromNativeSeparators, not to" Revert "Use QUrl::isLocalFile and fix the scheme checking in local URLs." qdoc: Another revision of the top doc page. Doc correction to css Doc: Updates to the html template and javascript tst_SuiteTest: Fix a meaningless switch statement My 4.7.0 changelog entries. qdoc: Fixed annotated list generation to use <td>, not <th>. Doc: Tuning search script qdoc: Reorganized examples panel. Doc: Chages to search feature, css and table order QtDeclarative: avoid waiting for a network load on URIs with empty schemes. ...
| | | * Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into ↵Qt Continuous Integration System2010-05-13197-1640/+3632
| | | |\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 4.7-integration * '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1: (159 commits) Doc: Adding loading image to search textbox qdoc: Yet another revision of the top doc page. Doc: Update on web template Added QDateTime::msecsTo() Doc: Fixed tables and images for the new docs qdoc: Yet another revision of the top doc page. Revert "Improve QUrl handling of local file paths" Revert "[QNAM FTP] Check for the "ftp" scheme case-insensitively" Revert "QUrl::fromLocalFile: fix silly mistake: it's fromNativeSeparators, not to" Revert "Use QUrl::isLocalFile and fix the scheme checking in local URLs." qdoc: Another revision of the top doc page. Doc correction to css Doc: Updates to the html template and javascript tst_SuiteTest: Fix a meaningless switch statement My 4.7.0 changelog entries. qdoc: Fixed annotated list generation to use <td>, not <th>. Doc: Tuning search script qdoc: Reorganized examples panel. Doc: Chages to search feature, css and table order QtDeclarative: avoid waiting for a network load on URIs with empty schemes. ...
| | | | * Merge branch '4.7' of git@scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.7Morten Engvoldsen2010-05-12468-3808/+7639
| | | | |\
| | | | | * Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into ↵Qt Continuous Integration System2010-05-12196-1638/+3618
| | | | | |\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 4.7-integration * '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1: (158 commits) qdoc: Yet another revision of the top doc page. Doc: Update on web template Added QDateTime::msecsTo() Doc: Fixed tables and images for the new docs qdoc: Yet another revision of the top doc page. Revert "Improve QUrl handling of local file paths" Revert "[QNAM FTP] Check for the "ftp" scheme case-insensitively" Revert "QUrl::fromLocalFile: fix silly mistake: it's fromNativeSeparators, not to" Revert "Use QUrl::isLocalFile and fix the scheme checking in local URLs." qdoc: Another revision of the top doc page. Doc correction to css Doc: Updates to the html template and javascript tst_SuiteTest: Fix a meaningless switch statement My 4.7.0 changelog entries. qdoc: Fixed annotated list generation to use <td>, not <th>. Doc: Tuning search script qdoc: Reorganized examples panel. Doc: Chages to search feature, css and table order QtDeclarative: avoid waiting for a network load on URIs with empty schemes. QtDeclarative: RFC 3986 requires schemes to be considered case-insensitively ...
| | | | | | * Merge branch '4.7' of git@scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.7Martin Smith2010-05-12375-3586/+7110
| | | | | | |\
| | | | | | | * Use qrand() instead of rand()Bradley T. Hughes2010-05-042-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This only affects X11 code, and are the only 2 places in Qt where rand() is used instead of qrand(). Task-number: QTBUG-9793 Reviewed-by: TrustMe
| | | | | | | * REG 4.7: Edit widgets icon no longer in toolbar.Friedemann Kleint2010-05-121-0/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Task-number: QTBUG-10626 Reviewed-by: Daniel Molkentin <daniel.molkentin@nokia.com>
| | | | | | | * Merge remote branch 'mainline/4.7' into 4.7Morten Johan Sørvig2010-05-12372-3584/+7107
| | | | | | | |\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: src/declarative/qml/qdeclarativeengine.cpp tools/qdoc3/htmlgenerator.cpp
| | | | | | * | | qdoc: Yet another revision of the top doc page.Martin Smith2010-05-1218-46/+47
| | | | | | |/ / | | | | | | | | | | | | | | | | | | | | | | | | Still more to come.
| | | | * | | | Doc: Adding loading image to search textboxMorten Engvoldsen2010-05-124-6/+18
| | | | | |/ / | | | | |/| |
| | | | * | | Merge branch '4.7' of git@scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.7Morten Engvoldsen2010-05-113-8/+63
| | | | |\ \ \
| | | | | * | | Added QDateTime::msecsTo()Jason Hollingsworth2010-05-113-8/+63
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This adds a QDateTime::msecsTo() function which is similar to QDateTime::secsTo(). This refers to QTBUG-8790 and task 147685. According to the task this functionality should have been added in version 4.5.0 but it never was. Task-number: 147685 Task-number: QTBUG-8790 Merge-request: 501 Reviewed-by: Benjamin Poulain <benjamin.poulain@nokia.com> Reviewed-by: Andreas Kling <andreas.kling@nokia.com>
| | | | * | | | Doc: Update on web templateMorten Engvoldsen2010-05-111-1/+1
| | | | |/ / / | | | | | | | | | | | | | | | | | | | | | Updated Form action
| | | | * | | Doc: Fixed tables and images for the new docsMorten Engvoldsen2010-05-115-39/+62
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Added page.png to images dir. Fixed tables "generic"
| | | | * | | qdoc: Yet another revision of the top doc page.Martin Smith2010-05-1114-54/+69
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Still more to come.
| | | | * | | Revert "Improve QUrl handling of local file paths"Morten Johan Sørvig2010-05-103-62/+23
| | | | | | | | | | | | | | | | | | | | | | | | | | | | This reverts commit a2f797b52c4274a62a7cf1f0939aca1429afe211.
| | | | * | | Revert "[QNAM FTP] Check for the "ftp" scheme case-insensitively"Morten Johan Sørvig2010-05-101-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | This reverts commit a9fb306a1cf1308a3f8b9bb12ed01aed1f6f6f8d.
| | | | * | | Revert "QUrl::fromLocalFile: fix silly mistake: it's fromNativeSeparators, ↵Morten Johan Sørvig2010-05-101-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | not to" This reverts commit f5366aea8594946e78106c5f93ecb2d47f121d32.
| | | | * | | Revert "Use QUrl::isLocalFile and fix the scheme checking in local URLs."Morten Johan Sørvig2010-05-103-19/+9
| | | | | | | | | | | | | | | | | | | | | | | | | | | | This reverts commit ebddf7a8739d7f4aaa7d9cb8a41a14eebb65e4f4.
| | | | * | | Merge branch '4.7' of git@scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.7Martin Smith2010-05-105-10/+28
| | | | |\ \ \
| | | | | * | | Doc correction to cssMorten Engvoldsen2010-05-101-4/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Reviewed-by: Morten Engvoldsen
| | | | | * | | Doc: Updates to the html template and javascriptMorten Engvoldsen2010-05-103-2/+13
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Reviewed-by: Morten Engvoldsen
| | | | | * | | tst_SuiteTest: Fix a meaningless switch statementJakub Wieczorek2010-05-101-4/+11
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The switch statement, that specifies which test handler should be used to run a test suite was missing break; statements, which made it always fall back to the XML Schema test suite. Merge-request: 619 Reviewed-by: Benjamin Poulain <benjamin.poulain@nokia.com>
| | | | * | | | qdoc: Another revision of the top doc page.Martin Smith2010-05-104-47/+32
| | | | |/ / / | | | | | | | | | | | | | | | | | | | | | More to come.
| | * | | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-webkit into 4.7-integrationQt Continuous Integration System2010-05-1340-308/+749
| | |\ \ \ \ \ | | | |/ / / / | | |/| | | | | | | | | | | | | | | | | | | | | | | | | * '4.7' of scm.dev.nokia.troll.no:qt/qt-webkit: Updated WebKit to dc5821c3df2ef60456d85263160852f5335cf946 Updated WebKit to b4aa5e1ddc41edab895132aba3cc66d9d7129444
| | | * | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-webkit into 4.7-integrationQt Continuous Integration System2010-05-1240-308/+749
| | | |\ \ \ \ | | | | |_|/ / | | | |/| | | | | | | | | | | | | | | | | | | | | | | | * '4.7' of scm.dev.nokia.troll.no:qt/qt-webkit: Updated WebKit to dc5821c3df2ef60456d85263160852f5335cf946 Updated WebKit to b4aa5e1ddc41edab895132aba3cc66d9d7129444
| | | | * | | Updated WebKit to dc5821c3df2ef60456d85263160852f5335cf946Simon Hausmann2010-05-1222-260/+365
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Integrated changes: || <https://webkit.org/b/32922> || [Qt] fast/text/find-hidden-text.html || || <https://webkit.org/b/36187> || Rename window.media to window.styleMedia || || <https://webkit.org/b/38286> || Need to call FrameView::scrollPositionChanged when changing the scroll position when the ScrollView does not have a platformWidget || || <https://webkit.org/b/37334> || [Qt] fast/frames/flattening/frameset-flattening-subframesets.html fails intermittently on Qt bot ||
| | | | * | | Updated WebKit to b4aa5e1ddc41edab895132aba3cc66d9d7129444Simon Hausmann2010-05-1123-50/+386
| | | | | |/ | | | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Integrated changes: || <https://webkit.org/b/38747> || mingw-w64 and JIT support || || <https://webkit.org/b/38119> || [Qt] QWebPage viewMode property || || <https://webkit.org/b/37097> || [Qt] Fix infinite redirection loop in QNetworkReplyHandler || || <https://webkit.org/b/38668> || [Qt] Enable YARR_JIT for X86 Mac for QtWebKit || || <https://webkit.org/b/38834> || [Qt] Adapt DNS pre-fetching to Qt DNS cache code || || <https://webkit.org/b/38574> || [Qt] Crash in QGraphicsWebViewPrivate::~QGraphicsWebViewPrivate when animation were used || || <https://webkit.org/b/31407> || [PATCH] [Qt] Compilation with Plugins disabled is broken || || <https://webkit.org/b/38514> || Crash in handleTouchEvent: using dangling node ptrs in hashmap || || <https://webkit.org/b/38646> || Potential crash in EventHandler::handleTouchEvent || || <https://webkit.org/b/38488> || Spatial Navigation: create a getter for the "fudgeFactor" || || <https://webkit.org/b/38523> || [Qt] QtWebKit has render bugs on Google Maps markers || || <https://webkit.org/b/37276> || LayoutTests/fast/canvas/pointInPath.html passed, actually it failed || || <https://webkit.org/b/37023> || [Qt] Expose HTMLTokenizer yielding parameters ||
| | * | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7-integrationQt Continuous Integration System2010-05-13135-1216/+2470
| | |\ \ \ \ | | | |/ / / | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * '4.7' of scm.dev.nokia.troll.no:qt/qt-qml: (34 commits) Fix TextEdit and TextInput input panel support for mode RSIP_OnMouseClickAndAlreadyFocused Fix for graphics widget in the background stealing declarative item's focus Fix broken benchmarks. Possibly fix autotest Correctly assign bool to variant properties Improve Image docs. Move all fillMode image examples to fillMode Flickable small API changes. Reset the dragDropItem to 0 when the item dies while dragging on top it. Avoid warning (and possible future crash) upon reload. Don't pass sequential (QNetworkReply) to image reader, it doesn't work well enough. Stop GIF handler claiming it can report Size for sequential devices, Use raster graphicssystem for qml.app on OS X. Add missing test, qdeclarativelayoutitem, to declarative.pro Sorted the tests list in declarative.pro Bail out early if the same target value is reassigned to a Behavior. Correctly position any input method popups for TextInput. Correctly resize TextInput in the presence of preedit text. Apply signal handler changes immediately. Remove unused image Qt.widgets was removed, point to graphics layouts example ...
| | | * | | Fix TextEdit and TextInput input panel support for mode ↵Joona Petrell2010-05-137-17/+40
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | RSIP_OnMouseClickAndAlreadyFocused Task-number: Reviewed-by: Warwick Allison
| | | * | | Fix for graphics widget in the background stealing declarative item's focusJoona Petrell2010-05-133-2/+59
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Task-number: QTBUG-10584 Reviewed-by: Warwick Allison
| | | * | | Fix broken benchmarks.Michael Brasser2010-05-138-30/+27
| | | | | |
| | | * | | Possibly fix autotestAlan Alpert2010-05-121-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | It's unclear why the autotest failed on a platform I can't test on right now, but this might clear it up.
| | | * | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7Alan Alpert2010-05-12117-1166/+2341
| | | |\ \ \
| | | | * | | Correctly assign bool to variant propertiesAaron Kennedy2010-05-126-0/+24
| | | | | | | | | | | | | | | | | | | | | | | | | | | | QTBUG-10623
| | | | * | | Improve Image docs. Move all fillMode image examples to fillModeBea Lam2010-05-1214-84/+109
| | | | | | | | | | | | | | | | | | | | | | | | | | | | property docs and remove the animated gif.
| | | | * | | Flickable small API changes.Yann Bodson2010-05-1213-156/+257
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | - Split moving into movingHorizontally anf movingVertically - Split flicking into flickingHorizontally and flickingVertically - Rename flickDirection to flickableDirection - onMovementStarted, onMovementEnded, onFlickStarted and onFlickEnded signals removed Task-number: QTBUG-10572 Reviewed-by: Martin Jones
| | | | * | | Reset the dragDropItem to 0 when the item dies while dragging on top it.Alexis Menard2010-05-122-0/+28
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | If you drag something on top of an item and the former is deleted then we need to reset the dragDropItem pointer to 0. Task-number:KDE BUG 232182 Reviewed-by:leo
| | | | * | | Avoid warning (and possible future crash) upon reload.Warwick Allison2010-05-121-2/+5
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Task-number: QTBUG-10555
| | | | * | | Don't pass sequential (QNetworkReply) to image reader, it doesn't work well ↵Warwick Allison2010-05-121-1/+5
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | enough. Work around QTBUG-10622
| | | | * | | Stop GIF handler claiming it can report Size for sequential devices,Warwick Allison2010-05-121-2/+5
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | since it scans the entire image to do so (and then can't read the image). Task-number: QTBUG-10621
| | | | * | | Use raster graphicssystem for qml.app on OS X.Michael Brasser2010-05-121-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Task-number: QTBUG-10544
| | | | * | | Add missing test, qdeclarativelayoutitem, to declarative.proLeonardo Sobral Cunha2010-05-121-0/+1
| | | | | | |
| | | | * | | Sorted the tests list in declarative.proLeonardo Sobral Cunha2010-05-121-65/+65
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Also removed the #Cover tag, which is not used anymore.
| | | | * | | Bail out early if the same target value is reassigned to a Behavior.Michael Brasser2010-05-128-2/+1187
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Task-number: QTBUG-10586 Reviewed-by: leo
| | | | * | | Correctly position any input method popups for TextInput.Michael Brasser2010-05-121-0/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Reviewed-by: alexis
| | | | * | | Correctly resize TextInput in the presence of preedit text.Michael Brasser2010-05-121-3/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Task-number: QTBUG-10466 Reviewed-by: alexis
generated by cgit v0.12 at 2025-02-13 14:40:11 (GMT)