summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* 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-272-2/+3
|\ | | | | | | | | | | * '4.7' of scm.dev.nokia.troll.no:qt/qt-qml: Fix bug in QML debug client installation Doc clarification for Loader.
| * Fix bug in QML debug client installationAaron Kennedy2010-10-271-1/+1
| | | | | | | | | | Allow QML debug clients to be installed between the connection being established and the hello message being received.
| * Doc clarification for Loader.Michael Brasser2010-10-271-1/+2
|/
* Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7-integrationQt Continuous Integration System2010-10-262-4/+4
|\ | | | | | | | | * '4.7' of scm.dev.nokia.troll.no:qt/qt-qml: Set the location of the closing brace.
| * Set the location of the closing brace.Roberto Raggi2010-10-262-4/+4
| | | | | | | | Reviewed-by: Christian Kamm
* | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-s60-public into ↵Qt Continuous Integration System2010-10-268-10/+72
|\ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 4.7-integration * '4.7' of scm.dev.nokia.troll.no:qt/qt-s60-public: Phonon MMF backend: set _q_DummyWindowSurface property on VideoWidget Create dummy window surface if if _q_DummyWindowSurface property is set Remove widget subtree from backing store tracker when reparented Suppress call to controlVisibilityChanged for null control pointer Fix patch_capabilities.pl script for explicit set of capabilities Fix empty mifconv TARGETFILE in some edge cases.
| * | Phonon MMF backend: set _q_DummyWindowSurface property on VideoWidgetGareth Stockwell2010-10-261-0/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This prevents a window surface being created if Phonon::VideoWidget::setFullScreen(true) is called. Since Qt does not ever render any content to the native window in which video is displayed, creation of a surface for that window would consume memory unnecessarily. Task-number: MOBILITY-1315 Reviewed-by: Jason Barron
| * | Create dummy window surface if if _q_DummyWindowSurface property is setGareth Stockwell2010-10-261-4/+16
| | | | | | | | | | | | | | | | | | Task-number: MOBILITY-1315 Reviewed-by: Jason Barron Reviewed-by: bnilsen
| * | Remove widget subtree from backing store tracker when reparentedGareth Stockwell2010-10-263-3/+42
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | When a native widget is reparented such that the value of maybeBackingStore() changes, it and all of its native descendents must be removed from the old QWidgetBackingStoreTracker. If this is not done, the backing store may not be deleted when the top-level widget is hidden, thereby consuming memory unnecessarily. Task-number: MOBILITY-1315 Reviewed-by: Jason Barron Reviewed-by: bnilsen
| * | Suppress call to controlVisibilityChanged for null control pointerGareth Stockwell2010-10-261-1/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | At this point, old_winid may be null. Passing a null pointer to controlVisibilityChanged is actually a no-op, due to the 'QWidgetPrivate::mapper->contains(control)' check, but suppressing the function call altogether clarifies the intent of the code slightly. Reviewed-by: Jason Barron
| * | Fix patch_capabilities.pl script for explicit set of capabilitiesMiikka Heikkinen2010-10-261-0/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | Elftran command never got executed when explicit set of capabilities was defined. No warning or error was printed either, making it rather confusing for user. Task-number: QTBUG-14730 Reviewed-by: Janne Koskinen
| * | Fix empty mifconv TARGETFILE in some edge cases.Miikka Heikkinen2010-10-262-2/+7
| |/ | | | | | | | | | | | | | | | | | | Only add ICON for Qt gui application projects that do not explicitly want to suppress it in symbianpkgrules.pri. This logic should match the logic used for setting RSS_RULES.icon_file and thus avoid empty TARGETFILE in bld.inf mifconv extension. Task-number: QT-4193 Reviewed-by: Janne Koskinen
* | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into ↵Qt Continuous Integration System2010-10-268-8/+8
|\ \ | |/ |/| | | | | | | | | 4.7-integration * '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-2: Doc : Fixing typo.
| * Doc : Fixing typo.Sergio Ahumada2010-10-268-8/+8
| |
* | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-s60-public into ↵Qt Continuous Integration System2010-10-261-1/+20
|\ \ | |/ |/| | | | | | | | | 4.7-integration * '4.7' of scm.dev.nokia.troll.no:qt/qt-s60-public: Remove qdrawhelper_arm_simd.cpp dependency to u32std.h
| * Remove qdrawhelper_arm_simd.cpp dependency to u32std.hJani Hautakangas2010-10-261-1/+20
| | | | | | | | Reviewed-by: Shane Kearns
* | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7-integrationQt Continuous Integration System2010-10-268-33/+33
|\ \ | |/ |/| | | | | * '4.7' of scm.dev.nokia.troll.no:qt/qt-qml: Run util/normalize on src/declarative.
| * Run util/normalize on src/declarative.Yann Bodson2010-10-268-33/+33
| |
* | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-s60-public into ↵Qt Continuous Integration System2010-10-264-49/+46
|\ \ | | | | | | | | | | | | | | | | | | | | | 4.7-integration * '4.7' of scm.dev.nokia.troll.no:qt/qt-s60-public: Phonon MMF backend: removed redundant trace output qmediaplayer: added command-line switch for initial volume
| * | Phonon MMF backend: removed redundant trace outputGareth Stockwell2010-10-251-14/+0
| | |
| * | qmediaplayer: added command-line switch for initial volumeGareth Stockwell2010-10-253-35/+46
| | | | | | | | | | | | | | | | | | Initial volume can be set using the following switch: -volume <level> where 0.0 <= level <= 1.0
* | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into ↵Qt Continuous Integration System2010-10-2514-114/+405
|\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 4.7-integration * '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-2: Simplify calculation of center point and scale for PinchRecongizer Doc: Fixing typo QtDFB: Make transparent windows behave better For meego graphics system, use floyd-steinberg dithering when converting to 16bit. Added support for blitting to native child widgets in GL window surface.
| * | | Simplify calculation of center point and scale for PinchRecongizerFrederik Gladhorn2010-10-251-11/+8
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Constructing a QLineF to get at the centerPoint is not precise and can be done simpler. The scale factor can be assigned directly to d->scaleFactor instead of creating a temporary scaleFactor variable. Reviewed-by: Zeno Albisser
| * | | Doc: Fixing typoSergio Ahumada2010-10-255-10/+10
| | | |
| * | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into ↵Qt Continuous Integration System2010-10-2411-101/+395
| |\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 4.7-integration * '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-2: QtDFB: Make transparent windows behave better For meego graphics system, use floyd-steinberg dithering when converting to 16bit. Added support for blitting to native child widgets in GL window surface.
| | * \ \ Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into ↵Qt Continuous Integration System2010-10-2311-101/+395
| | |\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 4.7-integration * '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-2: QtDFB: Make transparent windows behave better For meego graphics system, use floyd-steinberg dithering when converting to 16bit. Added support for blitting to native child widgets in GL window surface.
| | | * \ \ Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into ↵Qt Continuous Integration System2010-10-2211-101/+395
| | | |\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 4.7-integration * '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-2: QtDFB: Make transparent windows behave better For meego graphics system, use floyd-steinberg dithering when converting to 16bit. Added support for blitting to native child widgets in GL window surface.
| | | | * | | QtDFB: Make transparent windows behave betterAnders Bakken2010-10-223-17/+29
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Windows with Qt::WA_NoSystemBackground should clear to transparent in beginPaint. Merge-request: 882 Reviewed-by: Donald Carr <donald.carr@nokia.com>
| | | | * | | For meego graphics system, use floyd-steinberg dithering when converting to ↵Michael Dominic K2010-10-223-24/+278
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 16bit. Merge-request: 2496 Reviewed-by: Samuel Rødal <samuel.rodal@nokia.com>
| | | | * | | Added support for blitting to native child widgets in GL window surface.Samuel Rødal2010-10-225-60/+88
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Support blitting by copying from the top-level window's back buffer to a temporary texture and then blitting from the texture to the native child widget. Performance suffers, but it's better than failing. Reviewed-by: Gunnar Sletta
* | | | | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into ↵Qt Continuous Integration System2010-10-251-0/+38
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 4.7-integration * '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1: add autotest for QString::setRawData()
| * | | | | | | add autotest for QString::setRawData()Oswald Buddenhagen2010-10-251-0/+38
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | ... and improve the one for fromRawData() marginally Reviewed-by: olivier
* | | | | | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/doc-staging into 4.7-integrationQt Continuous Integration System2010-10-2597-551/+4338
|\ \ \ \ \ \ \ \ | |_|_|_|_|_|_|/ |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * '4.7' of scm.dev.nokia.troll.no:qt/doc-staging: Fixed case of a library file name to enable MinGW builds on Fedora. Doc: Made Qt::TextLongestVariant internal again. Doc: Fixed minor documentation issues. Doc: Reorganized the platform and compiler notes pages. Doc: Removed non-ASCII characters and reformatted the text. Doc: Fixed documentation style and qdoc warnings. Doc: Fixed qdoc warnings. Doc: Fixed qdoc warnings. Doc: Fixed snippet reference for the Getting Started QML guide. Doc: Fixed warnings caused by an earlier change. Made docs consistent. Doc: Fixed warnings caused by an earlier change. Made docs consistent. Doc: Renamed an external reference to work around an auto-linking issue. Doc: Fixed qdoc warnings. Doc: Fixed links to the online BSD license information. Doc: Fixed qdoc warnings. Doc: Re-added a link to the Qt site related to testing tools. Doc: Marked some new properties as internal for now. Doc: Renamed a project file. Doc: Added missing examples and snippets.
| * | | | | | | Merge branch '4.7-upstream' into 4.7-docA-Team2010-10-241-3/+11
| |\ \ \ \ \ \ \ | | | |/ / / / / | | |/| | | | |
generated by cgit v0.12 at 2024-11-06 16:15:16 (GMT)