summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7Martin Jones2010-11-043-0/+32
|\
| * Add testcase for QTBUG-13719.Michael Brasser2010-11-043-0/+32
| |
* | Don't emit xChanged()/yChanged() twice.Martin Jones2010-11-042-4/+10
|/ | | | | | | | | Once from QGraphicsObject (QGraphicsItemPrivate::setPosHelper()) and once from QDeclarativeItem::geometryChanged(). Remove from geometryChanged(). Task-number: QTBUG-14942 Reviewed-by: Michael Brasser
* Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7-integrationQt Continuous Integration System2010-11-0340-88/+3224
|\ | | | | | | | | | | | | | | | | | | * '4.7' of scm.dev.nokia.troll.no:qt/qt-qml: highlightranges.qml example and visual test contained binding loop. Combining ListView.StrictlyEnforceRange and resizing currentItem stalls. Regression: QDeclarativeText does not update when text turns empty Qml Debugging: Only enable if explicitly requested Regression: Text element breaks when using \n for separating lines Removing a binding while it is being applied caused a crash.
| * highlightranges.qml example and visual test contained binding loop.Martin Jones2010-11-032-13/+19
| | | | | | | | | | | | | | | | Also, the currentIndex stayed -1 since the views all bound to each others currentIndex, which starts as -1. Task-number: QTBUG-14794 Reviewed-by: Yann Bodson
| * Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7Martin Jones2010-11-0321-16/+965
| |\
| | * Regression: QDeclarativeText does not update when text turns emptyYann Bodson2010-11-037-0/+751
| | | | | | | | | | | | | | | Task-number: QTBUG-14865 Reviewed-by: Michael Brasser
| | * Qml Debugging: Only enable if explicitly requestedKai Koehne2010-11-0212-4/+49
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Enable the remote debugging of QDeclarativeEngines only after QDeclarativeDebugHelper::enableDebugging() has been called. Approved by 4.7 Program Team. Reviewed-by: Alessandro Portale Task-number: QTBUG-13762
| | * Regression: Text element breaks when using \n for separating linesYann Bodson2010-11-023-12/+165
| | | | | | | | | | | | | | | Task-number: QTBUG-14915 Reviewed-by: Michael Brasser
| * | Combining ListView.StrictlyEnforceRange and resizing currentItem stalls.Martin Jones2010-11-0311-43/+2181
| |/ | | | | | | | | | | | | | | | | There were two problems. 1) layout() called fixup() was called while the view was being flicked. 2) the snapping code was incorrect (and duplicated). Task-number: QTBUG-14821 Reviewed-by: Michael Brasser
| * Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7Martin Jones2010-11-028-81/+376
| |\
| * | Removing a binding while it is being applied caused a crash.Martin Jones2010-11-026-16/+59
| | | | | | | | | | | | | | | | | | | | | | | | Use a weak pointer to the binding in case applying the binding (while fast forwarding) causes it to be removed. Task-number: QTBUG-14830 Reviewed-by: Michael Brasser
* | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-s60-public into ↵Qt Continuous Integration System2010-11-034-3/+25
|\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | 4.7-integration * '4.7' of scm.dev.nokia.troll.no:qt/qt-s60-public: Qt/Symbian: QInputDialog layout and size are wrong
| * | | Qt/Symbian: QInputDialog layout and size are wrongSami Merila2010-11-034-3/+25
| | |/ | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The QInputDialog with anything but QLineEdit as the input widget, will show up as minimal size on device/emulator. Also, the dialog looks bad since the widgets are deployed very close to the dialog borders. As a fix, layout will not get the size policy set on Symbian, but the dialog itself is stretched to occupy screen width and thus, layout grows to occupy the available size. Additionally, style will set layout pixel metrics for dialogs larger than for other widgets, to avoid the layout from putting widgets very close to dialog border. Task-number: QTBUG-14331 Reviewed-by: Janne Anttila
* | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into ↵Qt Continuous Integration System2010-11-035-27/+43
|\ \ \ | |/ / |/| | | | | | | | | | | | | | | | | | | | | | | 4.7-integration * '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1: make the dtd reflect reality Fixed destination path for the S60 feedback plugin. german translation: minor additions + fixes fix qdoc doc generation
| * | make the dtd reflect realityOswald Buddenhagen2010-11-021-18/+5
| | |
| * | Fixed destination path for the S60 feedback plugin.David Boddie2010-11-021-0/+2
| | | | | | | | | | | | Reviewed-by: axis
| * | german translation: minor additions + fixesFrederik Schwarzer2010-11-022-7/+34
| | | | | | | | | | | | | | | Merge-request: 902 Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com>
| * | fix qdoc doc generationOswald Buddenhagen2010-11-011-2/+2
| | | | | | | | | | | | | | | as a side effect, the target is now named html-docs instead of docs to be consistent with the qt docs.
* | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into ↵Qt Continuous Integration System2010-11-018-81/+376
|\ \ \ | |/ / | | / | |/ |/| | | | | | | | | | | | | 4.7-integration * '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1: QNAM HTTP: tst_qnetworkreply with setReadBufferSize() set Fix compilation on AIX 5.3 with gcc Doc: Fixed typo Fix poor English in QStyle::polish documentation. Fix a few typos in comments and docs.
| * Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into ↵Qt Continuous Integration System2010-11-018-81/+376
| |\ |/ / | | | | | | | | | | | | | | | | | | 4.7-integration * '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1: QNAM HTTP: tst_qnetworkreply with setReadBufferSize() set Fix compilation on AIX 5.3 with gcc Doc: Fixed typo Fix poor English in QStyle::polish documentation. Fix a few typos in comments and docs.
| * QNAM HTTP: tst_qnetworkreply with setReadBufferSize() setDavid Faure2010-11-011-71/+366
| | | | | | | | | | | | | | | | | | | | This new method tests 4 cases (http/https, with/without buffer size) and checks the send/receive rates to check that the actual transfer rate was limited, not just the speed of emission of data to the application. Task-number: QTBUG-6276 Merge-request: 872 Reviewed-by: Markus Goetz <Markus.Goetz@nokia.com>
| * Fix compilation on AIX 5.3 with gccKent Hansen2010-11-011-1/+1
| | | | | | | | | | | | | | | | | | "error: invalid pointer to bit-field `QAbstractStatePrivate::isMachine'" The extra qualification is not needed anyway, so remove it. Task-number: QTBUG-14491 Reviewed-by: Eskil Abrahamsen Blomfeldt
| * Doc: Fixed typoThorbjørn Lindeijer2010-11-011-1/+1
| |
| * Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into ↵Qt Continuous Integration System2010-11-015-8/+8
| |\ | | | | | | | | | | | | | | | | | | | | | 4.7-integration * '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1: Fix poor English in QStyle::polish documentation. Fix a few typos in comments and docs.
| | * Fix poor English in QStyle::polish documentation.Jason McDonald2010-11-011-4/+4
| | | | | | | | | | | | | | | Task-number: QTBUG-10538 Reviewed-by: Trust Me
| | * Fix a few typos in comments and docs.Jason McDonald2010-11-014-4/+4
| | | | | | | | | | | | | | | Task-number: QTBUG-13714 Reviewed-by: Trust Me
* | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7-integrationQt Continuous Integration System2010-11-013-1/+60
|\ \ \ | | | | | | | | | | | | | | | | * '4.7' of scm.dev.nokia.troll.no:qt/qt-qml: Quickly clicking an item that doesn't use double clicking should result in two separate clicks
| * | | Quickly clicking an item that doesn't use double clicking should result in ↵Joona Petrell2010-11-013-1/+60
| | | | | | | | | | | | | | | | | | | | | | | | | | | | two separate clicks Task-number: QTBUG-14832 Reviewed-by: Martin Jones
* | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-s60-public into ↵Qt Continuous Integration System2010-11-011-0/+1
|\ \ \ \ | |_|/ / |/| | | | | | | | | | | | | | | | | | | 4.7-integration * '4.7' of scm.dev.nokia.troll.no:qt/qt-s60-public: Fix OpenVG painting artifacts after restoreState().
| * | | Fix OpenVG painting artifacts after restoreState().Jason Barron2010-11-011-0/+1
| | |/ | |/| | | | | | | | | | | | | | | | | | | | | | | | | When the state is restored and the 'dirty' flag indicates that the clip state has changed, the paint engine needs to set 'scissorDirty' flag to true so that updateScissor() applies the restored clip region to the scissor rects. Task-number: QTBUG-14907 Reviewed-by: Jani Hautakangas
* | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7-integrationQt Continuous Integration System2010-11-0168-5595/+11728
|\ \ \ | |/ / |/| / | |/ | | * '4.7' of scm.dev.nokia.troll.no:qt/qt-qml: Fix QML visual tests on Mac.
| * Fix QML visual tests on Mac.Yann Bodson2010-11-0168-5595/+11728
|/ | | | Task-number: QTBUG-14792
* Merge branch 'qt-4.7-from-4.6' of scm.dev.nokia.troll.no:qt/qt-integration ↵Qt Continuous Integration System2010-10-302-0/+36
|\ | | | | | | | | | | | | | | into 4.7-integration * 'qt-4.7-from-4.6' of scm.dev.nokia.troll.no:qt/qt-integration: Fix Windows compilation. Fixed race condition in raster paint engine.
| * Merge remote branch 'origin/4.6' into qt-4.7-from-4.6Olivier Goffart2010-10-302-0/+36
| |\ |/ / | | | | | | Conflicts: tests/auto/qpainter/tst_qpainter.cpp
| * Merge branch '4.6' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into ↵Qt Continuous Integration System2010-10-272-0/+36
| |\ | | | | | | | | | | | | | | | | | | | | | 4.6-integration * '4.6' of scm.dev.nokia.troll.no:qt/oslo-staging-2: Fix Windows compilation. Fixed race condition in raster paint engine.
| | * Fix Windows compilation.Samuel Rødal2010-10-272-0/+2
| | | | | | | | | | | | | | | | | | | | | Don't take for granted that these are included... Task-number: QTBUG-14614 Reviewed-by: Bradley T. Hughes
| | * Fixed race condition in raster paint engine.Samuel Rødal2010-10-272-0/+34
| |/ | | | | | | | | | | | | We need to protect the gradient cache accesses with a mutex. Task-number: QTBUG-14614 Reviewed-by: Bradley T. Hughes
* | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into ↵Qt Continuous Integration System2010-10-292-12/+17
|\ \ | | | | | | | | | | | | | | | | | | | | | 4.7-integration * '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1: dbus does not use this. fix build. Fix memory leak on exit
| * | dbus does not use this. fix build.Lorn Potter2010-10-291-4/+4
| | | | | | | | | | | | Reviewed-by: trust me
| * | Fix memory leak on exitHarald Fernengel2010-10-291-8/+13
| | | | | | | | | | | | | | | | | | | | | The confFile was lost if the cache was already gone (e.g. on app exit). This patch ensures that the confFile is always deleted. Reviewed-by: João Abecasis
* | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7-integrationQt Continuous Integration System2010-10-2966-32/+19931
|\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * '4.7' of scm.dev.nokia.troll.no:qt/qt-qml: Update webview visual tests to new skip mode Remove unnecessary QML import project dependency to Symbian deployment pri file used by Qt demos Update visual tests for Mac Revert "Disable WebView visualtests" Mark dynamic.qml as expect-fail the new way Update gridview visual tests Revert "Mark qdeclarativegridview autotests as expect-fail"
| * \ \ Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7Alan Alpert2010-10-298-6/+25
| |\ \ \
| | * | | Remove unnecessary QML import project dependency to Symbian deployment pri ↵Joona Petrell2010-10-293-3/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | file used by Qt demos Task-number: QT-4197 Reviewed-by: Jason Barron * breaks compilation of releases that omit Qt demos directory * qt import plugins have different deployment configuration than demo applications * declarative import plugins already get their symbian-related settings from src\imports\qimportbase.pri that is basically a copy from qpluginbase.pri written for plugins
| | * | | Update visual tests for MacYann Bodson2010-10-294-0/+22
| | | | | | | | | | | | | | | | | | | | Task-number: QTBUG-14792
| * | | | Update webview visual tests to new skip modeAlan Alpert2010-10-2913-21/+23
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | New mode requires them to at least compile. Now that I've noticed this, removing that check on compile failures in QDeclarativeTester. Task-number: QTBUG-14792
| * | | | Revert "Disable WebView visualtests"Alan Alpert2010-10-2924-0/+12940
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This reverts commit 8ba02a8f5a537b9f7e1ff671abe6eed67029db58. ExpectFail state has been altered. Redoing that commit. This commit also adds the new line to indicate tests we don't care about
| * | | | Mark dynamic.qml as expect-fail the new wayAlan Alpert2010-10-299-2/+1605
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Also remove the check for the old way in tst_qmlvisual Task-number: QTBUG-14792
| * | | | Update gridview visual testsAlan Alpert2010-10-2913-373/+374
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The bug found in gridview.qml doesn't actually stop the test from passing, so it's now updated. Task-number: QTBUG-14792
| * | | | Revert "Mark qdeclarativegridview autotests as expect-fail"Alan Alpert2010-10-2925-4/+5338
| | | | | | | | | | | | | | | | | | | | | | | | | This reverts commit b6ee57e14e145d9caa3f572d55447ec92f78cea4. Changed our mind about how to mark tests as expect-fail
generated by cgit v0.12 at 2025-08-13 05:05:50 (GMT)