summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* add qscopedvaluerollback autotest to corelib.proShane Kearns2011-01-271-0/+1
|
* Merge branch 'QTBUG-15292-fix' into earth-masteraxis2011-01-276-54/+109
|\
| * Added Symbian deployment localization for makefile build system.axis2011-01-275-53/+108
| | | | | | | | | | | | | | | | | | | | | | | | | | This is a complement to the 16575f7aef840b6aae0dc767468ab713fbcfd7a6 commit, which adds localization based on TRANSLATIONS keywords for Raptor and abld. In addition, since the __PRODUCT_INCLUDE__ define was creating a lot of trouble regarding < and >, it was refactored into its own source file, which is automatically included before every source file. Task: QTBUG-15292 RevBy: Miikka Heikkinen
| * Made the translations dependency work for shadow builds.axis2011-01-271-1/+1
| | | | | | | | RevBy: Miikka Heikkinen
* | Add autotest for QScopedValueRollbackShane Kearns2011-01-262-0/+207
| | | | | | | | Reviewed-by: mread
* | Add QScopedValueRollback tools class.Shane Kearns2011-01-263-3/+169
| | | | | | | | | | | | | | | | | | This template allows a value to be automatically rolled back to a previous state when the class goes out of scope. This can be used to maintain a valid state when an exception is thrown. Reviewed-by: mread Reviewed-by: joao
* | network tests: make IMAP, FTP testdata more flexible.Rohan McGovern2011-01-256-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
* | Merge branch 'earth/file-engine-refactor'Shane Kearns2011-01-251-1/+1
|\ \ | |/ |/|
| * Fix for using search paths with a dirty pathShane Kearns2011-01-121-1/+1
| | | | | | | | | | | | Opening "searchpath:/file" and other non clean paths was failing Reviewed-by: joao
* | Improve documentation for PWD variable.Robin Burchell2011-01-171-2/+11
| | | | | | | | | | | | | | | | | | - Note that it can be used in shadow build circumstances. - Note that IN_PWD is an alias for PWD. - See also: _PRO_FILE_ Merge-request: 1022 Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com>
* | Use packagesExist() macro to bail if a nonexistant package is requested.Robin Burchell2011-01-171-0/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This will solve problematic cases with large projects, lots of required packages, and no configure scripts failing to build partway through. Previously, PKGCONFIG processing would error to stdout, but continue the compilation. This should not affect existing code overly much, apart from projects who added nonexistent packages they didn't use to PKGCONFIG (but let's face it, that's a bit of a stupid thing to do.) Task-number: QTBUG-11418 Merge-request: 1022 Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com>
* | Add packagesExist() function to qmake.Robin Burchell2011-01-174-1/+41
| | | | | | | | | | | | | | | | This can be used to detect whether or not a given (set of) packages exist, which can be useful for compiling in or our extra functionality at build time. Merge-request: 1022 Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com>
* | Added Symbian implementation of keyboard language functions.axis2011-01-143-0/+42
| | | | | | | | | | | | | | | | More specifically, QApplication::keyboardInputLocale() and QApplication::keyboardInputDirection(). Task: QTBUG-15600 RevBy: Sami Merila
* | Help message clarificationThiago Marcos P. Santos2011-01-141-1/+1
| | | | | | | | | | Merge-request: 2548 Signed-off-by: axis <qt-info@nokia.com>
* | No longer copy the executable file to phone by defaultThiago Marcos P. Santos2011-01-141-5/+26
| | | | | | | | | | | | | | | | | | The user needs to explicitly use -u or --upload to do that. Task-number: QTBUG-16625 Merge-request: 2548 Signed-off-by: axis <qt-info@nokia.com>
* | Merge branch 'master' of scm.dev.nokia.troll.no:qt/qt-releng-staging into ↵Qt Continuous Integration System2011-01-072-42/+41
|\ \ | | | | | | | | | | | | | | | | | | | | | | | | master-integration * 'master' of scm.dev.nokia.troll.no:qt/qt-releng-staging: Remove unnecessarily frozen functions from QtOpenGL WINSCW DEF file Updated QTOpenGL DEF files for WINSCW and ARMV5 Updated DEF files for QtOpenGL for WINSCW and ARMV5
| * \ Merge branch 'master' of scm.dev.nokia.troll.no:qt/qt-releng-staging into ↵Qt Continuous Integration System2011-01-062-42/+41
| |\ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | master-integration * 'master' of scm.dev.nokia.troll.no:qt/qt-releng-staging: Remove unnecessarily frozen functions from QtOpenGL WINSCW DEF file Updated QTOpenGL DEF files for WINSCW and ARMV5 Updated DEF files for QtOpenGL for WINSCW and ARMV5
| | * \ Merge commit 'qt-releng-review/master'Eckhart Koppen2011-01-062-42/+41
| | |\ \
| | | * \ Merge branch 'master' of git://scm.dev.nokia.troll.no/qt/qt-releng-teamQt Continuous Integration System2011-01-061-124/+0
| | | |\ \ | | | | | | | | | | | | | | | | | | | | | | | | * 'master' of git://scm.dev.nokia.troll.no/qt/qt-releng-team: Remove unnecessarily frozen functions from QtOpenGL WINSCW DEF file
| | | | * | Remove unnecessarily frozen functions from QtOpenGL WINSCW DEF fileEckhart Koppen2011-01-061-124/+0
| | | | | | | | | | | | | | | | | | | | | | | | Reviewed-by: TrustMe
| | | * | | Merge branch 'master' of git://scm.dev.nokia.troll.no/qt/qt-releng-teamQt Continuous Integration System2011-01-062-39/+162
| | | |\ \ \ | | | | |/ / | | | | | | | | | | | | | | | | | | * 'master' of git://scm.dev.nokia.troll.no/qt/qt-releng-team: Updated QTOpenGL DEF files for WINSCW and ARMV5
| | | | * | Updated QTOpenGL DEF files for WINSCW and ARMV5Eckhart Koppen2011-01-062-39/+162
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Marked more functions absent Reviewed-by: TrustMe
| | | * | | Merge branch 'master' of git://scm.dev.nokia.troll.no/qt/qt-releng-teamQt Continuous Integration System2011-01-06185-4660/+8360
| | | |\ \ \ | | | | |/ / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * 'master' of git://scm.dev.nokia.troll.no/qt/qt-releng-team: (118 commits) Updated DEF files for QtOpenGL for WINSCW and ARMV5 Fix link error on MacOS Allow QWidget with size larger than 16383 on Mac OS X (Cocoa) Set no brush when the brush is a solid patern transparent color. Fixed networkselftest failing to resolve hostname tst_qmessagebox: fix `about' test on mac tst_qmessagebox: make the failure message better for detailsButtonText tst_qmessagebox: simulate key events more robustly Clear WSERV content when a native child receives an "expose" Fixed a bug in elf2e32_qtwrapper regarding spaces in def files. Fixed several compile and deployment issues in the mmf phonon plugin. Fix fullscreen/Maximized dialog misplacement in Symbian Whitespace change Fix for coding conventions. Fix resource leak in QCLuceneStandardAnalyzer::QCLuceneStandardAnalyzer. Fix resource leak in QCLuceneStopAnalyzer::QCLuceneStopAnalyzer. 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. ...
| | | | * | Updated DEF files for QtOpenGL for WINSCW and ARMV5Eckhart Koppen2011-01-052-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Marked QGLContextResource::value absent Reviewed-by: TrustMe
| | | | * | Merge commit 'qt-master/master'Eckhart Koppen2011-01-05196-5364/+8752
| | | | |\ \ | | | | | |/
* | | | | | Merge branch 'qt-master-from-4.7' of ↵Qt Continuous Integration System2011-01-078-118/+221
|\ \ \ \ \ \ | |/ / / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | scm.dev.nokia.troll.no:qt/qt-integration into master-integration * 'qt-master-from-4.7' of scm.dev.nokia.troll.no:qt/qt-integration: PathView crashed when the path is provided with undefined values. PathView: update modelCount before attempting to regenerate delegates. Update docs - calling overloaded functions from QML is now supported Doc fixes for introduction page and Item docs
| * | | | | Merge branch 'qt-master-from-4.7' of ↵Qt Continuous Integration System2011-01-068-118/+221
| |\ \ \ \ \ |/ / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | scm.dev.nokia.troll.no:qt/qt-integration into master-integration * 'qt-master-from-4.7' of scm.dev.nokia.troll.no:qt/qt-integration: PathView crashed when the path is provided with undefined values. PathView: update modelCount before attempting to regenerate delegates. Update docs - calling overloaded functions from QML is now supported Doc fixes for introduction page and Item docs
| * | | | | Merge branch 4.7 into qt-master-from-4.7Qt Continuous Integration System2011-01-068-118/+221
| |\ \ \ \ \
| | * \ \ \ \ 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 'master' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into ↵Qt Continuous Integration System2011-01-062-3/+3
|\ \ \ \ \ \ \ \ | |_|_|_|/ / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | master-integration * 'master' of scm.dev.nokia.troll.no:qt/oslo-staging-1: QHostInfoCache: Use QElapsedTime instead of QTime
| * | | | | | | QHostInfoCache: Use QElapsedTime instead of QTimeNiklas Kurkisuo2011-01-062-3/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Use QElapsedTime instead of QTime for performance gain. See QT-2965 for more info. Task-number: QTBUG-16468 Reviewed-by: Markus Goetz
* | | | | | | | Merge branch 'master' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into ↵Qt Continuous Integration System2011-01-061-0/+246
|\ \ \ \ \ \ \ \ | |_|/ / / / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | master-integration * 'master' of scm.dev.nokia.troll.no:qt/oslo-staging-2: tst_qscriptclass: backport test from the v8 branch
| * | | | | | | tst_qscriptclass: backport test from the v8 branchOlivier Goffart2011-01-061-0/+246
| |/ / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | From commit 4e39278225 Add test coverage to match 4.7 behaviour regarding original properties
* | | | | | | Merge branch 'master' of scm.dev.nokia.troll.no:qt/qt-water-staging into ↵Qt Continuous Integration System2011-01-061-1/+4
|\ \ \ \ \ \ \ | |/ / / / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | master-integration * 'master' of scm.dev.nokia.troll.no:qt/qt-water-staging: Cocoa: add support for QEventLoop::ExcludeUserInputEvents
| * | | | | | Cocoa: add support for QEventLoop::ExcludeUserInputEventsRichard Moe Gustavsen2011-01-061-1/+4
|/ / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Seems like this was just missing when used together with the DialogExec/EventLoopExec flags. This patch avoid using cocoas own run methods for dispatching events when we want to exclude user input events, and instead do it ourselves. This patch will only fix this issue when no modal windows are showing. For modal windows, a bit more research is needed.
* | | | | | Merge branch 'qt-master-from-4.7' of ↵Qt Continuous Integration System2011-01-0543-1066/+2835
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | scm.dev.nokia.troll.no:qt/qt-integration into master-integration * 'qt-master-from-4.7' of scm.dev.nokia.troll.no:qt/qt-integration: Fix outdated tests Fix def file names for libinfixed testlib Generate freeze targets in Symbian 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() Update visual tests Ignore static_and_shared in Symbian builds.
| * \ \ \ \ \ Merge branch 4.7 into qt-master-from-4.7Qt Continuous Integration System2011-01-0543-1066/+2835
| |\ \ \ \ \ \ | | |/ / / / / | | | | | | / | | |_|_|_|/ | |/| | | |
| | * | | | 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>
generated by cgit v0.12 at 2025-02-07 10:51:40 (GMT)