| Commit message (Collapse) | Author | Age | Files | Lines |
|
|
|
|
|
|
| |
This commit fixes getFromUnreachableIp()
Reviewed-by: Thiago Macieira
Task-Number: QTBUG-10679
|
|
|
|
|
|
|
| |
This was already fixed in 4.8, this is a hotfix for 4.7
Task-Number: QT-4096
Reviewed-by: Olivier Goffart <olivier.goffart@nokia.com>
|
|
|
|
|
|
|
| |
Resources do not need network access and can be quicker
loaded with QFileNetworkReply.
Reviewed-by: Markus Goetz
|
|
|
|
|
|
|
|
|
|
| |
This one happened especially more often on amazon.de.
While one channel was taken by one request, but postponed because it
was still in disconnecting mode, another request would come, pick
the same channel, and overwrite the request/reply assignment of this
channel. The first request would be left unhandled eternally.
Reviewed-by: Markus Goetz
|
|
|
|
| |
Reviewed-by: Thomas Hartmann <thomas.hartmann@nokia.com>
|
|\
| |
| |
| | |
integration
|
| |
| |
| |
| |
| | |
The signal provides qint64, which cannot be connected to
QProgressBar::setValue(int).
|
|/ |
|
|
|
|
| |
Task-number: QTBUG-12285
|
|\
| |
| |
| |
| |
| |
| |
| |
| |
| | |
Conflicts:
doc/src/index.qdoc
src/dbus/qdbusconnection.cpp
src/gui/s60framework/qs60mainapplication.cpp
src/gui/s60framework/qs60mainappui.cpp
src/network/access/qnetworkrequest.cpp
src/network/bearer/qnetworkconfiguration.h
|
| | |
|
|/
|
|
| |
Reviewed-by: Trust Me
|
|
|
|
| |
Reviewed-by: Peter Hartmann
|
|
|
|
| |
Reviewed-by: Markus Goetz
|
|
|
|
|
|
|
|
| |
Implementation will follow in 4.7.1 or 4.8, let's see.
Reviewed-by: David Boddie
Reviewed-by: Simon Hausmann
Reviewed-by: Peter Hartmann
|
|
|
|
| |
Reviewed-by: Trust Me
|
|
|
|
|
| |
Merge-request: 715
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com>
|
|
|
|
|
| |
Merge-request: 715
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com>
|
|
|
|
|
| |
Merge-request: 2411
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com>
|
|
|
|
|
|
|
|
|
| |
configuration option on Windows and Symbian platforms.
Improved support of "-system-jpeg" "-system-mng" "-system-png" and "-system-tiff" configuration options on Windows (thanks to Mark Brand <mabrand@mabrand.nl>)
Merge-request: 2411
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com>
|
|
|
|
|
|
|
|
| |
Delete the QNetworkReply children first because they
could access the QAbstractNetworkCache that is also
a child of the QNetworkAccessManager.
Reviewed-by: brad
|
|
|
|
|
|
|
|
| |
do not accept a cookie whose domain attribute cannot be converted to
an ACE domain.
Reviewed-by: Thiago Macieira
Task-number: QTBUG-11029
|
|\
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| | |
4.7-integration
* '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1: (50 commits)
Dont crash when assigning the same input context twice.
Fixed a typo in variable name in qlocale data generator.
Fix for Norwegian and Korean languages on symbian.
Remove unused function in QDBusConnectionPrivate
Doc: Fixing bugs in HTML generator
Updating 4.7.0 change log.
Doc: Correcting style to class lists
qdoc: Improved class index page.
Added MSVC 2010 project files to .gitignore
Fix architecture detection on GNU/Hurd.
Revert "tst_bic: make it possible to test for cross-compilation"
fix typo in documentation
Improve Bearer Management related documentation in QNetworkAccessManager
Compile with QT_NO_ACTION.
Unbreak compilation outside Mac
QDBusAbstractInterface: don't set lastError outside the object's own thread
tst_bic: make it possible to test for cross-compilation
Remove Q_PACKED from QChar and QLocale::Data.
QDebug operator for QFlags
Removing unneeded qDebug statement.
...
|
| |\
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | | |
4.7-integration
* '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1: (39 commits)
fix typo in documentation
Improve Bearer Management related documentation in QNetworkAccessManager
Compile with QT_NO_ACTION.
Unbreak compilation outside Mac
QDBusAbstractInterface: don't set lastError outside the object's own thread
tst_bic: make it possible to test for cross-compilation
Remove Q_PACKED from QChar and QLocale::Data.
QDebug operator for QFlags
Removing unneeded qDebug statement.
Fixing incorrect addition of public API symbols.
Removal erroneous inclusion of new Public API in qmacstyle.
Doc: design changes
qdoc: Fixed html error, but the problem is still there.
qdoc: Changed number of columns to 1. Oila!
Doc: Changes to the HTMLGenerator, style and js
remove dead code that will never get called.
add bytes and activeTime to corelwan.
Fix formating of license header.
fix irix build
clarify wording of warning message
...
|
| | | |
|
| | |
| | |
| | |
| | | |
Reviewed-by: trustme
|
|\ \ \
| |/ /
|/| |
| | |
| | |
| | |
| | |
| | | |
Conflicts:
demos/spectrum/app/app.pro
src/gui/egl/qegl.cpp
tests/auto/qhttpnetworkconnection/qhttpnetworkconnection.pro
tests/auto/qmenu/tst_qmenu.cpp
|
| | |
| | |
| | |
| | |
| | | |
Private headers have to be included in consistent and proper way:
not like "name_p.h" or "../name_p.h" but <private/name_p.h>
|
| |/
|/|
| |
| |
| |
| |
| | |
QNetworkAccessManager::setCookieJar used to give an error message, now
it documents the behavior and avoids the warning.
Task-number: QTBUG-10554
|
|\ \
| | |
| | |
| | |
| | | |
Conflicts:
src/corelib/tools/qlocale_symbian.cpp
|
| |\ \
| | |/ |
|
| | | |
|
| |\ \
| | |/
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | | |
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
|
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | | |
We inversed the order. HTTP shall be tried first, file:// last.
See https://bugs.webkit.org/show_bug.cgi?id=38935
Reviewed-by: Thiago
|
| | |
| | |
| | |
| | | |
Task-number: QTBUG-10649
|
| | |
| | |
| | |
| | |
| | |
| | |
| | | |
This should fix the problem where we were showing a warning
that didn't matter anyway.
Task-number: QTBUG-9619
|
| | |
| | |
| | |
| | | |
Reviewed-by: Peter Hartmann
|
|/ / |
|
| |
| |
| |
| | |
This reverts commit a9fb306a1cf1308a3f8b9bb12ed01aed1f6f6f8d.
|
| |
| |
| |
| | |
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
|
| |
| |
| |
| | |
Related to MR-592
|
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| | |
Introduced QNetworkRequest::CookieLoadControlAttribute,
QNetworkRequest::CookieSaveControlAttribute and
QNetworkRequest::AuthenticationReuseControlAttribute
These are true by default. They only come into play when QtWebKit
processes a cross-origin XMLHttpRequest. In such cases QtWebKit sets
each of the attributes to false when it creates a QNetworkRequest
where the XMLHttpRequest is cross-origin and has withCredentials
set to false:
var req = new XMLHttpRequest;
req.open("GET", "http://host/resource.php", false);
req.withCredentials = false; // actually false by default
For more information:
http://www.w3.org/TR/XMLHttpRequest2/#credentials-flag
The QtWebKit counterpart of this patch is tracked at:
https://bugs.webkit.org/show_bug.cgi?id=32967
Merge-Request: 592
Reviewed-by: Markus Goetz
|
|\ \
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | | |
4.7-integration
* '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1: (29 commits)
bye bye QMakeProjectEnv
short-cut evaluation inside if() tests
eliminate special splitting of INCLUDEPATH and DEPENDPATH
do not env-expand cache file path
s/QMAKE_FRAMEWORKDIR_FLAGS/QMAKE_FRAMEWORKPATH_FLAGS/
s/INCPATH/INCLUDEPATH/
s/QMAKE_RPATH/QMAKE_LFLAGS_RPATH/
teach configure QMAKE_LFLAGS_RPATH (in addition to obsolete QMAKE_RPATH)
warn about usage of deprecated variables
warn about using non-lowercased replace $$function()s
add -Wdeprecated option (on by default)
make QMakeProject::isEmpty() consider legacy mappings
document some functions' scope
fix $$size() not using function-scoped variables
doc: Fixed some qdoc errors.
qdoc: Added breadcrumbs for namespaces.
Autotest: check that we receive key events on toplevel widgets
Cocoa: key events stopped working
Update Polish translations
qdoc: Added "All namespaces" to the API Lookup box.
...
|
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | | |
http://bugreports.qt.nokia.com/browse/QTBUG-9618
QtWebKit currently fails the following test:
LayoutTests/http/tests/xmlhttprequest/cookies.html
This is because QNetworkCookieJar::cookiesForUrl returns secure
cookies even when the connection is not secure.
A 'secure' cookie is set by response headers from a http server as follows:
'Set-Cookie: cookie-name=value; secure'
Correct QNetworkCookieJar::cookiesForUrl to ignore secure cookies when the
url in the request is not 'https:'.
Task-number: QTBUG-9618
Merge-request: 2372
Reviewed-by: Peter Hartmann <peter.hartmann@nokia.com>
|
|\ \ \
| | |/
| |/|
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | | |
All EGL-related changes from 4.6 were discarded.
Conflicts:
src/gui/egl/egl.pri
src/gui/egl/qegl.cpp
src/gui/egl/qegl_p.h
src/gui/egl/qegl_stub.cpp
src/gui/egl/qeglproperties_p.h
src/gui/egl/qeglproperties_stub.cpp
src/gui/gui.pro
src/multimedia/multimedia/audio/qaudioinput_win32_p.h
src/s60installs/bwins/QtGuiu.def
src/s60installs/eabi/QtGuiu.def
|
| | |
| | |
| | |
| | |
| | | |
Task-number: QTBUG-10171
Reviewed-by: Olivier Goffart
|
| | | |
|
| | |
| | |
| | |
| | |
| | |
| | | |
The goal is to easier add an overload for (const &QByteArray).
Reviewed-by: Peter Hartmann
|