| Commit message (Collapse) | Author | Age | Files | Lines |
|
|
|
|
|
| |
Reviewed-by: Markus Goetz
Task-number: QTBUG-15070
(cherry picked from commit c6a6448272168f0105c973bef5e531114533fc90)
|
|
|
|
|
| |
Reviewed-by: Trust Me
(cherry picked from commit ac5c099cc3c5b8c7eec7a49fdeb8a21037230350)
|
|
|
|
| |
Reviewed-by: Peter Hartmann
|
|
|
|
|
| |
We don't think this is the right fix.
This reverts commit 5d18d393808d7a4be56eb00ab9f1e9cda9e211c9.
|
|
|
|
|
|
|
|
|
| |
These fixes add a new QTest columns to cases tst_QNetworkReply::
ioGetFromHttpStatus100_data and tst_QNetworkReply::ioGetFromHttpNoHeaders.
Each test row now has an expected error message per input data string.
Task-Number: QT-3494
Reviewed-By: Perttu Pohjonen
|
| |
|
|
|
|
|
|
| |
... by waiting for the thread to finish.
Reviewed-by: Markus Goetz
|
|
|
|
|
|
|
|
|
|
|
|
|
| |
To enable synchronous calls, an attribute in the QNetworkRequest has
to be set. If set, when QNetworkAccessManager::get() (and post(),
put()) returns, the reply is finished and all data has been read in
case of success.
This feature is semi-public for now (usable, but not documented).
To enable this, an attribute in the QNetworkRequest must be set. If
this attribute is set, we open a new connection to the server with
only one channel and call the channels' sockets' waitFor* methods.
Reviewed-by: Markus Goetz
|
|
|
|
|
|
|
|
|
| |
Properly use the event loop.
Signals have to be connected directly after using the get()
method of QNetworkAccessManager. Else they might have already
been emitted while the event loop was spinning.
Reviewed-by: Peter Hartmann
|
|
|
|
|
| |
Task-number: QTBUG-15311
Reviewed-by: ogoffart
|
| |
|
|
|
|
| |
Task-number: QTBUG-13431
|
|
|
|
|
|
| |
Task-number: QTBUG-13431
Task-number: QTBUG-6276
Reviewed-by: ogoffart
|
|
|
|
|
| |
Task-number: QTBUG-4121
Reviewed-by: ogoffart
|
|
|
|
|
|
|
|
|
|
| |
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>
|
|
|
|
|
|
| |
This test fails right now and we should fix the underlying issue :-)
Task-number: QT-4155
|
|\
| |
| |
| |
| |
| |
| | |
Conflicts:
bin/syncqt
src/opengl/qgl.cpp
tools/configure/configureapp.cpp
|
| |
| |
| |
| | |
Task-number: QTBUG-12908
|
|\ \
| |/
| |
| |
| |
| |
| |
| |
| |
| | |
Conflicts:
src/3rdparty/webkit/VERSION
src/3rdparty/webkit/WebKit/qt/ChangeLog
src/gui/itemviews/qlistview.cpp
tests/auto/qlistview/tst_qlistview.cpp
tests/auto/qnetworkreply/test/test.pro
tests/auto/qsocks5socketengine/qsocks5socketengine.pro
|
| | |
|
| |
| |
| |
| | |
this makes windows-style path specs *ugly*. that's intentional. :-P
|
|\ \
| |/
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| | |
Conflicts:
demos/demos.pro
mkspecs/features/resources.prf
mkspecs/features/uic.prf
src/corelib/io/qurl.cpp
src/corelib/tools/qlocale_symbian.cpp
src/gui/graphicsview/qgraphicsscene.cpp
src/gui/graphicsview/qgraphicswidget_p.cpp
src/gui/graphicsview/qgraphicswidget_p.h
src/gui/util/qsystemtrayicon_win.cpp
src/multimedia/audio/qaudioinput.cpp
tests/auto/qhostinfo/qhostinfo.pro
|
| | |
|
| | |
|
|\ \
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | | |
4.7-integration
* '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1: (158 commits)
qdoc: Yet another revision of the top doc page.
Doc: Update on web template
Added QDateTime::msecsTo()
Doc: Fixed tables and images for the new docs
qdoc: Yet another revision of the top doc page.
Revert "Improve QUrl handling of local file paths"
Revert "[QNAM FTP] Check for the "ftp" scheme case-insensitively"
Revert "QUrl::fromLocalFile: fix silly mistake: it's fromNativeSeparators, not to"
Revert "Use QUrl::isLocalFile and fix the scheme checking in local URLs."
qdoc: Another revision of the top doc page.
Doc correction to css
Doc: Updates to the html template and javascript
tst_SuiteTest: Fix a meaningless switch statement
My 4.7.0 changelog entries.
qdoc: Fixed annotated list generation to use <td>, not <th>.
Doc: Tuning search script
qdoc: Reorganized examples panel.
Doc: Chages to search feature, css and table order
QtDeclarative: avoid waiting for a network load on URIs with empty schemes.
QtDeclarative: RFC 3986 requires schemes to be considered case-insensitively
...
|
| | |
| | |
| | |
| | | |
This reverts commit ebddf7a8739d7f4aaa7d9cb8a41a14eebb65e4f4.
|
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | | |
RFC 3986 requires that schemes be compared case-insensitively, so
"QRC:/" is allowed for Qt resources.
Also document the use of file engines and search paths.
Reviewed-by: Markus Goetz
|
| | |
| | |
| | |
| | | |
Reviewed-By: Markus Goetz
|
| | | |
|
|/ /
| |
| |
| |
| |
| |
| |
| |
| |
| |
| | |
The autotests were previously run with ALL-Tcb capability which gives
them more access to the filesystem etc. than a typical Qt application.
To have more realistic testing environmnent, tests are run with no
capabilities other than those required for the Qt APIs they use.
i.e. NetworkServices for network tests, None for others.
Reviewed-by: Liang Qi
|
|\ \
| |/
| |
| |
| | |
Conflicts:
src/script/api/qscriptengine.cpp
|
| | |
|
|\ \
| |/
| |
| |
| |
| |
| | |
Conflicts:
qmake/generators/symbian/symmake.cpp
src/gui/image/qimage.cpp
src/openvg/qwindowsurface_vgegl.cpp
|
| | |
|
|\ \
| |/ |
|
| |
| |
| |
| | |
Reviewed-by: Trust Me
|
|\ \
| |/
| |
| |
| |
| |
| | |
Conflicts:
mkspecs/common/symbian/symbian.conf
qmake/generators/symbian/symmake.cpp
src/3rdparty/webkit/WebCore/WebCore.pro
|
| |
| |
| |
| |
| |
| |
| |
| |
| | |
Fix a test that had a side effect.
But actually do the side effect in the last test: Have a
QNetworkReply that is parented to the application so it gets
destructed after the QNetworkAccessManager.
Reviewed-by: gabi
|
|\ \
| |/
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| | |
Conflicts:
configure.exe
mkspecs/common/symbian/symbian.conf
src/gui/graphicsview/qgraphicswidget.h
src/gui/kernel/qapplication.cpp
src/gui/text/qtextlayout.cpp
src/openvg/qpixmapdata_vg.cpp
src/s60installs/s60installs.pro
tools/runonphone/main.cpp
tools/runonphone/serenum_unix.cpp
qtextlayout.cpp fixed up together with Eskil.
Kept the configure.exe from 4.7 without recompile.
|
| |
| |
| |
| | |
Reviewed-by: Thiago
|
| |
| |
| |
| | |
Task-number: QTBUG-8590
|
| |
| |
| |
| | |
Reviewed-by: Peter Hartmann
|
|\ \
| |/
| |
| |
| |
| | |
Conflicts:
qmake/Makefile.unix
qmake/generators/symbian/symmake.cpp
|
| |
| |
| |
| | |
Reviewed-by: Peter Hartmann
|
|\ \
| |/
| |
| |
| | |
Conflicts:
tools/assistant/lib/qhelpsearchindexreader_clucene_p.h
|
| |
| |
| |
| | |
Reviewed-by: Peter Hartmann
|
|\ \
| |/
|/|
| |
| |
| | |
Conflicts:
src/corelib/codecs/qtextcodec.h
tests/auto/gestures/tst_gestures.cpp
|
| |
| |
| |
| |
| |
| |
| |
| |
| |
| | |
This method was added to support e.g. HTTP OPTIONS (needed by Webkit);
rather than adding one method for each of those exotic verbs, there is
now a generic version for all.
Reviewed-by: Markus Goetz
Reviewed-by: Andreas Kling
Task-number: QTBUG-8206
|
|/
|
|
| |
Reviewed-by: Peter Hartmann
|
|
|
|
|
|
| |
Was a cut n paste error probably.
Reviewed-by: TrustMe
|