summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Merge branch 'review-4.7' into staging-4.7Gabriel de Dietrich2011-01-0713-254/+21
|\
| * Merge branch '4.7' of git://scm.dev.nokia.troll.no/qt/qt-water-teamQt Continuous Integration System2011-01-031-0/+9
| |\ | | | | | | | | | | | | * '4.7' of git://scm.dev.nokia.troll.no/qt/qt-water-team: Fix crash when closing QFontDialog::getFont() dialog
| | * Fix crash when closing QFontDialog::getFont() dialogGabriel de Dietrich2011-01-031-0/+9
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Unfortunately, given the large number of ways of showing a QFontDialog, it's possible that we try to close the dialog before its event loop is finished. Setting the Cocoa font panel's isReleaseOnClose property to FALSE ensures the panel is still around when we effectively exit the dialog's event loop. Reviewed-by: Richard Task-number: QTBUG-15666
| * | Merge branch '4.7' of git://scm.dev.nokia.troll.no/qt/qt-water-teamQt Continuous Integration System2010-12-2354-598/+3351
| |\ \ | | |/ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * '4.7' of git://scm.dev.nokia.troll.no/qt/qt-water-team: Fix fullscreen/Maximized dialog misplacement in Symbian Add Postgresql 8.x and 9 supports WorkerScript could starve image loading of CPU. More docs for FolderListModel Improve docs on attached properties on view delegates. Models which load incrementally via fetchMore() don't work. Try fixing build error on Windows Ensure PathView doesn't jump when starting to drag. Nested flickables would react alternately to flicks. Improve QDeclarativeComponent test coverage. Add additional QDeclarativeProperty autotests. Fix crash in indeterminate progressbars on windows Fix timer regression for indeterminate progressbars Improve performance of bilinear upscaling of images with neon. Removing all visible items in ListView resulted in blank view. XmlListModel requests should set 'Accept' header to 'application/xml'
| | * Merge branch '4.7-upstream' into 4.7-waterThierry Bastian2010-12-2354-598/+3351
| | |\
| * | \ Merge branch '4.7' of git://scm.dev.nokia.troll.no/qt/qt-water-teamQt Continuous Integration System2010-12-227-123/+228
| |\ \ \ | | |/ / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * '4.7' of git://scm.dev.nokia.troll.no/qt/qt-water-team: Fix infinite loop in qmake when reading malformed .ts files. Fix libinfixed usage in Symbian when def files are used Made documentation of QPixmap::createMaskFromColor match behaviour. Improve performance of bilinear downscaling of images with neon. Document the 'variant' basic type Add double type to QML Basic Types docs Remove redundant docs
| | * | Merge branch '4.7-upstream' into 4.7-waterThierry Bastian2010-12-227-123/+228
| | |\ \
| * | \ \ Merge branch '4.7' of git://scm.dev.nokia.troll.no/qt/qt-water-teamQt Continuous Integration System2010-12-2271-3515/+2235
| |\ \ \ \ | | |/ / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * '4.7' of git://scm.dev.nokia.troll.no/qt/qt-water-team: (43 commits) Doc: Added a missing license header. Fix timer warning when deleting item views More testing for KeyNavigation attached properties. Add tests for ListView.indexAt() and GridView.IndexAt() runonphone: Only print the modprobe instructions on linux reword: Make the USB serial device enumeration work on OS X, too runonphone: Check that the device->config is valid before dereferencing it Remove few compile warnings Fix using QFileDialog statics in Symbian. Setting TextInput.cursorPosition outside bounds crashed. Update test bitmaps for QDeclarativeImage::svg() autotest on Windows Don't truncate image:// url strings prematurely Update docs on importing javascript files Fix deployment of minehunt for Symbian Quiet unused parameter warnings. doc: Replaced some \raw and \endraw uses with \table and \endtable doc: Replaced some \raw and \endraw uses with \table and \endtable doc: Replaced some \raw and \endraw uses with \table and \endtable Doc: Added a note about the Public Suffix List. Doc: Fixed doc bug in Diagram Scene example ...
| | * | | Merge branch '4.7-upstream' into 4.7-waterThierry Bastian2010-12-2158-3499/+2125
| | |\ \ \
| | * | | | Fix timer warning when deleting item viewsGabriel de Dietrich2010-12-211-2/+9
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Reviewed-by: Olivier Task-number: QTBUG-16175
| | * | | | Merge branch '4.7-upstream' into 4.7-waterThierry Bastian2010-12-2013-14/+101
| | |\ \ \ \
| * | \ \ \ \ Merge branch '4.7' of git://scm.dev.nokia.troll.no/qt/qt-water-teamQt Continuous Integration System2010-12-182-2/+9
| |\ \ \ \ \ \ | | |/ / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | * '4.7' of git://scm.dev.nokia.troll.no/qt/qt-water-team: Use relative include instead of absolute in default qmake.conf Fix waitForOpened not working with already active configuration
| | * | | | | Merge branch '4.7-upstream' into 4.7-waterThierry Bastian2010-12-182-2/+9
| | |\ \ \ \ \
| * | \ \ \ \ \ Merge branch '4.7' of git://scm.dev.nokia.troll.no/qt/qt-water-teamQt Continuous Integration System2010-12-1711-18/+23
| |\ \ \ \ \ \ \ | | |/ / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * '4.7' of git://scm.dev.nokia.troll.no/qt/qt-water-team: Fix incorrect file name case for OpenGL libraries in symbian.conf. Fix QDeclarativeState::reset() autotest Update test bitmaps for QDeclarativeImage::svg() autotest on Linux Doc: typo fixed in doc/src/declarative/extending.qdoc Add work around for bug when painting w/glTexSubImage into large texture
| | * | | | | | Merge branch '4.7-upstream' into 4.7-waterThierry Bastian2010-12-1711-18/+23
| | |\ \ \ \ \ \
| * | \ \ \ \ \ \ Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-water-teamQt Continuous Integration System2010-12-1622-281/+92
| |\ \ \ \ \ \ \ \ | | |/ / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * '4.7' of scm.dev.nokia.troll.no:qt/qt-water-team: Improved orientation change autotest Avoid duplicate resize event Remove support for automatic tactile feedback from QS60Style QmlDebugger: Fix runtime warnings about unregistered metatypes Suppress a warning about killing a timer that isn't active. ICC: Don't print warning 1259 since it's too annoying. Autotest: Add some comments about this obscure test. Add a warning about trying to release a timer ID that isn't active Don't need to set FD_CLOEXEC since qt_safe_* will have done that. Check for null-pointer to avoid a crash in textedit demo. Improve performance of clipping to a scaled QRectF
| | * | | | | | | Merge branch '4.7-upstream' into 4.7-waterThierry Bastian2010-12-1612-31/+91
| | |\ \ \ \ \ \ \
| | * | | | | | | | Remove support for automatic tactile feedback from QS60StyleSami Merila2010-12-1610-250/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Currently QS60Style loads automatically a plugin to support tactile feedback for styled applications. However, there is no control over this, so applications cannot remove the automatic support, if they'd like to use Mobility APIs to control the feedback themselves. In order to avoid this, remove tactile feedback plugin from style. Lets see if we can later put this back with optional enable/disable flag. Task-number: QTBUG-16151 Reviewed-by: Miikka Heikkinen
| * | | | | | | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-water-teamQt Continuous Integration System2010-12-161-2/+2
| |\ \ \ \ \ \ \ \ \ | | |/ / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * '4.7' of scm.dev.nokia.troll.no:qt/qt-water-team: Remove warning about null cursor handle on S60 while handle is valid
| | * | | | | | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-water-team into 4.7Sami Merila2010-12-169-34/+118
| | |\ \ \ \ \ \ \ \
| | * | | | | | | | | Remove warning about null cursor handle on S60 while handle is validPaul Labedan2010-12-151-2/+2
| | | | | | | | | | |
* | | | | | | | | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-s60-public into ↵Qt Continuous Integration System2011-01-061-2/+4
|\ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 4.7-integration * '4.7' of scm.dev.nokia.troll.no:qt/qt-s60-public: Fix KERN-EXEC 0 panic on exit when bearer is searching for WLANs
| * | | | | | | | | | | Fix KERN-EXEC 0 panic on exit when bearer is searching for WLANsShane Kearns2011-01-061-2/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The access point scanner cancels itself in the destructor. This requires the handle to be valid, but it was closed in the symbian engine destructor immediately before deleting the AP scanner. Because of the way symbian active objects work, the crashing function is only called if there was an asynchronous request in progress. So it could be missed in cases where the scan completes faster than the test case. Task-number: QTBUG-16484 Reviewed-by: Markus Goetz
* | | | | | | | | | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into ↵Qt Continuous Integration System2011-01-064-8/+17
|\ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 4.7-integration * '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-2: Designer: Block QEvent::WinIdChange. QUrl::setUrl should call detach qkeymapper_x11.cpp: fix compilation with LSB and without XKB
| * | | | | | | | | | | | Designer: Block QEvent::WinIdChange.Friedemann Kleint2011-01-061-0/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | As it causes an obscure deletion crash related to the formeditor rubberband on Mac. Reviewed-by: con
| * | | | | | | | | | | | QUrl::setUrl should call detachOlivier Goffart2011-01-062-0/+9
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Task-number: QTBUG-16425 Reviewed-by: Gabriel Reviewed-by: Markus Goetz
| * | | | | | | | | | | | qkeymapper_x11.cpp: fix compilation with LSB and without XKBOlivier Goffart2011-01-061-8/+7
| |/ / / / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Task-number: QTBUG-16312 Reviewed-by: Marius Storm-Olsen
* | | | | | | | | | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7-integrationQt Continuous Integration System2011-01-065-2/+83
|\ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * '4.7' of scm.dev.nokia.troll.no:qt/qt-qml: PathView crashed when the path is provided with undefined values. PathView: update modelCount before attempting to regenerate delegates.
| * | | | | | | | | | | PathView crashed when the path is provided with undefined values.Martin Jones2011-01-063-1/+38
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Task-number: QTBUG-16356 Reviewed-by: Bea Lam
| * | | | | | | | | | | PathView: update modelCount before attempting to regenerate delegates.Martin Jones2011-01-063-1/+45
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | If the model is a VisualDataModel, the count will initally be zero and modelCount is not updated due to itemsInserted() before the component is completed. Task-number: QTBUG-16357 Reviewed-by: Bea Lam
* | | | | | | | | | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7-integrationQt Continuous Integration System2011-01-063-116/+138
|\ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * '4.7' of scm.dev.nokia.troll.no:qt/qt-qml: Update docs - calling overloaded functions from QML is now supported Doc fixes for introduction page and Item docs
| * | | | | | | | | | | Update docs - calling overloaded functions from QML is now supportedBea Lam2011-01-061-5/+8
| | | | | | | | | | | |
| * | | | | | | | | | | Doc fixes for introduction page and Item docsBea Lam2011-01-062-111/+130
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Moved 'Identity' and 'Property Change Signals' sections from Item docs to the intro page, which previously had a section on ids but this has been moved out of the 'Properties' section since an id isn't an ordinary property.
* | | | | | | | | | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7-integrationQt Continuous Integration System2011-01-0510-130/+1779
|\ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * '4.7' of scm.dev.nokia.troll.no:qt/qt-qml: Fix outdated tests
| * | | | | | | | | | | Fix outdated testsAlan Alpert2011-01-0510-130/+1779
|/ / / / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | selftest_noimages and qdeclarativespringanimation were correct, updating test scripts to match. Task-number: QTBUG-14792
* | | | | | | | | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-s60-public into ↵Qt Continuous Integration System2011-01-043-1/+51
|\ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 4.7-integration * '4.7' of scm.dev.nokia.troll.no:qt/qt-s60-public: Fix def file names for libinfixed testlib Generate freeze targets in Symbian
| * | | | | | | | | | | Fix def file names for libinfixed testlibMiikka Heikkinen2011-01-041-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Reviewed-by: Janne Koskinen
| * | | | | | | | | | | Generate freeze targets in SymbianMiikka Heikkinen2011-01-042-0/+50
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Make it possible to freeze def files via makefile targets. Task-number: QTBUG-13769 Reviewed-by: Janne Koskinen
* | | | | | | | | | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into ↵Qt Continuous Integration System2011-01-049-11/+81
|\ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 4.7-integration * '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-2: QMeeGoGraphicsSystemHelper::setSwapBehavior implementation. Support for swap modes in QGLWindowSurface. Pre-create the GL share widget before window surface creation. QMeeGoSwitchEvent exported and static. Fixed first element being a LineToElement in QPainterPath::connectPath()
| * | | | | | | | | | | | QMeeGoGraphicsSystemHelper::setSwapBehavior implementation.Michael Dominic K2011-01-043-1/+34
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge-request: 993 Reviewed-by: Samuel Rødal <samuel.rodal@nokia.com>
| * | | | | | | | | | | | Support for swap modes in QGLWindowSurface.Michael Dominic K2011-01-042-1/+15
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | AlwaysFull and AlwaysPartial implemented in ES only for now. By default do automatic. Merge-request: 993 Reviewed-by: Samuel Rødal <samuel.rodal@nokia.com>
| * | | | | | | | | | | | Pre-create the GL share widget before window surface creation.Michael Dominic K2011-01-041-6/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Not pixmap creation. Merge-request: 988 Reviewed-by: Samuel Rødal <samuel.rodal@nokia.com>
| * | | | | | | | | | | | QMeeGoSwitchEvent exported and static.Michael Dominic K2011-01-041-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge-request: 1009 Reviewed-by: Samuel Rødal <samuel.rodal@nokia.com>
| * | | | | | | | | | | | Fixed first element being a LineToElement in QPainterPath::connectPath()Samuel Rødal2011-01-042-1/+28
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This would produce an invalid path, causing potential crashes in various parts of Qt. Task-number: QTBUG-16377 Reviewed-by: Gunnar Sletta
* | | | | | | | | | | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7-integrationQt Continuous Integration System2011-01-0420-923/+923
|\ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * '4.7' of scm.dev.nokia.troll.no:qt/qt-qml: Update visual tests
| * | | | | | | | | | | | | Update visual testsAlan Alpert2011-01-0420-923/+923
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Minor changes in flickable and rectangle radius behaviours have led to some altered pixels here and there. Task-number: QTBUG-14792
* | | | | | | | | | | | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-s60-public into ↵Qt Continuous Integration System2011-01-041-1/+1
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / / / |/| | / / / / / / / / / / / | | |/ / / / / / / / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 4.7-integration * '4.7' of scm.dev.nokia.troll.no:qt/qt-s60-public: Ignore static_and_shared in Symbian builds.
| * | | | | | | | | | | | Ignore static_and_shared in Symbian builds.Miikka Heikkinen2011-01-031-1/+1
|/ / / / / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The function addExclusiveBuilds doesn't work on Symbian and is unlikely to ever work due to build system mandated target directories, so ignore static_and_shared in Symbian builds that rely on Symbian toolchains. Task-number: QTBUG-16298 Reviewed-by: axis
* | | | | | | | | | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into ↵Qt Continuous Integration System2010-12-301-1/+1
|\ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 4.7-integration * '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-2: Fixed networkselftest failing to resolve hostname
| * | | | | | | | | | | Fixed networkselftest failing to resolve hostnameRohan McGovern2010-12-301-1/+1
|/ / / / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The logic here was the opposite from what was intended. Note that this bug was hidden under normal circumstances when running the entire testcase. It only appeared when one of the following was true: (1) httpProxy or socks5Proxy was run on its own, or (2) the dnsResolution test failed.