summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
...
| | | * | | | | Merge branch '4.6' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into ↵Qt Continuous Integration System2010-07-224-4/+4
| | | |\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 4.6-integration * '4.6' of scm.dev.nokia.troll.no:qt/oslo-staging-1: One more .pro fix for deprecated INCPATH Fix Rhys' qmake warnings
| | | | * | | | | One more .pro fix for deprecated INCPATHMarkus Goetz2010-07-221-1/+1
| | | | | | | | |
| | | | * | | | | Fix Rhys' qmake warningsMarkus Goetz2010-07-223-3/+3
| | | |/ / / / /
| | | * | | | | Merge branch '4.6' of scm.dev.nokia.troll.no:qt/qt-multimedia-staging into ↵Qt Continuous Integration System2010-07-222-3/+26
| | | |\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 4.6-integration * '4.6' of scm.dev.nokia.troll.no:qt/qt-multimedia-staging: Fixed QVideoSurfaceFormat::isValid()
| | | | * | | | | Fixed QVideoSurfaceFormat::isValid()Dmytro Poplavskiy2010-07-222-3/+26
| | | |/ / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Trivial fix, valid formats have pixel format != Invalid, not ==. Task-number: QTBUG-12337 Reviewed-by: Andrew den Exter
* | | | | | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into ↵Qt Continuous Integration System2010-07-2956-79/+124
|\ \ \ \ \ \ \ \ | |/ / / / / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 4.7-integration * '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1: Fixed spelling mistakes in documented functions, classes, etc. Part of QTBUG-11938 and QTBUG-10801 Fix compilation with QT_NO_TEXTCODEC Fix compilation with QT_NO_XMLSTREAMREADER Fix compilation - disable TextInput when QT_NO_LINEEDIT is defined fixes for using freetds fix epic fail from 4ba6646 Added *_location variables to pkg-config files for rcc, lupdate and lrelease
| * | | | | | | Fixed spelling mistakes in documented functions, classes, etc. Part of ↵Jerome Pasion2010-07-2942-71/+71
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | QTBUG-11938 and QTBUG-10801
| * | | | | | | Fix compilation with QT_NO_TEXTCODECTasuku Suzuki2010-07-294-2/+7
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge-request: 755 Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com>
| * | | | | | | Fix compilation with QT_NO_XMLSTREAMREADERTasuku Suzuki2010-07-293-0/+10
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge-request: 757 Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com>
| * | | | | | | Fix compilation - disable TextInput when QT_NO_LINEEDIT is definedTasuku Suzuki2010-07-294-0/+14
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge-request: 739 Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com>
| * | | | | | | fixes for using freetdsMark Brand2010-07-292-0/+6
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | DBNTWIN32 only if not Q_USE_SYBASE. Workaround for RETCODE typedef conflict between ODBC and FreeTDS. Include winsock2.h supplies SOCKET for FreeTDS. Merge-request: 684 Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com>
| * | | | | | | fix epic fail from 4ba6646Oswald Buddenhagen2010-07-291-5/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Reviewed-by: joerg
| * | | | | | | Added *_location variables to pkg-config files for rcc, lupdate and lreleaseDavid García Garzón2010-07-291-1/+13
|/ / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | Task-number: QTBUG-11546 Reviewed-by: ossi
* | | | | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-s60-public into ↵Qt Continuous Integration System2010-07-293-21/+35
|\ \ \ \ \ \ \ | |/ / / / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 4.7-integration * '4.7' of scm.dev.nokia.troll.no:qt/qt-s60-public: Ensure that window rectangle is updated when CBA visibility changes Clear Qt::WA_OutsideWSRange when making window fullscreen
| * | | | | | Ensure that window rectangle is updated when CBA visibility changesGareth Stockwell2010-07-283-21/+33
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | In S60, there are two pieces of screen furniture, changes in whose visibility or size can affect the size of the Qt application window. These are the status pane, at the top of the screen, and the CBA at the bottom. QSymbianControl listens for changes in status pane visibility and size by implementing MEikStatusPaneObserver. Notifications received via this interface trigger a call to QSymbianControl::handleClientAreaChange() which resizes the control. There is no corresponding interface through which to receive notifications of changes in CBA visibility. This patch introduces a utility function for setting the visibility of both the status pane and CBA, which ensures that the control's rectangle is updated when either one changes. Task-number: QTBUG-5320 Reviewed-by: Jason Barron
| * | | | | | Clear Qt::WA_OutsideWSRange when making window fullscreenGareth Stockwell2010-07-281-0/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Task-number: QTBUG-10269 Reviewed-by: Jason Barron
| | | | | * | Reference count items in VisualItemModel.Martin Jones2010-08-021-11/+37
| | | | |/ / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The views expect the models to reference count and not destroy (or hide in the case of VisualItemModel) until there are no references. Task-number: QTBUG-12450 Reviewed-by: Michael Brasser
| | | | * | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7Martin Jones2010-07-298-12/+22
| | | | |\ \
| | | | | * | Add missing \l doc commandsBea Lam2010-07-294-4/+4
| | | | | | |
| | | | | * | Document elements that are focus scopes.Yann Bodson2010-07-294-8/+18
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Task-number: QTBUG-12404
| | | | * | | 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
generated by cgit v0.12 at 2025-04-15 17:40:34 (GMT)