summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Add moving and flicking properties to PathViewMartin Jones2010-07-2911-480/+939
| | | | | | | | | | PathView handles its own mouse interaction, but lacked properties similar to those in Flickable to determine when it is stationary. This made it impossible to start an animation when the view stops moving, for example. Task-number: QTBUG-12497 Reviewed-by: Warwick Allison
* Remove use of shared NOTIFY signals in QGraphicsScaleMartin Jones2010-07-292-3/+9
| | | | | | | | | Sharing a NOTIFY signal can cause binding loop warnings with no apparent cause. Task-number: QTBUG-12333 Reviewed-by: Aaron Kennedy Reviewed-by: Michael Brasser
* Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7Martin Jones2010-07-2997-80/+13724
|\
| * Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7-integrationQt Continuous Integration System2010-07-2920-486/+736
| |\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * '4.7' of scm.dev.nokia.troll.no:qt/qt-qml: Remove warnings in photoviewer demo. Uncomment code accidentally removed with 1937adaab5861ced44813c6a4b0bff1c3750ecd3 Fix image source Don't emit movementEnded if mouse press is a continuation of a flick. Avoid binding loop warnings Append 'Example' to titles of example pages Improvements to Modules docs Component docs Fixes for Dynamic Object Management docs. Also adds links to Update Symbian emulator QtOpenVGu.def, QtNetworku.def, QtCoreu.def files for Qt 4.7 to be in sync between respective def files in Qt 4.6.3
| | * Remove warnings in photoviewer demo.Yann Bodson2010-07-291-1/+1
| | | | | | | | | | | | Task-number: QTBUG-12494
| | * Uncomment code accidentally removed with ↵Aaron Kennedy2010-07-291-2/+0
| | | | | | | | | | | | | | | | | | 1937adaab5861ced44813c6a4b0bff1c3750ecd3 QTBUG-3620
| | * Fix image sourceBea Lam2010-07-291-1/+1
| | | | | | | | | | | | Task-number: QTBUG-12493
| * | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-multimedia-staging into ↵Qt Continuous Integration System2010-07-291-2/+6
| |\ \ | | | | | | | | | | | | | | | | | | | | | | | | 4.7-integration * '4.7' of scm.dev.nokia.troll.no:qt/qt-multimedia-staging: Fixed instability of tst_qdatetime::currentDateTime(Utc) on Linux
| | * | Fixed instability of tst_qdatetime::currentDateTime(Utc) on LinuxRohan McGovern2010-07-281-2/+6
| | | | | | | | | | | | | | | | | | | | | | | | It's possible for the second to tick over in gettimeofday() earlier than time() (verified with strace). So this test needs an extra second of leeway.
| * | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into ↵Qt Continuous Integration System2010-07-2872-43/+12957
| |\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 4.7-integration * '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1: Wrong geometery for QMainWindow with Unified toolbar on Cocoa. Statically link to Qt based dependent librarys. Add libgq version 0.4+0m6. Add libconninet version 0.41+0m6.
| | * \ \ Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into ↵Qt Continuous Integration System2010-07-2872-43/+12957
| | |\ \ \ | | | |/ / | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 4.7-integration * '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1: Wrong geometery for QMainWindow with Unified toolbar on Cocoa. Statically link to Qt based dependent librarys. Add libgq version 0.4+0m6. Add libconninet version 0.41+0m6.
| | | * | Wrong geometery for QMainWindow with Unified toolbar on Cocoa.Prasanth Ullattil2010-07-283-0/+41
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | If a mainwindow is shown maximized (initially) with unified toolbar, the top portion of the widget gets hidden underneath the native toolbar. This is because while showing the window, the toolbar is resized. Which causes the client area of the NSWindow to resize, we need to update the frame of the NSView for QMainWindow based on this new size. Task-number: QTBUG-10500 Reviewed-by: Denis
| | | * | Merge remote branch 'staging/4.7' into bearermanagement/icd-static-libsAaron McCarthy2010-07-2811-138/+260
| | | |\ \
| | | * | | Statically link to Qt based dependent librarys.Aaron McCarthy2010-07-283-43/+14
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Some of the library dependencies of the ICD Bearer Management plugin use Qt. We include them in src/3rdparty and link against them statically to avoid the circular build dependency. Libraries that do not use Qt are still linked dynamically. The libraries which are statically linked are libconninet and libgq-gconf. Task-number: QTBUG-12354
| | | * | | Add libgq version 0.4+0m6.Aaron McCarthy2010-07-2826-0/+2830
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | libgq is required by the ICD Bearer Management plugin. Task-number: QTBUG-12354
| | | * | | Add libconninet version 0.41+0m6.Aaron McCarthy2010-07-2840-0/+10072
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | libconninet is required by the ICD Bearer Management plugin. Task-number: QTBUG-12354
| * | | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into ↵Qt Continuous Integration System2010-07-2821-31/+759
| |\ \ \ \ \ | | |/ / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 4.7-integration * '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-2: QMenu and QStyleSheetStyle: fix setting a border. tst_qlistview: use QTRY_COMPARE Fix compilation on 64-bit Windows. Fix missing license header Add test for getting a backtrace in QML Doc: add link to new gettings started to index.html Doc: Added new getting started document. QtDeclarative: Give name to function bindings and signals.
| | * | | | QMenu and QStyleSheetStyle: fix setting a border.Olivier Goffart2010-07-281-0/+7
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The native border would be drawn over the one drawn by the QStyleSheetStyle Regression since 68a498284e206e2bb000bc35331c966f3790f607 Reviewed-by: Gabriel Task-number: QTBUG-10785
| | * | | | tst_qlistview: use QTRY_COMPAREOlivier Goffart2010-07-281-1/+1
| | | | | |
| | * | | | Fix compilation on 64-bit Windows.Kim Motoyoshi Kalland2010-07-281-25/+8
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | When compiling for 64-bit with Visual Studio 2008, inline assembly is not supported. Use intrisic instead. Reviewed-by: Benjamin Poulain
| | * | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into ↵Qt Continuous Integration System2010-07-2818-5/+743
| | |\ \ \ \ | |/ / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 4.7-integration * '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-2: Fix missing license header Add test for getting a backtrace in QML Doc: add link to new gettings started to index.html Doc: Added new getting started document. QtDeclarative: Give name to function bindings and signals.
| | * | | | Fix missing license headerOlivier Goffart2010-07-281-0/+26
| | | | | |
| | * | | | Add test for getting a backtrace in QMLOlivier Goffart2010-07-284-0/+212
| | | | | |
| | * | | | Doc: add link to new gettings started to index.htmlGeir Vattekar2010-07-281-1/+1
| | | | | |
| | * | | | Merge branch '4.7' of git@scm.dev.nokia.troll.no:qt/oslo-staging-2 into 4.7Geir Vattekar2010-07-2880-193/+400
| | |\ \ \ \
| | | * | | | QtDeclarative: Give name to function bindings and signals.Olivier Goffart2010-07-287-4/+14
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Currently, bindings and signals are annonymous javascript functions. If one give them a name, a proper name is then shown in the javascript debugger. Reviewed-by: Aaron Kennedy
| | * | | | | Doc: Added new getting started document.Geir Vattekar2010-07-286-0/+490
| | | | | | |
* | | | | | | Remove use of shared NOTIFY signalsMartin Jones2010-07-2910-44/+89
| |_|_|_|_|/ |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Sharing a NOTIFY signal can cause binding loop warnings with no apparent cause. Task-number: QTBUG-12333 Reviewed-by: Aaron Kennedy Reviewed-by: Michael Brasser
* | | | | | Don't emit movementEnded if mouse press is a continuation of a flick.Martin Jones2010-07-291-15/+17
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | When the mouse is pressed the flick is stopped, but this may be a continuation of a previous flick, in which case we don't want to emit movementEnded since this can cause stutters in animations triggered by movementEnded, for example. Task-number: QTBUG-12492 Reviewed-by: Warwick Allison
* | | | | | Avoid binding loop warningsBea Lam2010-07-291-1/+2
| | | | | | | | | | | | | | | | | | | | | | | | Task-number: QTBUG-12469
* | | | | | Append 'Example' to titles of example pagesBea Lam2010-07-291-48/+48
| | | | | | | | | | | | | | | | | | | | | | | | Task-number: QTBUG-12427
* | | | | | Improvements to Modules docsBea Lam2010-07-294-93/+228
| | | | | | | | | | | | | | | | | | | | | | | | Task-number: QTBUG-12430
* | | | | | Component docsBea Lam2010-07-292-21/+69
| | | | | | | | | | | | | | | | | | | | | | | | Task-number: QTBUG-12447
* | | | | | Fixes for Dynamic Object Management docs. Also adds links toBea Lam2010-07-296-45/+118
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | this page from other documentation. Task-number: QTBUG-12446
* | | | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7-integrationQt Continuous Integration System2010-07-283-259/+252
|\ \ \ \ \ \ | |/ / / / / |/| | | | | | | | | | | | | | | | | * '4.7' of scm.dev.nokia.troll.no:qt/qt-qml: Update Symbian emulator QtOpenVGu.def, QtNetworku.def, QtCoreu.def files for Qt 4.7 to be in sync between respective def files in Qt 4.6.3
| * | | | | Update Symbian emulator QtOpenVGu.def, QtNetworku.def, QtCoreu.def files for ↵Joona Petrell2010-07-283-259/+252
| | |_|_|/ | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | Qt 4.7 to be in sync between respective def files in Qt 4.6.3 Task-number: QTBUG-12468 Reviewed-by: Jason Barron
* | | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-s60-public into ↵Qt Continuous Integration System2010-07-282-2/+2
|\ \ \ \ \ | |/ / / / |/| | | | | | | | | | | | | | | | | | | | | | | | 4.7-integration * '4.7' of scm.dev.nokia.troll.no:qt/qt-s60-public: Revert "Fixed a parsing error during sis and runonphone target creation."
| * | | | Revert "Fixed a parsing error during sis and runonphone target creation."axis2010-07-282-2/+2
| | |/ / | |/| | | | | | | | | | This reverts commit ebe6a5238947c30a613b61b521cb0d094efa2d02.
* | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into ↵Qt Continuous Integration System2010-07-2810-122/+220
|\ \ \ \ | |/ / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 4.7-integration * '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1: Cherry pick fix for MOBILITY-1234 from Qt Mobility. Cherry pick fix for QTMOBILITY-408 from Qt Mobility. Cherry pick fix for MOBILITY-1194 from Qt Mobility. Fix compilation error on Symbian^4. Fix detection of OCC functionality. Cherry pick fix for MOBILITY-1194 from Qt Mobility.
| * | | Merge commit '9814b2225b70d6b2f758e9dbe98f8e1662049b37' into oslo-staging-1Aaron McCarthy2010-07-2810-122/+220
| |\ \ \
| | * | | Cherry pick fix for MOBILITY-1234 from Qt Mobility.Aaron McCarthy2010-07-281-0/+2
| | | | | | | | | | | | | | | | | | | | e51af0d74f8bb6ca6100d2338671d2d053bfed01
| | * | | Cherry pick fix for QTMOBILITY-408 from Qt Mobility.Aaron McCarthy2010-07-282-33/+34
| | | | | | | | | | | | | | | | | | | | 7f9a8ebcfe86d3df428707888c3ab5fcd10226a4
| | * | | Cherry pick fix for MOBILITY-1194 from Qt Mobility.Aaron McCarthy2010-07-283-24/+68
| | | | | | | | | | | | | | | | | | | | f84bb604d745c512db8d53410c5fec835309f85e
| | * | | Fix compilation error on Symbian^4.Aaron McCarthy2010-07-283-12/+12
| | | | | | | | | | | | | | | | | | | | | | | | | The root cause is failing compilation test for SNAP when it shouldn't, but it should still not result in compilation errors in code.
| | * | | Fix detection of OCC functionality.Aaron McCarthy2010-07-281-1/+1
| | | | |
| | * | | Cherry pick fix for MOBILITY-1194 from Qt Mobility.Aaron McCarthy2010-07-286-53/+104
| | | | | | | | | | | | | | | | | | | | 2f582953ecfc53f217317f58e4fc75b5b51a1126
* | | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-multimedia-staging into ↵Qt Continuous Integration System2010-07-281-16/+40
|\ \ \ \ \ | |_|_|_|/ |/| | | | | | | | | | | | | | | | | | | | | | | | 4.7-integration * '4.7' of scm.dev.nokia.troll.no:qt/qt-multimedia-staging: Make tst_qdatetime failures more verbose.
| * | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-multimedia-staging into ↵Qt Continuous Integration System2010-07-271-16/+40
| |\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 4.7-integration * '4.7' of scm.dev.nokia.troll.no:qt/qt-multimedia-staging: Make tst_qdatetime failures more verbose.
| | * | | | Make tst_qdatetime failures more verbose.Rohan McGovern2010-07-271-16/+40
| | | | | |
* | | | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-webkit into 4.7-integrationQt Continuous Integration System2010-07-281-1/+0
|\ \ \ \ \ \ | |_|_|/ / / |/| | | | | | | | | | | | | | | | | * '4.7' of scm.dev.nokia.troll.no:qt/qt-webkit: Make it possible again to build Qt without webkit
generated by cgit v0.12 at 2024-12-29 06:58:06 (GMT)