summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* move equivalent of output_ts test to good/Oswald Buddenhagen2010-01-068-53/+3
|
* look for the .result file in the dir where the output is expected to goOswald Buddenhagen2010-01-063-7/+1
| | | | | that makes manual diffing simpler and makes more complex dir structures less confusing.
* fix sametext and number heuristicsOswald Buddenhagen2010-01-067-45/+178
| | | | | | | 92e9a48 ("eliminate Translator::replace()") eliminated the correctness as well. whoops. this code should be more efficient as well ...
* fix number heuristics, part 1Oswald Buddenhagen2010-01-061-2/+2
| | | | Reviewed-by: TrustMe
* no point in specifying -ts when a .pro file is specifiedOswald Buddenhagen2010-01-063-4/+3
| | | | | | ... unless of course one hits this weird lupdate behavior regarding SUBDIRS in conjunction with -ts. just use the flag for this one test for now.
* clean up the lupdatecmd filesOswald Buddenhagen2010-01-064-16/+3
|
* tidy up the test .pro filesOswald Buddenhagen2010-01-0635-154/+35
|
* remove dead codeOswald Buddenhagen2010-01-061-8/+0
|
* Merge branch '4.6' of scm.dev.nokia.troll.no:qt/berlin-staging-1 into ↵Qt Continuous Integration System2010-01-0612-27/+2453
|\ | | | | | | | | | | | | | | | | | | | | 4.6-integration * '4.6' of scm.dev.nokia.troll.no:qt/berlin-staging-1: uic3/uic: Ignore buttonGroupId property when there is no parent QButtonGroup Changelog: Added Designer/uic entries for 4.6.1 Designer: Enable seconds editing for Q[Date]TimeEdit's properties. Designer: Selection handles disappear when using style sheet on form. do not accumulate messages
| * uic3/uic: Ignore buttonGroupId property when there is no parent QButtonGroupDavid Faure2010-01-055-3/+2387
| | | | | | | | | | | | | | The uic from Qt3 did the same. And otherwise uic3/uic generates a radiobutton->setButtonGroupId(val) line, which does not compile. Reviewed-by: Friedemann Kleint <Friedemann.Kleint@nokia.com>
| * Changelog: Added Designer/uic entries for 4.6.1Friedemann Kleint2010-01-051-1/+8
| |
| * Designer: Enable seconds editing for Q[Date]TimeEdit's properties.Friedemann Kleint2010-01-044-19/+53
| | | | | | | | | | | | | | | | on UNIX, for which QLocale's ShortFormat does not include seconds. Move format creation into browser utilities and use consistently for display and editing. Reviewed-by: Jarek Kobus <jkobus@trolltech.com> Task-number: QTBUG-6965
| * Designer: Selection handles disappear when using style sheet on form.Friedemann Kleint2010-01-041-2/+2
| | | | | | | | | | | | | | | | ... that has a white background color. The selection handles inherited the form's stylesheet. Fix by parenting them on the (internal) form container widget. Reviewed-by: Jarek Kobus <jkobus@trolltech.com> Task-number: QTBUG-6757
| * do not accumulate messagesOswald Buddenhagen2010-01-041-2/+3
| | | | | | | | Task-number: QTBUG-6588
* | Merge branch '4.6' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into ↵Qt Continuous Integration System2010-01-0644-436/+654
|\ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 4.6-integration * '4.6' of scm.dev.nokia.troll.no:qt/oslo-staging-1: (27 commits) Fix QT_NO_CONTEXTMENU Updated WebKit from /home/shausman/src/webkit/trunk to qtwebkit/qtwebkit-4.6 ( 865abd2871c801c1d3d0f4eebd985b2daab89ebe ) Fix license check failure. QHttpSocketEngine: Remove unneeded code doc: Clarified that .lnk files are System files on Windows. doc: Clarified that the scene owns its items and destroys them. QAbstractSocket: Fix warnings when compiling with QABSTRACTSOCKET_DEBUG QAbstractSocket: Warn when wrong QHostInfo was received doc: Fixed references to currsor position(). Prevent a crash when creating an inputContext from the QApplication dtor. doc: Added some missing macro descriptions. Small optimization in QIODevice::readAll() doc: Added note explaining grabMouse() for Cocoa and Carbon. doc: Replaced usses of rootState() with state machine pointer. doc: Fixed typo. doc: Clarified which values were added in Qt 4.4. Updated WebKit from /home/shausman/src/webkit/trunk to qtwebkit/qtwebkit-4.6 ( 5d691a1c283938dfbdf891883d8cff8a6ef040bf ) doc: Clarified next and previous activation order. Fix typo in QFSFileEnginePrivate::canonicalized tst_qhostinfo benchmark: Fix license header ...
| * | Fix QT_NO_CONTEXTMENUKent Hansen2010-01-061-0/+2
| | | | | | | | | | | | Task-number: QTBUG-6474
| * | Updated WebKit from /home/shausman/src/webkit/trunk to qtwebkit/qtwebkit-4.6 ↵Simon Hausmann2010-01-064-7/+24
| | | | | | | | | | | | | | | | | | ( 865abd2871c801c1d3d0f4eebd985b2daab89ebe ) Changes in WebKit/qt since the last update:
| * | Fix license check failure.Jason McDonald2010-01-062-26/+28
| | | | | | | | | | | | Reviewed-by: Trust Me
| * | Merge branch '4.6' of git@scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.6Martin Smith2010-01-062-18/+4
| |\ \
| | * | QHttpSocketEngine: Remove unneeded codeMarkus Goetz2010-01-062-18/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | There was a buffer that is always empty since it was only used for parsing the HTTP proxy protocol, not the actual socket data. Reviewed-by: Peter Hartmann
| * | | doc: Clarified that .lnk files are System files on Windows.Martin Smith2010-01-061-3/+4
| |/ / | | | | | | | | | Task-number: QTBUG-6615
| * | Merge branch '4.6' of git@scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.6Martin Smith2010-01-061-9/+13
| |\ \
| | * | QAbstractSocket: Fix warnings when compiling with QABSTRACTSOCKET_DEBUGMarkus Goetz2010-01-061-9/+9
| | | |
| | * | QAbstractSocket: Warn when wrong QHostInfo was receivedMarkus Goetz2010-01-061-0/+4
| | | | | | | | | | | | | | | | | | | | | | | | Let's see if this happens. Reviewed-by: Thiago
| * | | doc: Clarified that the scene owns its items and destroys them.Martin Smith2010-01-061-11/+17
| |/ / | | | | | | | | | Task-number: QTBUG-6637
| * | Merge branch '4.6' of git@scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.6Martin Smith2010-01-063-14/+18
| |\ \
| | * \ Merge branch '4.5' into 4.6-stagingThiago Macieira2010-01-051-13/+15
| | |\ \
| | | * | tst_qhostinfo benchmark: Fix license headerMarkus Goetz2010-01-041-13/+15
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | For some reason, I got it wrong. Reviewed-by: TrustMe
| | * | | Prevent a crash when creating an inputContext from the QApplication dtor.Denis Dzyubenko2010-01-052-1/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | When accessing the global input context from the QWidget destructor access it directly instead of calling a helper function. Don't even bother to create an input context if QApplication is being destroyed (just in case if the user is calling the QApplication::inputContext manually from the destructor). Task-number: QTBUG-7105 Reviewed-by: Simon Hausmann
| * | | | doc: Fixed references to currsor position().Martin Smith2010-01-061-26/+29
| |/ / / | | | | | | | | | | | | Task-number: QTBUG-6763
| * | | Merge branch '4.6' of git@scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.6Martin Smith2010-01-052-2/+51
| |\ \ \
| | * | | Small optimization in QIODevice::readAll()Markus Goetz2010-01-052-2/+51
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | .. and more testcases Reviewed-by: joao
| * | | | doc: Added some missing macro descriptions.Martin Smith2010-01-051-4/+27
| |/ / / | | | | | | | | | | | | Task-number: QTBUG-6769
| * | | doc: Added note explaining grabMouse() for Cocoa and Carbon.Martin Smith2010-01-051-4/+10
| | | | | | | | | | | | | | | | Task-number: QTBUG-6810
| * | | doc: Replaced usses of rootState() with state machine pointer.Martin Smith2010-01-051-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | The root state of a QStateMachine is now the state machine itself. Task-number: QTBUG-6907
| * | | doc: Fixed typo.Martin Smith2010-01-051-1/+1
| | | | | | | | | | | | | | | | Task-number: QTBUG-6978
| * | | Merge branch '4.6' of git@scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.6Martin Smith2010-01-053-2/+22
| |\ \ \
| | * | | Updated WebKit from /home/shausman/src/webkit/trunk to qtwebkit/qtwebkit-4.6 ↵Simon Hausmann2010-01-053-2/+22
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | ( 5d691a1c283938dfbdf891883d8cff8a6ef040bf ) Changes in WebKit/qt since the last update: * Prospective build fix for IA64 Task: QTBUG-6948
| * | | | doc: Clarified which values were added in Qt 4.4.Martin Smith2010-01-051-8/+11
| |/ / / | | | | | | | | | | | | Task-number: QTBUG-7118
| * | | doc: Clarified next and previous activation order.Martin Smith2010-01-051-8/+8
| | | | | | | | | | | | | | | | Task-number: QTBUG-6992
| * | | Fix typo in QFSFileEnginePrivate::canonicalizedMarkus Goetz2010-01-041-1/+1
| | | | | | | | | | | | | | | | Reviewed-by: TrustMe
| * | | Merge branch '4.6' of git@scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.6Martin Smith2010-01-0413-244/+296
| |\ \ \
| | * | | tst_qtcpserver: Move benchmarksMarkus Goetz2010-01-044-156/+291
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Move benchmarks into tests/benchmarks directory. Reviewed-by: Thiago
| | * | | Cocoa: added release poolRichard Moe Gustavsen2010-01-041-0/+1
| | | | | | | | | | | | | | | | | | | | | | | | | Fix warning given by cocoa (cherry picked from commit 875afab977005b03d307040fb3be15c7524a37ff)
| | * | | Remove TEST_QNETWORK_PROXY define from the testsMarkus Goetz2010-01-049-88/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | We always test the proxies now. Reviewed-by: Thiago
| * | | | doc: Fixed remaining qdoc errorsMartin Smith2010-01-041-44/+73
| |/ / / | | | | | | | | | | | | Added a missing \class command, some missing enum values, etc.
| * | | Merge branch '4.6' of git@scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.6Martin Smith2010-01-041-0/+1
| |\ \ \
| | * | | Mac: qcolordialog autotest fails.Richard Moe Gustavsen2010-01-041-0/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | I removed a line as an optimization a while ago. Luckily, the autotest cought a failure doing so. So we put the line back in. Reviewed-by: Prasanth
| * | | | doc: Removed a const from a declaration in the example.Martin Smith2010-01-041-1/+1
| |/ / / | | | | | | | | | | | | Task-number: QTBUG-7092
| * | | Merge branch '4.6' of git@scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.6Martin Smith2010-01-04158-1363/+7895
| |\ \ \
generated by cgit v0.12 at 2024-12-12 09:36:25 (GMT)