summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* tst_qhttpnetworkconnection: Compile fixMarkus Goetz2011-01-101-7/+7
|
* Change QHostInfoCache to use QElapsedTime instead of QTime.Niklas Kurkisuo2011-01-102-3/+3
| | | | | | | | Use QElapsedTime instead of QTime for performance gain. See QT-2965 for more info. Task-number: QTBUG-16468 Reviewed-by: Markus Goetz
* Fix for qtdemo bugJerome Pasion2011-01-101-3/+3
| | | | | Task-number: QTBUG-15931 Reviewed-by: Kevin Wright
* Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7-integrationQt Continuous Integration System2011-01-1015-318/+318
|\ | | | | | | | | * '4.7' of scm.dev.nokia.troll.no:qt/qt-qml: Update pathview test
| * Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7Alan Alpert2011-01-1021-2761/+144
| |\ | |/ |/|
* | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7-integrationQt Continuous Integration System2011-01-103-67/+89
|\ \ | | | | | | | | | | | | * '4.7' of scm.dev.nokia.troll.no:qt/qt-qml: Fix loaded() signal to be emitted only once
* \ \ Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into ↵Qt Continuous Integration System2011-01-1021-2761/+144
|\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 4.7-integration * '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-2: network tests: make IMAP, FTP testdata more flexible. Remove garbage empty test. tst_networkselftest: add checks for echo, daytime
| * | | network tests: make IMAP, FTP testdata more flexible.Rohan McGovern2011-01-106-51/+142
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Move all hardcoded IMAP/FTP fixtures into network-settings.h. Make it work with new and old network test server. Reviewed-by: Markus Goetz Task: QTBUG-15114
| * | | Remove garbage empty test.Rohan McGovern2011-01-1014-2710/+0
| | | |
| * | | tst_networkselftest: add checks for echo, daytimeRohan McGovern2011-01-101-0/+2
|/ / /
| | * Update pathview testAlan Alpert2011-01-1015-318/+318
| |/ | | | | | | | | | | | | This updates the tests to match the correct behaviour as of 1ba3e41f09ea719249286fede5d3fe96621ccb61 Task-number: QTBUG-16357
| * Fix loaded() signal to be emitted only onceBea Lam2011-01-103-67/+89
|/ | | | | Task-number: QTBUG-16319 Reviewed-by: Martin Jones
* Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into ↵Qt Continuous Integration System2011-01-075-6/+10
|\ | | | | | | | | | | | | | | | | 4.7-integration * '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1: CLucene: Use the right delete operator. Examples: Fix compilation with namespace. fix build with QT_NO_BEARERMANAGEMENT
| * CLucene: Use the right delete operator.Christian Kandeler2011-01-072-2/+2
| | | | | | | | | | Task-number: QTBUG-15787 Task-number: QTBUG-15788
| * Examples: Fix compilation with namespace.Christian Kandeler2011-01-072-4/+4
| |
| * fix build with QT_NO_BEARERMANAGEMENTPeter Hartmann2011-01-071-0/+4
| | | | | | | | | | | | | | | | start() is only defined when using bearer management; that method calls open(), which we just call directly if not using bearer. Reviewed-by: Markus Goetz Task-number: QTBUG-16477
* | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into ↵Qt Continuous Integration System2011-01-0723-24/+79
|\ \ | | | | | | | | | | | | | | | | | | | | | 4.7-integration * '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-2: Fixes crash in QGraphicsItem's destructor. Doc: Fixing typo
| * | Fixes crash in QGraphicsItem's destructor.Yoann Lopes2011-01-072-1/+56
| | | | | | | | | | | | | | | | | | | | | | | | Crash introduced by 783a278f243c6411f5f32d11f2165b9eed9b6f8c. Autotest written by Niklas Kurkisuo <ext-niklas.kurkisuo@nokia.com> Task-number: QTBUG-16374 Reviewed-by: TrustMe
| * | Doc: Fixing typoSergio Ahumada2011-01-0721-23/+23
| | |
* | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-water-staging into ↵Qt Continuous Integration System2011-01-0713-254/+21
|\ \ \ | |_|/ |/| | | | | | | | | | | | | | | | | | | | | | | 4.7-integration * '4.7' of scm.dev.nokia.troll.no:qt/qt-water-staging: Fix crash when closing QFontDialog::getFont() dialog Fix timer warning when deleting item views Remove support for automatic tactile feedback from QS60Style Remove warning about null cursor handle on S60 while handle is valid
| * | 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/oslo-staging-1 into ↵Qt Continuous Integration System2011-01-0721-60/+6905
|\ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 4.7-integration * '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1: tst_qnetworkreply: Add EXPECT_FAIL for ioGetFromBuiltinHttp Revert "Fix QNetworkReply autotest cases for QT-3494" Revert "QNAM HTTP: Fix missing error() signal" licensing: exclude generated cookie jar table from license check fix include path fix build with namespaces in new cookie jar table cookie jar code: enhance security by keeping track of effective TLDs Add support for QMetaType::QVariant in ActiveQt Fix QNetworkReply autotest cases for QT-3494 Add compiler optimization for QtScript/JSC on Symbian improve performance of QTextEngine, esp. setBoundary by using non-detaching operator[] Improve docs for QTEST_MAIN macro. Work around an apparent GCC optimiser bug accessing arrays beyond end Do not crash in case a future version of libdbus has a new kind of message. Docs: QTBUG-9150 Incorrect snippet in class doc. tst_headers: make failure more detailed when failing to open a file Fix number of chapters in qtestlib tutorial. Fixed QStatusBar not to repaint itself too early QNAM HTTP: Fix missing error() signal Make it clear which security updates are needed for Visual Studio 2005.
| * | | | | | | | | | | | | tst_qnetworkreply: Add EXPECT_FAIL for ioGetFromBuiltinHttpMarkus Goetz2011-01-071-0/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Reviewed-by: Peter Hartmann
| * | | | | | | | | | | | | Revert "Fix QNetworkReply autotest cases for QT-3494"Markus Goetz2011-01-071-13/+9
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | We don't think this is the right fix. This reverts commit 5d18d393808d7a4be56eb00ab9f1e9cda9e211c9.
| * | | | | | | | | | | | | Revert "QNAM HTTP: Fix missing error() signal"Markus Goetz2011-01-072-20/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | We don't think this is the right solution. This reverts commit de72670c620e1193fa875bf1a4adee553700bacb.
| * | | | | | | | | | | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into ↵Qt Continuous Integration System2011-01-0623-70/+6936
| |\ \ \ \ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 4.7-integration * '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1: licensing: exclude generated cookie jar table from license check fix include path fix build with namespaces in new cookie jar table cookie jar code: enhance security by keeping track of effective TLDs Add support for QMetaType::QVariant in ActiveQt Fix QNetworkReply autotest cases for QT-3494 Add compiler optimization for QtScript/JSC on Symbian improve performance of QTextEngine, esp. setBoundary by using non-detaching operator[] Improve docs for QTEST_MAIN macro. Work around an apparent GCC optimiser bug accessing arrays beyond end Do not crash in case a future version of libdbus has a new kind of message. Docs: QTBUG-9150 Incorrect snippet in class doc. tst_headers: make failure more detailed when failing to open a file Fix number of chapters in qtestlib tutorial. Fixed QStatusBar not to repaint itself too early QNAM HTTP: Fix missing error() signal Make it clear which security updates are needed for Visual Studio 2005.
| | * | | | | | | | | | | | licensing: exclude generated cookie jar table from license checkPeter Hartmann2011-01-061-1/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This file is generated from the Public Suffix List, and thus under a different license. Reviewed-by: Markus Goetz
| | * | | | | | | | | | | | fix include pathMark Brand2011-01-061-0/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | In many situations building succeeds without explicity including this dir in the include path, probably due to a side-effect of calling uic on the form in this project. However, it is known to fail at least on mingw-cross-env. Anyway, it makes sense to explcitly add this dir to the include path since a needed header resides here. Merge-request: 1016 Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com>
| | * | | | | | | | | | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into ↵Qt Continuous Integration System2011-01-0622-69/+6931
| | |\ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 4.7-integration * '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1: fix build with namespaces in new cookie jar table cookie jar code: enhance security by keeping track of effective TLDs Add support for QMetaType::QVariant in ActiveQt Fix QNetworkReply autotest cases for QT-3494 Add compiler optimization for QtScript/JSC on Symbian improve performance of QTextEngine, esp. setBoundary by using non-detaching operator[] Improve docs for QTEST_MAIN macro. Work around an apparent GCC optimiser bug accessing arrays beyond end Do not crash in case a future version of libdbus has a new kind of message. Docs: QTBUG-9150 Incorrect snippet in class doc. tst_headers: make failure more detailed when failing to open a file Fix number of chapters in qtestlib tutorial. Fixed QStatusBar not to repaint itself too early QNAM HTTP: Fix missing error() signal Make it clear which security updates are needed for Visual Studio 2005.
| | | * | | | | | | | | | | | fix build with namespaces in new cookie jar tablePeter Hartmann2011-01-061-0/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | forgot the QT_END_NAMESPACE macro.