summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into ↵Qt Continuous Integration System2010-10-2910-96/+151
|\ | | | | | | | | | | | | | | 4.7-integration * '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-2: Fix possible crash in QStaticText and QDeclarativeTextLayout Fix QTBUG-14132 oracle (xe) stored procedures with bind variables get errors
| * Fix possible crash in QStaticText and QDeclarativeTextLayoutEskil Abrahamsen Blomfeldt2010-10-298-32/+88
| | | | | | | | | | | | | | | | | | | | | | | | | | The QStaticTextItem held an uncounted reference to QFontEngine. The pointer would dangle in some cases where there was no font object referencing the engine and the cache was cleaned out (e.g. when a new application font is added.) Properly count the reference, and also add reference counting to userData to make it harder to shoot yourself in the foot, since the QStaticTextItem class is now being used in different places, Task-number: QTBUG-14446 Reviewed-by: Martin Jones
| * Fix QTBUG-14132 oracle (xe) stored procedures with bind variables get errorsCharles Yin2010-10-292-64/+63
| | | | | | | | | | | | | | | | | | Strange Oracle bug: some Oracle servers crash the server process with non-zero error handle (mostly for 10g). So pass null error handle pointer to OCIAttrSet when setting OCI_ATTR_CHARSET_FORM to bypass this bug. Change-Id: Ifcf65994a22783e69a89bebe1adb882cdf36bdbb Task-number:QTBUG-14132 Reviewed-by: Michael Goddard
* | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into ↵Qt Continuous Integration System2010-10-2929-361/+297
|\ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 4.7-integration * '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1: (25 commits) QNAM: Fix doc rendering of QNetworkRequest remove the connecting thread, and use async call to dbus instead. QScriptValue::construct(): Don't crash if function throws non-Object Network code: Fix code comment spellchecking errors. QNAM: fix build QNAM HTTP: Remove the error() of QHttpNetworkConnection QNAM HTTP: Remove enableEncryption() QNAM HTTP: Remove unused code QNAM HTTP: Move authenticationRequired() to QHttpNetworkReply QNAM HTTP: Move proxyAuthenticationRequired() to QHttpNetworkReply QNAM HTTP: Move cacheCredentials() to QHttpNetworkReply QNAM HTTP: Use sslErrors() from QHttpNetworkReply QNAM HTTP: Remove Wait4AuthState QNAM: Internal function renaming QNAM HTTP: Internal variable spelling mistakes QNAM HTTP: Pause connection when emitting proxy auth signal QNAM HTTP: Also pause connection when emitting sslErrors() QNAM HTTP: Also resume uploads after connection pause QNAM HTTP: Process authenticationRequired() from HTTP properly QNAM HTTP: Pause sockets while emitting to user code. ...
| * | QNAM: Fix doc rendering of QNetworkRequestMarkus Goetz2010-10-291-10/+0
| | | | | | | | | | | | Reviewed-by: Morten Engvoldsen
| * | remove the connecting thread, and use async call to dbus instead.Lorn Potter2010-10-294-107/+36
| | | | | | | | | | | | | | | | | | | | | | | | This fixes the case where the connection threads are never stopped until desctuctor. Task-number: QTBUG-14836 Reviewed-by: trust me
| * | QScriptValue::construct(): Don't crash if function throws non-ObjectKent Hansen2010-10-283-5/+34
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | If an exception occurs, we should ignore the result of JSC::construct() and return the exception value, even if the exception is not an object. This makes the behavior match the documentation: "Calling construct() can cause an exception to occur in the script engine; in that case, construct() returns the value that was thrown". Task-number: QTBUG-14801 Reviewed-by: Jedrzej Nowacki
| * | Network code: Fix code comment spellchecking errors.Markus Goetz2010-10-284-4/+4
| | | | | | | | | | | | | | | | | | Me no speak americano. Reviewed-by: Peter Hartmann
| * | QNAM: fix buildPeter Hartmann2010-10-271-1/+5
| | | | | | | | | | | | | | | | | | | | | | | | * winsock2.h conflicts with qplatformdefs.h * ifndef QT_NO_OPENSSL was missing Reviewed-by: Prasanth Reviewed-by: Markus Goetz
| * | QNAM HTTP: Remove the error() of QHttpNetworkConnectionMarkus Goetz2010-10-276-31/+9
| | | | | | | | | | | | | | | | | | | | | | | | Removed the distinction between reply error and connection error. The QNetworkAccessManager was treating them the same way anyway. Reviewed-by: Prasanth Task-Number: QTBUG-13234
| * | QNAM HTTP: Remove enableEncryption()Markus Goetz2010-10-273-29/+5
| | | | | | | | | | | | | | | Reviewed-by: Prasanth Task-Number: QTBUG-13234
| * | QNAM HTTP: Remove unused codeMarkus Goetz2010-10-273-42/+0
| | | | | | | | | | | | | | | Reviewed-by: Prasanth Task-Number: QTBUG-13234
| * | QNAM HTTP: Move authenticationRequired() to QHttpNetworkReplyMarkus Goetz2010-10-276-20/+16
| | | | | | | | | | | | | | | Reviewed-by: Prasanth Task-Number: QTBUG-13234
| * | QNAM HTTP: Move proxyAuthenticationRequired() to QHttpNetworkReplyMarkus Goetz2010-10-274-13/+9
| | | | | | | | | | | | | | | Reviewed-by: Prasanth Task-Number: QTBUG-13234
| * | QNAM HTTP: Move cacheCredentials() to QHttpNetworkReplyMarkus Goetz2010-10-274-5/+4
| | | | | | | | | | | | | | | Reviewed-by: Prasanth Task-Number: QTBUG-13234
| * | QNAM HTTP: Use sslErrors() from QHttpNetworkReplyMarkus Goetz2010-10-276-12/+16
| | | | | | | | | | | | | | | Reviewed-by: Prasanth Task-Number: QTBUG-13234
| * | QNAM HTTP: Remove Wait4AuthStateMarkus Goetz2010-10-273-8/+1
| | | | | | | | | | | | | | | Reviewed-by: Prasanth Task-Number: QTBUG-13234
| * | QNAM: Internal function renamingMarkus Goetz2010-10-273-10/+10
| | | | | | | | | | | | | | | Reviewed-by: Prasanth Task-Number: QTBUG-13234
| * | QNAM HTTP: Internal variable spelling mistakesMarkus Goetz2010-10-273-12/+12
| | | | | | | | | | | | | | | Reviewed-by: Prasanth Task-Number: QTBUG-13234
| * | QNAM HTTP: Pause connection when emitting proxy auth signalMarkus Goetz2010-10-271-0/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | Pause the socket notifiers because the user could be displaying a dialog which makes the event loop run and could make our socket notifiers fire. Reviewed-by: Prasanth Task-Number: QTBUG-13234
| * | QNAM HTTP: Also pause connection when emitting sslErrors()Markus Goetz2010-10-271-0/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Pause the socket notifiers because the user could be displaying a dialog which makes the event loop run and could make our socket notifiers fire. Reviewed-by: Peter Hartmann Reviewed-by: Prasanth Task-Number: QTBUG-13234
| * | QNAM HTTP: Also resume uploads after connection pauseMarkus Goetz2010-10-271-3/+4
| | | | | | | | | | | | | | | | | | Reviewed-by: Peter Hartmann Reviewed-by: Prasanth Task-Number: QTBUG-13234
| * | QNAM HTTP: Process authenticationRequired() from HTTP properlyMarkus Goetz2010-10-275-11/+14
| | | | | | | | | | | | | | | | | | | | | | | | | | | Fixes a bug where a different QNetworkReply(Impl) handles an authentication request. Reviewed-by: Peter Hartmann Reviewed-by: Prasanth Task-Number: QTBUG-13234
| * | QNAM HTTP: Pause sockets while emitting to user code.Markus Goetz2010-10-272-41/+56
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This is needed because user code might display a dialog which spins an event loop and could make the sockets readyRead() fire. This event loop recursion is not desired as it can lead to nasty bugs when the state is messed up. Reviewed-by: Peter Hartmann Reviewed-by: Prasanth Task-Number: QTBUG-13234
| * | QNAM HTTP: Do not copy around credentials when using NTLMMarkus Goetz2010-10-271-0/+7
| | | | | | | | | | | | | | | | | | | | | | | | Copying the username and password messes up the state inside the QAuthenticator. Do not do it. Reviewed-by: Prasanth Task-Number: QTBUG-13234
| * | QNAM HTTP: Move caching of credentials from URLMarkus Goetz2010-10-272-6/+6
| | | | | | | | | | | | | | | | | | | | | | | | The credentials are now cached when the request gets sent. Reviewed-by: Peter Hartmann Reviewed-by: Prasanth Task-Number: QTBUG-13234
| * | QNAM: Do not load credentials from cache prematurelyMarkus Goetz2010-10-271-11/+5
| | | | | | | | | | | | | | | | | | | | | | | | The credentials shall only be loaded on demand, e.g. after the HTTP code emits authenticationRequired() Reviewed-by: Prasanth Task-Number: QTBUG-13234
| * | QAuthenticator: Fix NTLMv2 credential caching of QNAMMarkus Goetz2010-10-272-6/+9
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | QNetworkAccessManager used the user() function for caching the credentials when doing HTTP authentication with NTLMv2. For that to work it needs to return the same value as was put in with setUser(). Reviewed-by: Peter Hartmann Reviewed-by: Prasanth Task-Number: QTBUG-13234
| * | Sockets: Private function for pausing/resuming notifiersMarkus Goetz2010-10-274-0/+53
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This will be used by QNAM to prevent event loop recursion while emitting signals that often spin an event loop, e.g. authenticationRequired() displaying a dialog for the user. Reviewed-by: Peter Hartmann Reviewed-by: Prasanth Task-Number: QTBUG-13234
* | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7-integrationQt Continuous Integration System2010-10-29556-73224/+31552
|\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * '4.7' of scm.dev.nokia.troll.no:qt/qt-qml: (28 commits) Regression: horizontal alignment bug with single line text Add 'skip' property that QML visual tests can use Almost all visual tests pass on linux Disable WebView visualtests Clean up repeater visual tests Clean up QML Rect visual tests Update qdeclarativespringanimation visual tests Regression: QML fonts look bad on Mac with font smoothing on Clean up qdeclarativesmoothedanimation visual tests Clean up qdeclarativepositioner tests Update visuals for qdeclarativepathview visual tests Clean up qdeclarativeparticles visual test Mark qdeclarativegridview autotests as expect-fail Clean up qdeclarativeflickable visual tests Clean up qdeclarativeboarderimage visual tests Add a test for multiline text alignment Update when text changes to "" Shrink and update qdeclarativetext visual tests Clean up package views visual test Clean up qmlvisual/qdeclarativetextinput visual tests ...
| * | | Regression: horizontal alignment bug with single line textYann Bodson2010-10-291-3/+3
| | | | | | | | | | | | | | | | Task-number: QTBUG-14841
| * | | Add 'skip' property that QML visual tests can useAlan Alpert2010-10-2927-9/+2263
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This property can be set with a reason to skip the test (i.e. known bug) and the failure will not count for blocking purposes. This change also alters one of the failing tests to use the new property Task-number: QTBUG-14792 Reviewed-by: Michael Brasser
| * | | Almost all visual tests pass on linuxAlan Alpert2010-10-294-3195/+2
| | | | | | | | | | | | | | | | | | | | | | | | Still looking into text/fonts/plaintext which just developed an issue. Task-number: QTBUG-14792
| * | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7Alan Alpert2010-10-291-0/+8
| |\ \ \
| | * | | Regression: QML fonts look bad on Mac with font smoothing onYann Bodson2010-10-291-0/+8
| | | | | | | | | | | | | | | | | | | | Task-number: QTBUG-14840
| * | | | Disable WebView visualtestsAlan Alpert2010-10-2912-12928/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Until this element is maintained, all tests are entering expectFail state. Task-number: QTBUG-14792
| * | | | Clean up repeater visual testsAlan Alpert2010-10-2928-4260/+60
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Replace text with coloured rectangles, for more cross platform stability Task-number: QTBUG-14792
| * | | | Clean up QML Rect visual testsAlan Alpert2010-10-296-276/+22
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Mostly just creating the test scripts. Task-number: QTBUG-14792
| * | | | Update qdeclarativespringanimation visual testsAlan Alpert2010-10-2936-2901/+2378
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Still correct, main problem was not getting updated visuals when we switched away from follows. Task-number: QTBUG-14792
| * | | | Clean up qdeclarativesmoothedanimation visual testsAlan Alpert2010-10-299-1852/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Smoothed animation test is actually just a subset of smoothed follow now Task-number: QTBUG-14792
| * | | | Clean up qdeclarativepositioner testsAlan Alpert2010-10-2911-1871/+70
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | dynamic.qml is now at expect-fail status, see QTBUG-14839 Task-number: QTBUG-14792
| * | | | Update visuals for qdeclarativepathview visual testsAlan Alpert2010-10-2916-580/+580
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The only difference appears to be a change to the flicking parameters, so the test is still valid. Task-number: QTBUG-14792
| * | | | Clean up qdeclarativeparticles visual testAlan Alpert2010-10-295-193/+193
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | update visuals, and add a couple comments. Task-number: QTBUG-14792
| * | | | Mark qdeclarativegridview autotests as expect-failAlan Alpert2010-10-2925-5338/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Includes the task numbers of the bugs, for later processing. Task-number: QTBUG-14792
| * | | | Clean up qdeclarativeflickable visual testsAlan Alpert2010-10-2932-4348/+3274
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | They are mostly still fine, it's just that the flickable parameters had changed. Expected outputs have been revised. Task-number: QTBUG-14792
| * | | | Clean up qdeclarativeboarderimage visual testsAlan Alpert2010-10-2919-3078/+262
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Includes speeding up the animated resize tests. Task-number: QTBUG-14792
| * | | | Add a test for multiline text alignmentAlan Alpert2010-10-295-0/+518
| |/ / / | | | | | | | | | | | | | | | | | | | | Apparently this is something we've had troubles with in the past Task-number: QTBUG-14792
| * | | Update when text changes to ""Alan Alpert2010-10-296-1/+974
| | | | | | | | | | | | | | | | | | | | | | | | Also fixes a doc typo. Includes test. Task-number: QTBUG-14469
| * | | Shrink and update qdeclarativetext visual testsAlan Alpert2010-10-2910-70/+112
| | | | | | | | | | | | | | | | Task-number: QTBUG-14792
| * | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7Alan Alpert2010-10-291-43/+8
| |\ \ \
generated by cgit v0.12 at 2025-02-02 01:13:36 (GMT)