| Commit message (Collapse) | Author | Age | Files | Lines |
|---|
| |
|
|
|
|
|
|
|
|
|
|
| |
Loosen requirements for generated error pages (these vary with exact
version and locale of the web server). Don't care what the length is,
but if a content-length header is sent then it should match the size
of the error page data. (apache2 does send content-length for errors)
Don't fail the gzip test if the server doesn't send a content-length
header. That's a server bug rather than Qt. (apache2 doesn't send)
Reviewed-by: Markus Goetz
|
| |
|
|
|
|
|
|
|
|
|
| |
The frox ftp proxy closes connections using TCP RST instead of a normal
TCP FIN. On symbian, this causes the received but unacknowledged
preceding packet to be discarded (the "221 Goodbye" ftp response).
As QNAM and QFTP don't care about this, the network self test won't
either. (only for symbian, as windows and unix TCP/IP stacks retain
the unacknowledged packet in the receive queue)
Reviewed-by: Markus Goetz
|
| |
|
|
|
|
|
| |
Start default bearer when running network self test
Fix typo in qnetworkreply test
Reviewed-by: Markus Goetz
|
| |
|
|
|
|
|
| |
The new test added three reference data files required by the test,
but these were not being included in the sis file.
Reviewed-by: mread
|
| |\
| |
| |
| |
| |
| |
| |
| |
| |
| |
| | |
Conflicts:
src/network/access/qhttpnetworkconnectionchannel.cpp
src/network/socket/qlocalsocket.cpp
src/s60installs/bwins/QtCoreu.def
src/s60installs/bwins/QtGuiu.def
src/s60installs/bwins/QtTestu.def
src/s60installs/eabi/QtCoreu.def
src/s60installs/eabi/QtGuiu.def
|
| | |\
| | |
| | |
| | |
| | | |
Conflicts:
src/corelib/tools/tools.pri
|
| | | |
| | |
| | |
| | | |
Reviewed-by: trustme
|
| | | |
| | |
| | |
| | | |
Reviewed-by: Denis Dzyubenko
|
| | | |
| | |
| | |
| | |
| | | |
Reviewed-by: Denis Dzyubenko
Task-number: QTBUG-17088
|
| | | |\
| | | |
| | | |
| | | |
| | | |
| | | |
| | | | |
master-i18n
Conflicts:
src/corelib/tools/qlocale.h
|
| | | | |
| | | |
| | | |
| | | |
| | | | |
Reviewed-by: Denis Dzyubenko
Task-number: QTBUG-17097
|
| | | | |
| | | |
| | | |
| | | | |
Reviewed-by: trustme
|
| | | |\ \
| | | |/
| | |/|
| | | |
| | | | |
Conflicts:
src/corelib/tools/qlocale.cpp
|
| | | | |
| | | |
| | | |
| | | |
| | | | |
Task-number: QTBUG-17105
Reviewed-by: trustme
|
| | | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | | |
Added a second, optional, argument to QLocale::toCurrencyString() that
represents a currency symbol that is supposed to be added to the formatted
string.
Task-number: QTBUG-17100
Reviewed-by: Zeno Albisser
Reviewed-by: Olivier Goffart
|
| | | |\ \
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | | |
master-i18n
Conflicts:
src/corelib/tools/qlocale.cpp
|
| | | | | |
| | | | |
| | | | |
| | | | |
| | | | | |
Reviewed-by: Denis Dzyubenko
Task-number: QTBUG-17088
|
| | | |/ /
| | | |
| | | |
| | | |
| | | |
| | | | |
There is no reason to re-read environment variables all the time.
Reviewed-by: Zeno Albisser
|
| | | | |
| | | |
| | | |
| | | | |
Reviewed-by: trustme
|
| | | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | | |
The return value is a sorted list of locale names that could be used for
presenting data to the user (i.e. for translations).
Task-number: QTBUG-7329
Reviewed-by: Zeno Albisser
|
| | | | |
| | | |
| | | |
| | | | |
Reviewed-by: Denis Dzyubenko
|
| | | | |
| | | |
| | | |
| | | |
| | | | |
Reviewed-by: Denis Dzyubenko
Task-number: QTBUG-17096
|
| | | | |
| | | |
| | | |
| | | | |
Reviewed-by: Denis Dzyubenko
|
| | | |\ \ |
|
| | | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | | |
Allow BCP47 dash as a language-country separator.
This only changes it one way - parsing 'en-US' will work, but
QLocale::name() will still return name with underscore as separator.
Task-number: QTBUG-15835
Reviewed-by: João Abecasis
|
| | | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | | |
Moc was failing on the string constructed using multiple quoted strings.
The following fails to parse: "foo""bar".
Reviewed-by: trustme
|
| | | | | |
| | | | |
| | | | |
| | | | | |
Reviewed-by: Zeno Albisser
|
| | | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | | |
REMARK: This commit is missing updated static cldr data in
src/corelib/tools/qlocale_data_p.h that has been left out
intentionally to avoid repository bloating.
Before compiling make sure to update that file using the scripts
util/local_database/cldr2qlocalexml.py and
util/local_database/qlocalexml2cpp.py.
Otherwise you will most likely experience segmentation faults.
Task-number: QTBUG-17100
Reviewed-by: Zeno Albisser
|
| | | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | | |
qvariant_cast_QObject_data was creating the QVariant wrong,
The QVariant(int, void*) constructor take a pointer to the value
of the type ObjectStar (hence a pointer to a pointer)
Task-number: QTBUG-18257
|
| | | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | | |
This does not belongs inside Qt, but inside the webkit repository.
Acknowledged-by: Alan Alpert and Andreas Kling
|
| | | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | | |
This commit adds two new classes, QHttpPart and QHttpMultiPart, and
two new overloads to QNetworkAccessManager:
post(const QNetworkRequest &request, QHttpMultiPart *multiPart) and
put(const QNetworkRequest &request, QHttpMultiPart *multiPart).
With those classes, it is possible to do a HTTP POST with a multipart
message in a memory-saving way: The data from the parts is not copied
when read from a file or another QIODevice.
Reviewed-by: Markus Goetz
Task-number: QTBUG-6222
|
| | | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | | |
In the case of a response with e.g content-encoding "gzip" and
content-length "0", the HTTP backend would incorrectly fall back to
the "unspecified length" code path and wait for readyRead() forever.
Task-number: QTBUG-18232
Reviewed-by: Markus Goetz
|
| | | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | | |
otherwise the host name and the name we send in the SNI header (the IP)
would not match.
Reviewed-by: Thiago Macieira
Reviewed-by: Richard J. Moore
Task-number: QTBUG-18258
|
| | |\ \ \ \ |
|
| | | |\ \ \ \ |
|
| | | | |\ \ \ \
| | | | | | | |
| | | | | | | |
| | | | | | | |
| | | | | | | |
| | | | | | | |
| | | | | | | |
| | | | | | | | |
4.7-integration
* '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1:
Fix accidental population of the disk cache with partial content
Fix disk cache interaction for range retrieval HTTP requests.
|
| | | | | | | | |
| | | | | | | |
| | | | | | | |
| | | | | | | |
| | | | | | | |
| | | | | | | |
| | | | | | | |
| | | | | | | |
| | | | | | | | |
Since the disk cache does not support partial content, we should not
try to store it in the cache altogether.
Done-with: Jocelyn Turcotte
Reviewed-by: Markus Goetz
Reviewed-by: Peter Hartmann
|
| | | | | | | | |
| | | | | | | |
| | | | | | | |
| | | | | | | |
| | | | | | | |
| | | | | | | |
| | | | | | | |
| | | | | | | |
| | | | | | | |
| | | | | | | |
| | | | | | | | |
The disk cache API does not currently support retrieving partial content,
it can only serve entire files. Therefore we disable the use of the cache
for these kinds of requests, as indicated by the presence of the Range
header field.
Done-with: Jocelyn Turcotte
Reviewed-by: Markus Goetz
Reviewed-by: Peter Hartmann
|
| | | |\ \ \ \ \ \
| | | |/ / / / /
| | | | | | | |
| | | | | | | |
| | | | | | | | |
Conflicts:
tests/auto/declarative/qdeclarativetext/tst_qdeclarativetext.cpp
|
| | | | |\ \ \ \ \
| | | | | | | | |
| | | | | | | | |
| | | | | | | | |
| | | | | | | | |
| | | | | | | | |
| | | | | | | | | |
* '4.7' of scm.dev.nokia.troll.no:qt/qt-qml:
PathView doesn't update if preferred highlight range changes.
Image.PreserveAspectFit has unexpected effect on Image's sourceSize
Doc improvement for Image.fillMode.
|
| | | | | | | | | |
| | | | | | | | |
| | | | | | | | |
| | | | | | | | |
| | | | | | | | |
| | | | | | | | |
| | | | | | | | |
| | | | | | | | | |
Simply call refill() when they change.
Change-Id: I45ab56cbcaf5c726ce4c4f23f66ee687a6d89dad
Task-number: QTBUG-15356
Reviewed-by: Kevin Wu Won
|
| | | | | | | | | |
| | | | | | | | |
| | | | | | | | |
| | | | | | | | |
| | | | | | | | |
| | | | | | | | |
| | | | | | | | |
| | | | | | | | |
| | | | | | | | |
| | | | | | | | |
| | | | | | | | | |
The sourceSize should always be the size of the image, unless set
otherwise. When calculating the size of an image with
Image.PreserveAspectFit set the natural image size should be used
for the calculation if no size has been set explicitly.
Change-Id: I104b7d1c3c16aa5b4fc98b1f9078ed8ae997cf69
Task-number: QTBUG-16389
Reviewed-by: Joona Petrell
|
| | | | |\ \ \ \ \ \
| | | | |/ / / / /
| | | | | | | | |
| | | | | | | | |
| | | | | | | | |
| | | | | | | | | |
* '4.7' of scm.dev.nokia.troll.no:qt/qt-qml:
QDeclarativeView flickers when composited on MeeGo
Re-enable lineHeight tests.
|
| | | | | | | | | |
| | | | | | | | |
| | | | | | | | |
| | | | | | | | |
| | | | | | | | |
| | | | | | | | | |
These tests were disabled by 24d8e96624af91ab01a20c10625858300f16099b
Change-Id: I5bf3e11dfb3c975415c3039b39a39c22984d2900
|
| | | | |\ \ \ \ \ \
| | | | | | | | | |
| | | | | | | | | |
| | | | | | | | | |
| | | | | | | | | |
| | | | | | | | | |
| | | | | | | | | | |
4.7-integration
* '4.7' of scm.dev.nokia.troll.no:qt/qt-water-staging:
Introduce QGraphicsItem::ItemStopsFocusHandling flag
|
| | | | | |\ \ \ \ \ \ |
|
| | | | | | | | | | | |
| | | | | | | | | | |
| | | | | | | | | | |
| | | | | | | | | | |
| | | | | | | | | | |
| | | | | | | | | | |
| | | | | | | | | | |
| | | | | | | | | | |
| | | | | | | | | | |
| | | | | | | | | | |
| | | | | | | | | | |
| | | | | | | | | | |
| | | | | | | | | | |
| | | | | | | | | | |
| | | | | | | | | | |
| | | | | | | | | | |
| | | | | | | | | | |
| | | | | | | | | | |
| | | | | | | | | | |
| | | | | | | | | | | |
When set for an item, QGraphicsScene will skip focus handling for this item and
everything underneath it (including focus-out). Allows users to reimplement
custom focus handling.
Use case: touch devices that implement panning. Here, focus-in has to happen
only if no panning was triggered. Analogous, no focus-out should happen when
panning was detected.
Fixes the alternative proposal ("black holes for focus changes") of
QTBUG-16343: QGraphicsView doesn't support focus change on mouse release.
The previous test was only testing one scenario, which didn't give a good idea
whether the flag was actually working as intended.
Task-number: QTBUG-17505
Reviewed-by: Yoann Lopes
Reviewed-by: Jan-Arve Sæther
|
| | | | |\ \ \ \ \ \ \ \
| | | | | |_|/ / / / /
| | | | |/| | / / / /
| | | | |_|_|/ / / /
| | | |/| | | | | | |
* '4.7' of scm.dev.nokia.troll.no:qt/qt-qml:
Qt.include() used in WorkerScript is broken on Windows.
|
| | | | | | | | | | |
| | | | | | | | | |
| | | | | | | | | |
| | | | | | | | | |
| | | | | | | | | |
| | | | | | | | | |
| | | | | | | | | |
| | | | | | | | | |
| | | | | | | | | | |
The script local filename was used to resolve the source URL rather
than the script URL.
Change-Id: I78aa23eadbd76e100bb872b6ac9459aa9a5ee5ce
Task-number: QTBUG-17977
Reviewed-by: Aaron Kennedy
|
| | | |\ \ \ \ \ \ \ \
| | | |/ / / / / / /
| | | | | | | | | |
| | | | | | | | | |
| | | | | | | | | |
| | | | | | | | | |
| | | | | | | | | |
| | | | | | | | | |
| | | | | | | | | |
| | | | | | | | | |
| | | | | | | | | |
| | | | | | | | | |
| | | | | | | | | |
| | | | | | | | | |
| | | | | | | | | | |
Conflicts:
configure
mkspecs/symbian-gcce/qmake.conf
qmake/generators/metamakefile.cpp
qmake/generators/win32/mingw_make.cpp
src/corelib/global/global.pri
src/corelib/global/qglobal.h
src/opengl/qgl.cpp
src/opengl/qwindowsurface_gl.cpp
src/plugins/platforms/wayland/qwaylandbuffer.h
tests/auto/qnetworkreply/tst_qnetworkreply.cpp
tools/designer/src/components/formeditor/qdesigner_resource.cpp
|
