| Commit message (Collapse) | Author | Age | Files | Lines |
|---|
| |
|
|
|
|
|
|
|
| |
Simple search and replace. This commit doesn't touch 3rd-party files,
nor translations (where the change is not so simple and will be handled
in a separate commit).
Change-Id: I4e48513b8078a44a8cd272326685b25338890148
Reviewed-by: Rohan McGovern <rohan.mcgovern@nokia.com>
|
| |
|
|
|
|
|
|
|
|
|
| |
Marking a test with CONFIG+=insignificant_test will cause the exit code
of the test to be discarded during `make check'. This is intended to be
used for tests which are valuable to run, but are known to be unstable
and are not feasible to immediately fix.
Task-number: QTQAINFRA-428
Change-Id: Idd45b04200182e3673195858ec08d31357dcdfaf
Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
|
| |\
| |
| |
| |
| |
| |
| | |
master-integration
* 'master' of scm.dev.nokia.troll.no:qt/qt-tools-staging:
qmake: fix default value for C++ optimization in vcxproj files
|
| | |
| |
| |
| |
| |
| |
| |
| |
| | |
For the debug configuration the optimization should be turned off.
Reviewed-by: ossi
Task-number: QTBUG-23421
Change-Id: Ib63e0c51f9ab31180ff8ee01a1f6c57ab77e390e
|
| |\ \
| | |
| | |
| | |
| | |
| | |
| | | |
master-integration
* 'master' of scm.dev.nokia.troll.no:qt/qt-air-staging:
Updated WebKit to 7b7ded42f42a558bc5672c2523f9c5689bb975d0
|
| | | | |
|
| |\ \ \
| | |/
| |/|
| | |
| | |
| | |
| | | |
master-integration
* 'master' of scm.dev.nokia.troll.no:qt/qt-tools-staging:
qmake: fix /MP option for VS 2010
|
| |/ /
| |
| |
| |
| |
| |
| |
| |
| | |
Setting QMAKE_CFLAGS+=/MP in a project file did not work for VS 2010.
Task-number: QTBUG-23490
Reviewed-by: ossi
Change-Id: I39c349bf8dc2a4add2f32a430a245a20cc54147e
|
| |\ \
| |/
| |
| |
| |
| |
| | |
master-integration
* 'master' of scm.dev.nokia.troll.no:qt/qt-air-staging:
Fix crash when creating a QScriptEngine in a native thread
|
| | |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| | |
The change in http://trac.webkit.org/changeset/48412/ introduced a fix
to avoid leaking thread specific data by ensuring get() on ThreadSpecific
works even during the thread destruction phase. The fix worked by setting the
local data again.
However as we can see in the backtrace from QTBUG-22926, the local data should
not be set unconditionally, otherwise our destroy function will be called
recursively when the local data is still set.
Task-number: QTBUG-22926
Reviewed-by: Kent Hansen
Tested-and-Reviewed-by: Andy Shaw
|
| |\ \
| |/
|/|
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| | |
master-integration
* 'master' of scm.dev.nokia.troll.no:qt/qt-symbian-staging:
Fix http authentication to a different realm on the same server
Fix race in http connection channel
Don't fetch credentials from cache following a failed proxy authentication
Handle plain socket write errors in SSL
Fix for assertion failure
Fix faulty logic in http connection pipelining
Test case for QTBUG-22875
QThreads on Symbian are named to allow them to be opened externally
|
| | |\
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | | |
* 'master' of git://scm.dev.nokia.troll.no/qt/qt-symbian-team:
Fix http authentication to a different realm on the same server
Fix race in http connection channel
Don't fetch credentials from cache following a failed proxy authentication
Handle plain socket write errors in SSL
Fix for assertion failure
Fix faulty logic in http connection pipelining
Test case for QTBUG-22875
|
| | | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | | |
This is a regression caused by the NTLMv2 authentication patch.
I have manually tested NTLMv2 authentication against MS IIS and reverting
these two lines does not break it.
Task-number: QT-5209
Change-Id: I64159cbe468e1a7f834f8726fd0c9d4ab4c54b38
Reviewed-by: Peter Hartmann <peter.hartmann@nokia.com>
(cherry-picked from 4954f71648aa7f74a4cb8b1dd26470b5da44459e)
|
| | | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | | |
When authentication is cancelled, close the channel instead of the
underlying socket.
The previous behaviour could result in further requests being sent
on the closed socket, which caused errors in case of https over a proxy.
Change-Id: I3dbfc164de4fb29a426c06acaac8f29b9da1d705
Reviewed-by: Peter Hartmann <peter.hartmann@nokia.com>
(cherry picked from commit a7b99151f4445755c91d5227607d9ea2f785301f)
|
| | | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | | |
Add variable to QAuthenticatorPrivate for tracking failure
Track authentication success/failure in http proxy socket engine
Track authentication success/failure in http connection channel
Task-number: QTBUG-22875
Change-Id: Id5d39e839428271ad687e9da12fbbdea9c478f4f
Reviewed-by: Peter Hartmann <peter.hartmann@nokia.com>
(cherry-picked from d24aad82896addce88f1ffb4040560e406acf083)
|
| | | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | | |
When an ssl socket is closed during connecting, and it is using a proxy
then it is possible for the plain socket to be in pending close state
when transmit() is called.
As errors were not handled, this caused the socket (and https request)
to "hang".
It now propagates the error from plain socket.
Change-Id: I6fb86815a2a63e197cea582f4b153e487543477c
Reviewed-by: Peter Hartmann <peter.hartmann@nokia.com>
Reviewed-by: Richard J. Moore <rich@kde.org>
Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
(cherry picked from commit 2cc78885b0b7d08f965998d156945a077e56c1d8)
|
| | | |
| | |
| | |
| | |
| | |
| | | |
Change-Id: I97b9ecc37e938a3050793fc746288243a1cb40b7
Reviewed-by: Peter Hartmann <peter.hartmann@nokia.com>
(cherry picked from commit 96cda705dcbeb79429055c1acca91f149d318820)
|
| | | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | | |
The code which prevents pipelining of requests when authentication is
in use had || where && should have been used.
Also check for blank user with a password.
Change-Id: Ic278cedd370c9d81377f49a0af43aef415cb49ad
Reviewed-by: Peter Hartmann <peter.hartmann@nokia.com>
(cherry picked from commit 058fb94afff8a1a9989ab6d18dacc1fe43769fdb)
|
| | | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | | |
Test the authentication cache works properly with "cancelled dialogs"
or if the user enters username/password incorrectly.
Expected behaviour is based on web browsers:
If cancelled, current request fails, and prompt again the next time.
If wrong password is given, prompt again and retry the current request.
If bad credentials are in the cache, prompt again
Task-number: QTBUG-22875
Change-Id: Ic02ccac8dbeb3f2580ca4ffe47d0773982c4ab25
Reviewed-by: Peter Hartmann <peter.hartmann@nokia.com>
(cherry picked from 4be2430)
|
| | |\ \
| | |/
| | |
| | |
| | | |
* 'master' of git://scm.dev.nokia.troll.no/qt/qt-symbian-team:
QThreads on Symbian are named to allow them to be opened externally
|
| | | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | | |
The Qt 4.7 implementation of QThread on Symbian used libpthread. This
automatically generated a random name for a thread. The Qt 4.8
implmentation was leaving threads unnamed. This is a change in
behaviour, in that unnamed/anonymous threads cannot be opened outside
of the owning process. This was causing a bug in some client/server
situations.
The fix is to generate a name for the RThread underlying the QThread
as follows:
QThread object name + QThread object address + random number
Task-number: ou1cimx1#959586
Reviewed-by: Shane Kearns
|
| |\ \ \
| | | |
| | | |
| | | |
| | | |
| | | | |
master-integration
* 'master' of scm.dev.nokia.troll.no:qt/qt-fire-staging:
|
| | |\ \ \
| |/ / /
|/| | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | | |
* 'master' of git://scm.dev.nokia.troll.no/qt/qt-fire-team: (21 commits)
Revert "Fix NB#290352 Qtwebprocess crashes @ QHttpNetworkReply::readAny"
Also correctly apply stack size difference in MSVC2008
Doc: Add `-xunitxml' option to qtestlib documentation
Add a default alt attribute to img tags.
tests: eliminated usage of qttest_p4.prf [part 3]
tests: eliminated usage of qttest_p4.prf [part 2]
tests: allow unstable tests to be marked with CONFIG+=insignificant_test
tests: eliminated usage of qttest_p4.prf
Revert variable overwritten by copying from Qt5
New style sheet for offline (QCH) documentation
New style sheet for offline (QCH) documentation
Symbian: Fix exporting and importing of some functions for autotests
Symbian: Fix SRCDIR usage in qlayout autotest.
Symbian: Fix qcssparser autotest
selftests: eliminated usage of qttest_p4.prf
Symbian: Fix qscriptextensionplugin autotest
Fix crash in positionInLigature
Fix NB#290352 Qtwebprocess crashes @ QHttpNetworkReply::readAny
Adapt autotests to commit e2773a9
Declarative: Use qDebug() for debugger status updates
...
|
| |\ \ \ \
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | | |
master-integration
* 'master' of scm.dev.nokia.troll.no:qt/qt-qa-staging:
tests: eliminated usage of qttest_p4.prf [part 3]
tests: eliminated usage of qttest_p4.prf [part 2]
|
| | |\ \ \ \
|/ / / / / |
|
| | | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | | |
qttest_p4.prf was added as a convenience for Qt's own autotests in Qt4.
It enables various crufty undocumented magic, of dubious value.
Stop using it, and explicitly enable the things from it which we want.
Change-Id: I65ba34a59db7aa15bc6304e690c825a4d6cd1037
Reviewed-by: Sergio Ahumada <sergio.ahumada@nokia.com>
|
| | | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | | |
qttest_p4.prf was added as a convenience for Qt's own autotests in Qt4.
It enables various crufty undocumented magic, of dubious value.
Stop using it, and explicitly enable the things from it which we want.
Change-Id: I8a0bed9161ea9ac010ef3269f2e9baed7bbc2f41
Reviewed-by: Rohan McGovern
Reviewed-by: Sergio Ahumada <sergio.ahumada@nokia.com>
|
| |\ \ \ \ \
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | | |
master-integration
* 'master' of scm.dev.nokia.troll.no:qt/qt-qml-staging:
Adapt autotests to commit e2773a9
Declarative: Use qDebug() for debugger status updates
Declarative: Unify output of warning messages in debug server
|
| | |\ \ \ \ \ |
|
| | | |\ \ \ \ \
| | | | | | | |
| | | | | | | |
| | | | | | | |
| | | | | | | |
| | | | | | | |
| | | | | | | |
| | | | | | | |
| | | | | | | |
| | | | | | | |
| | | | | | | |
| | | | | | | |
| | | | | | | |
| | | | | | | |
| | | | | | | |
| | | | | | | |
| | | | | | | |
| | | | | | | |
| | | | | | | |
| | | | | | | |
| | | | | | | |
| | | | | | | |
| | | | | | | |
| | | | | | | |
| | | | | | | | |
* 'master' of git://scm.dev.nokia.troll.no/qt/qt-qml-team: (536 commits)
Adapt autotests to commit e2773a9
Declarative: Use qDebug() for debugger status updates
Declarative: Unify output of warning messages in debug server
Added missing license header.
Adjust pathes once again.
Fixed a link
Fixed a link
Split behavior and wigglytext examples
Rename files to show up in docs.
Whitespace changes and added depends.
Fix up examples.
Fixed some linking issues.
Removed unecessary files from folders.
Fixes for the manifest and links.
Changed some of the short descriptions for WebView examples.
Removed unecessary duplicate files.
Symbian-linux crosscompilation case changes
Fix link to WebView examples.
Fix link to ListView and WebView example pages.
Fixed lists to be ordered lists and added curly brackets
...
|
| | | | | | | | |
| | | | | | | |
| | | | | | | |
| | | | | | | |
| | | | | | | | |
Reviewed-by: Aurindam Jana <aurindam.jana@nokia.com>
Change-Id: I30f996099346668f7b8067246c98b9ccc137ba57
|
| | | | | | | | |
| | | | | | | |
| | | | | | | |
| | | | | | | |
| | | | | | | |
| | | | | | | |
| | | | | | | |
| | | | | | | |
| | | | | | | |
| | | | | | | | |
Although "Qml debugging is enabled. Only use this in a safe environment!"
is a warning, using qWarning() for it let every app crash that is run with
QT_FATAL_WARNINGS. Fix that by using qDebug() for the updates that
happen during 'normal' operation.
Reviewed-by: Aurindam Jana <aurindam.jana@nokia.com>
Change-Id: Ie37a35ca27ec6e507f7de140484ca8cf96410be2
|
| | | | | | | | |
| | | | | | | |
| | | | | | | |
| | | | | | | |
| | | | | | | |
| | | | | | | |
| | | | | | | |
| | | | | | | | |
Use the stream operator instead of toAscii().constData(), or qPrintable.
Also use QString::fromLatin1() instead of QString::fromAscii().
Task-number: QTBUG-22860
Change-Id: Iabe37778f0fd50ca450f0504939441c633d6354e
|
| |\ \ \ \ \ \ \ \
| | | | | | | | |
| | | | | | | | |
| | | | | | | | |
| | | | | | | | |
| | | | | | | | |
| | | | | | | | |
| | | | | | | | |
| | | | | | | | |
| | | | | | | | | |
into master-integration
* 'qt-4.8-from-4.7' of scm.dev.nokia.troll.no:qt/qt-integration:
Revert "Fix NB#290352 Qtwebprocess crashes @ QHttpNetworkReply::readAny"
Doc: Add `-xunitxml' option to qtestlib documentation
Fix crash in positionInLigature
Fix NB#290352 Qtwebprocess crashes @ QHttpNetworkReply::readAny
|
| | | | | | | | | |
| | | | | | | | |
| | | | | | | | |
| | | | | | | | |
| | | | | | | | |
| | | | | | | | |
| | | | | | | | |
| | | | | | | | |
| | | | | | | | |
| | | | | | | | |
| | | | | | | | | |
This reverts commit b070ad6a9804b6a7387f848c2e1721c16b8ccc62.
Regarding the comments on b070ad6a9804b6a7387f848c2e1721c16b8ccc62 in
4.7, this should not be merged into 4.8 since the internals have changed.
Conflicts:
src/network/access/qnetworkaccesshttpbackend.cpp
|
| | |\ \ \ \ \ \ \ \ |
|
| | | |\ \ \ \ \ \ \ \
| | | | | | | | | | |
| | | | | | | | | | |
| | | | | | | | | | |
| | | | | | | | | | |
| | | | | | | | | | |
| | | | | | | | | | | |
4.7-integration
* '4.7' of scm.dev.nokia.troll.no:qt/qt-qa-staging:
Doc: Add `-xunitxml' option to qtestlib documentation
|
| | | |/ / / / / / / /
| | | | | | | | | |
| | | | | | | | | |
| | | | | | | | | |
| | | | | | | | | | |
Task-number: QTBUG-14305
Reviewed-by: Casper van Donderen
|
| | |\ \ \ \ \ \ \ \ \
| | |/ / / / / / / /
| | | | | | | | | |
| | | | | | | | | |
| | | | | | | | | | |
Conflicts:
src/network/access/qnetworkaccesshttpbackend.cpp
|
| | | |\ \ \ \ \ \ \ \
| | | | | | | | | | |
| | | | | | | | | | |
| | | | | | | | | | |
| | | | | | | | | | |
| | | | | | | | | | |
| | | | | | | | | | | |
4.7-integration
* '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-2:
Fix crash in positionInLigature
|
| | | | | | | | | | | |
| | | | | | | | | | |
| | | | | | | | | | |
| | | | | | | | | | |
| | | | | | | | | | |
| | | | | | | | | | |
| | | | | | | | | | | |
Check boundary of pos before accessing attributes.
Task-number: QTBUG-23104
Reviewed-by: Eskil
|
| | | |\ \ \ \ \ \ \ \ \
| | | | | | | | | | | |
| | | | | | | | | | | |
| | | | | | | | | | | |
| | | | | | | | | | | |
| | | | | | | | | | | |
| | | | | | | | | | | | |
4.7-integration
* '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1:
Fix NB#290352 Qtwebprocess crashes @ QHttpNetworkReply::readAny
|
| | | | | | | | | | | | |
| | | | | | | | | | | |
| | | | | | | | | | | |
| | | | | | | | | | | |
| | | | | | | | | | | |
| | | | | | | | | | | |
| | | | | | | | | | | |
| | | | | | | | | | | |
| | | | | | | | | | | |
| | | | | | | | | | | |
| | | | | | | | | | | |
| | | | | | | | | | | |
| | | | | | | | | | | |
| | | | | | | | | | | |
| | | | | | | | | | | | |
Several crash backtraces point to crash in QHttpNetworkReply::readAny,
where d->connection==0. This patch adds a check for d->connection to
QNetworkAccessHttpBackend. If the connection is found to be destroyed,
the request is finished.
Does not need to be merged to 4.8 because the internals have changed
(Peter Hartmann)
PMO 290352
Merge-request: 1491
Reviewed-by: Peter Hartmann <peter.hartmann@nokia.com>
|
| |\ \ \ \ \ \ \ \ \ \ \ \
| |_|_|_|_|_|_|_|/ / / /
|/| | | | | | | | | | |
| | | | | | | | | | | |
| | | | | | | | | | | |
| | | | | | | | | | | |
| | | | | | | | | | | |
| | | | | | | | | | | | |
master-integration
* 'master' of scm.dev.nokia.troll.no:qt/qt-doc-staging:
Also correctly apply stack size difference in MSVC2008
Add a default alt attribute to img tags.
|
| | | | | | | | | | | | |
| | | | | | | | | | | |
| | | | | | | | | | | |
| | | | | | | | | | | |
| | | | | | | | | | | | |
The quotes around the stack size are not parsed correctly in MSVC2008,
MSVC2010 accepts both the version with and without quotes.
|
| | | | | | | | | | | | |
| | | | | | | | | | | |
| | | | | | | | | | | |
| | | | | | | | | | | |
| | | | | | | | | | | |
| | | | | | | | | | | |
| | | | | | | | | | | | |
The output HTML did not pass validation without a default alt
attribute.
Reviewed-by: Kevin Wright
|
| |\ \ \ \ \ \ \ \ \ \ \ \
| | | | | | | | | | | | |
| | | | | | | | | | | | |
| | | | | | | | | | | | |
| | | | | | | | | | | | |
| | | | | | | | | | | | |
| | | | | | | | | | | | | |
master-integration
* 'master' of scm.dev.nokia.troll.no:qt/qt-qa-staging:
tests: allow unstable tests to be marked with CONFIG+=insignificant_test
|
| | |\ \ \ \ \ \ \ \ \ \ \ \
| | | | | | | | | | | | | |
| | | | | | | | | | | | | |
| | | | | | | | | | | | | |
| | | | | | | | | | | | | | |
* 'master' of git://scm.dev.nokia.troll.no/qt/qt-qa-team:
tests: allow unstable tests to be marked with CONFIG+=insignificant_test
|
| | |/ / / / / / / / / / / /
|/| | | | | | | | | | | |
| | | | | | | | | | | | |
| | | | | | | | | | | | |
| | | | | | | | | | | | |
| | | | | | | | | | | | |
| | | | | | | | | | | | |
| | | | | | | | | | | | |
| | | | | | | | | | | | |
| | | | | | | | | | | | | |
Marking a test with CONFIG+=insignificant_test will cause the exit code
of the test to be discarded during `make check'. This is intended to be
used for tests which are valuable to run, but are known to be unstable
and are not feasible to immediately fix.
Change-Id: Id7b2407d0a13c8de19a58badb78fa7c018c9b50a
Reviewed-by: Jo Asplin
|
| |\ \ \ \ \ \ \ \ \ \ \ \ \
| |/ / / / / / / / / / / /
| | | | | | | | | | | | |
| | | | | | | | | | | | |
| | | | | | | | | | | | |
| | | | | | | | | | | | |
| | | | | | | | | | | | | |
master-integration
* 'master' of scm.dev.nokia.troll.no:qt/qt-qa-staging:
tests: eliminated usage of qttest_p4.prf
|
