summaryrefslogtreecommitdiffstats
path: root/src
Commit message (Collapse)AuthorAgeFilesLines
...
| | | * | | | | | QNAM HTTP: Remove enableEncryption()Markus Goetz2010-10-272-8/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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-275-11/+7
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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-275-8/+10
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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-274-7/+10
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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-297-263/+237
| | |\ \ \ \ \ \ | | | |_|/ / / / | | |/| | / / / | | | | |/ / / | | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * '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
| | | * | | | Regression: QML fonts look bad on Mac with font smoothing onYann Bodson2010-10-291-0/+8
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Task-number: QTBUG-14840
| | | * | | | Update when text changes to ""Alan Alpert2010-10-291-1/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Also fixes a doc typo. Includes test. Task-number: QTBUG-14469
| | | * | | | Remove unnecessary layouting code from QDeclarativeTextYann Bodson2010-10-281-43/+8
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Task-number: QTBUG-14795 Reviewed-by: Michael Brasser
| | | * | | | Export private QtDeclarative classes needed by Qt3d on SymbianJoona Petrell2010-10-285-218/+218
| | | |/ / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Task-number: QTBUG-14789 Reviewed-by: Rhys Weatherley * QDeclarativeState * QDeclarativeStateGroup * QDeclarativeStateOperation * QDeclarativeTransition
| | * | | | Do not support QImage::Format_ARGB32 in meego gfx for egl images.Michael Dominic K2010-10-281-2/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | It was a bug/mistake to support that. Merge-request: 2499 Reviewed-by: Samuel Rødal <samuel.rodal@nokia.com>
| | * | | | Use QVarLengthArray to store accumulator data.Michael Dominic K2010-10-281-2/+12
| | |/ / / | | | | | | | | | | | | | | | | | | | | Merge-request: 2499 Reviewed-by: Samuel Rødal <samuel.rodal@nokia.com>
| * | | | Merge branch 'staging-master' of scm.dev.nokia.troll.no:qt/qt-lighthouse ↵Qt Continuous Integration System2010-10-29275-184/+30977
| |\ \ \ \ | | |_|_|/ | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | into master-integration * 'staging-master' of scm.dev.nokia.troll.no:qt/qt-lighthouse: (388 commits) Fix the license in files for Lighthouse Fix typos found by the spellchecking autotest Add missing QT_MODULE macros. Fix qt_defaultDpi, but not use Q_DECL_IMPORT but Q_GUI_EXPORT Compile fix for RVCT 4 Fix QT_BLITTER_RASTEROVERLAY and namespace error Lighthouse: initial COCOA plugin Lighthouse on OS X. Fix QWS generic mac mkspec actually set egl swap interval Remove debug code added by 650a0078e2cef43eff107fe8d2505f64a0bfedf0 Update sections if model content changes. Don't clobber the tty by default Add touch offset Jitter removal Mouse event compression Add keycodes for some additional multimedia keys Make it possible to choose some EGLFS configuration options via envvars use swapInterval=1 by default in EglFS to potentially avoid tearing Lighthouse: make QFontconfigDatabase not override application font ...
| | * | | Fix the license in files for LighthouseJørgen Lind2010-10-2864-388/+1791
| | | | |
| | * | | Fix typos found by the spellchecking autotestPaul Olav Tvete2010-10-283-4/+4
| | | | |
| | * | | Add missing QT_MODULE macros.Paul Olav Tvete2010-10-282-0/+4
| | | | |
| | * | | Fix qt_defaultDpi, but not use Q_DECL_IMPORT but Q_GUI_EXPORTJørgen Lind2010-10-281-2/+2
| | | | |
| | * | | Compile fix for RVCT 4Jørgen Lind2010-10-281-2/+2
| | | | |
| | * | | Fix QT_BLITTER_RASTEROVERLAY and namespace errorJørgen Lind2010-10-271-1/+2
| | | | | | | | | | | | | | | | | | | | Reviewed-by: paul
| | * | | Merge remote branch 'qt/master' into lighthouse-masterPaul Olav Tvete2010-10-278-32/+47
| | |\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: src/corelib/global/qglobal.h
| | * \ \ \ Merge remote branch 'qt/master' into lighthouse-masterPaul Olav Tvete2010-10-26260-5105/+5673
| | |\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: src/opengl/qwindowsurface_gl.cpp
| | * \ \ \ \ Merge remote branch 'qt/master' into lighthouse-masterPaul Olav Tvete2010-10-22204-1768/+4275
| | |\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: src/gui/kernel/qapplication_win.cpp src/gui/kernel/qwidget.cpp src/gui/text/qfontengine_ft.cpp
| | * \ \ \ \ \ Merge remote branch 'lighthouse/4.7' into lighthouse-masterPaul Olav Tvete2010-10-2231-19/+1493
| | |\ \ \ \ \ \
| | | * | | | | | Lighthouse: initial COCOA pluginJørgen Lind2010-10-2016-0/+1425
| | | | | | | | |
| | | * | | | | | Lighthouse on OS X.Morten Johan Sørvig2010-10-2015-19/+68
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Reviewed-by: Jørgen
| | * | | | | | | actually set egl swap intervalGunnar Sletta2010-10-151-1/+1
| | | | | | | | |
| | * | | | | | | Update sections if model content changes.Martin Jones2010-10-144-4/+65
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | We didn't handle the section property changing, e.g. due to asynchronous model. Task-number: QT-4093 Reviewed-by: Aaron Kennedy Conflicts: src/declarative/graphicsitems/qdeclarativevisualitemmodel_p.h
| | * | | | | | | Don't clobber the tty by defaultPaul Olav Tvete2010-10-131-28/+34
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Add a ttymode option to LinuxInputKeyboard which turns on setting the keyboard mode and turns off Ctrl-C
| | * | | | | | | Add touch offsetPaul Olav Tvete2010-10-132-2/+7
| | | | | | | | |
| | * | | | | | | Jitter removalPaul Olav Tvete2010-10-132-13/+32
| | | | | | | | |
| | * | | | | | | Mouse event compressionPaul Olav Tvete2010-10-122-11/+31
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Compression turned on by default, can be turned off by adding "nocompress" to the specification. Also turn off experimental touch event support by default.
| | * | | | | | | Add keycodes for some additional multimedia keysPaul Olav Tvete2010-10-111-0/+7
| | | | | | | | |
| | * | | | | | | Make it possible to choose some EGLFS configuration options via envvarsGunnar Sletta2010-10-071-6/+30
| | | | | | | | |
| | * | | | | | | Merge branch 'master' of scm.dev.nokia.troll.no:qt/qt-lighthouseGunnar Sletta2010-10-07241-5866/+9835
| | |\ \ \ \ \ \ \
| | | * \ \ \ \ \ \ Merge branch 'lighthouse-4.7' into lighthouse-masterPaul Olav Tvete2010-10-061-1/+0
| | | |\ \ \ \ \ \ \ | | | | |/ / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: src/gui/painting/qpdf.cpp