| Commit message (Collapse) | Author | Age | Files | Lines |
|---|
| |
|
|
| |
Reviewed-by: Trust Me
|
| |
|
|
|
|
|
|
|
|
|
|
|
| |
select code for open C file/socket descriptors was crashing in FD_SET
if a QSocketNotifier was created with an invalid descriptor.
Added two autotests to QSocketNotifier, one to check notifiers with
bogus socket descriptors don't crash, the other to check that notifiers
with posix socket descriptors do work. (symbian socket engine doesn't
use them so they are not implicitly tested)
Reviewed-by: mread
Task-Number: QTBUG-18138
|
| |
|
|
|
|
|
|
|
| |
1. test that systemProxyForQuery returns something for all configs
2. test that QNetworkAccessManager uses the settings for the
configuration it was started with.
Task-number: QTBUG-18618
Reviewed-by: Peter Hartmann
|
| |
|
|
|
|
|
|
|
| |
The backend was never started when compiled without bearer management,
now it is.
Now emits the error signal in case of startup errors which would leave
the state machine hanging. Previously it just printed a warning.
Reviewed-by: Peter Hartmann
|
| |
|
|
|
|
|
|
|
|
|
|
|
|
| |
Delayed the resolving of the proxy until the backend is being started.
This is because the proxy settings are not known until after
QNetworkAccessManager has brought the network online using
QNetworkSession.
On Nokia's symbian3 phones, the default network configuration is a
service network containing a list of access points in priority order.
For a typical user, this will include one or more WLAN networks and a
cellular network - each of which can have different proxy settings.
Task-number: QTBUG-18618
Reviewed-by: Peter Hartmann
|
| |
|
|
|
|
|
|
|
|
|
|
|
| |
When Qt is compiled with bearer management support, the network
configuration can be included as a parameter in QNetworkProxyQuery.
This allows QNetworkProxyFactory::systemProxyForQuery to get the right
proxy setting for a specific network. For example a mobile phone could
have network configurations for home WLAN, work WLAN and 3G data
access points, each with different proxy configurations.
Task-number: QTBUG-18618
Reviewed-by: Peter Hartmann
|
| |
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
| |
In Symbian, the OS function to get the size of a pending datagram also
includes the size of the packet header (which is different for IPv4 and
IPv6). We were reading the datagram with the "peek" flag set to
implement pendingDatagramSize, then reading again normally when the
client called read/readDatagram.
This change removes the "peek" flag, and buffers the datagram in the
socket engine, returning it and clearing the buffer when read or
readDatagram is called.
If there is no buffered data, the existing code path is followed - it
isn't mandatory to call pendingDatagramSize before reading from the
socket.
Reviewed-by: Markus Goetz
|
| |
|
|
|
|
|
|
| |
When socks socket engine calls the write function of the native socket
engine, it now propagates errors to the abstract socket.
Task-number: QTBUG-18713
Reviewed-by: Markus Goetz
|
| |
|
|
|
|
|
|
|
|
| |
The generic layer calls setReadNotificationEnabled(false) on sockets
after they are closed. This no longer causes a warning from the symbian
socket engine. A warning will only be emitted if trying to enable
notifications on a closed socket.
Task-number: QTBUG-18713
Reviewed-by: Markus Goetz
|
| |
|
|
|
|
|
|
|
| |
Ignore warning when the test intentionally sets an invalid socket descriptor.
Make sure to set content type on all http post tests in tst_qnetworkreply.
Run test with enough capabilities to avoid platsec errors when accessing
certificate store.
Reviewed-By: Markus Goetz
|
| |\
| |
| |
| | |
scm.dev.troll.no:qt/qt-symbian-network into symbian-socket-engine
|
| | |
| |
| |
| |
| |
| |
| |
| | |
This reverts commit e5d27e7aeac984e46f3aa8de20160cc00fc63155.
Conflicts:
tests/auto/qabstractnetworkcache/tst_qabstractnetworkcache.cpp
|
| | |
| |
| |
| |
| |
| |
| |
| |
| |
| | |
Change df9491b302f6404ad2ccc6dc2eb3377176d994c6 optimised auto connections
by comparing thread ID rather than comparing TLS addresses.
However it was implemented on a branch that didn't have the native
symbian threads. So merging the two branches caused a regression without
merge conflicts.
Reviewed-by: mread
|
| |\ \
| |/
|/|
| |
| | |
Conflicts:
tests/auto/qabstractnetworkcache/tst_qabstractnetworkcache.cpp
|
| | |
| |
| |
| |
| | |
This reverts commit e5d27e7aeac984e46f3aa8de20160cc00fc63155.
Broke the CI.
|
| |\ \
| |/
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| | |
symbian-socket-engine
Conflicts:
src/s60installs/bwins/QtCoreu.def
src/s60installs/bwins/QtGuiu.def
src/s60installs/bwins/QtNetworku.def
src/s60installs/eabi/QtCoreu.def
src/s60installs/eabi/QtGuiu.def
src/s60installs/eabi/QtNetworku.def
src/s60installs/eabi/QtOpenVGu.def
tests/auto/qabstractnetworkcache/tst_qabstractnetworkcache.cpp
|
| | |
| |
| |
| |
| |
| | |
And also in QMetaMethod::invoke
Reviewed-by: brad
|
| | |
| |
| |
| |
| |
| |
| | |
The memory leak was fixed in two different ways in
b6c60b0c9778f51af8c80f853d840ba25910c6f4 and
0ee221b374ffef3657247be4c78e05689e04bef7
after the merge, the thread are now deleted twice.
|
| | |
| |
| |
| |
| | |
Code was removed in that commit 834ad29849ebef99d7e5c516cde26d550abff7cd
But the merge d54b3f04fa629fe031f1083073eef0145f0d6b1e reintroduced it back
|
| | |
| |
| |
| |
| | |
It was somehow lost in the merge of the native symbian threads
(wrong merge was cf94df01d2d2364653f2ab602688394450e92d31)
|
| | |
| |
| |
| | |
That call was removed in 0ee221b374ffef3657247be4c78e05689e04bef7
|
| | |
| |
| |
| |
| |
| |
| |
| | |
improve error reporting by introducing a new enum value in case the
peer certificate is blacklisted.
Reviewed-by: Markus Goetz
Task-number: QTBUG-18338
|
| | |
| |
| |
| |
| |
| |
| |
| | |
elf2e32 crashes when using it, and gcce will not produce matching
symbols anyway. It can still be turned on manually by specifying
-use-deffiles.
Reviewed-by: Liang Qi
|
| | |
| |
| |
| |
| |
| |
| |
| |
| |
| | |
PreferNetwork means: send out a request and read from cache if it has
not been modified.
PreferCache means: load resource from cache if it has not expired yet.
This commit makes the cache behave according to the documentation.
Reviewed-by: Markus Goetz
|
| | |
| |
| |
| | |
Reviewed-by: Trust me
|
| | |
| |
| |
| | |
Reviewed-by: Trust me
|
| | |\
| | |
| | |
| | |
| | | |
Conflicts:
src/corelib/thread/qthread_unix.cpp
|
| | | |\
| | | |
| | | |
| | | |
| | | |
| | | |
| | | | |
master-integration
* 'master' of scm.dev.nokia.troll.no:qt/oslo-staging-1:
Fixed license headers for examples in master
|
| | | | |
| | | |
| | | |
| | | |
| | | |
| | | | |
All examples should carry the BSD header.
Reviewed-by: Trust Me
|
| | | |\ \
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | | |
master-integration
* 'master' of scm.dev.nokia.troll.no:qt/qt-fire-staging:
Fixed compilation of qpixmap_raster.cpp
Draw graphics item bounding rects drawn when QT_DRAW_SCENE_ITEM_RECTS=1
Put all the declarations of qt_defaultDpi{,X,Y}() in one place
Really avoid compiler warnings on Windows
Made extension resolving work with Core profile.
Avoid some compiler warnings on Windows
Fix positioning in GL2 paint engine with subpixel antialiasing
Update defs files
Doc: Updating 3rdparty license doc
Update .def files
Another compilation fix for WinCE
Updating libjpeg: Add Qt building modifications
Updating libjpeg: Add version 8c.
Updating libjpeg: Removing libjpeg version 8
|
| | | | |\ \
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | | |
* 'master' of git://scm.dev.nokia.troll.no/qt/qt-fire-team:
Fixed compilation of qpixmap_raster.cpp
Draw graphics item bounding rects drawn when QT_DRAW_SCENE_ITEM_RECTS=1
Put all the declarations of qt_defaultDpi{,X,Y}() in one place
Really avoid compiler warnings on Windows
|
| | | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | | |
qfont_p.h indirectly includes qdebug.h, which must be included before
any X11 headers (as they define Status).
Reviewed-by: Jiang Jiang
|
| | | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | | |
It is extremely handy to visualize bounding rects when developing pixel
perfect graphics view based applications. This change makes it possible
to define an environment variable (inspired by QT_FLUSH_PAINT) to enable
drawing of graphics items' bounding rects with random colors. Any
graphics view/declarative example can be used to test the feature.
Merge-request: 981
Reviewed-by: Samuel Rødal <samuel.rodal@nokia.com>
|
| | | | | | |
| | | | | |
| | | | | |
| | | | | | |
Reviewed-by: Samuel Rødal
|
| | | | | | | |
|
| | | | |\ \ \
| | | | |/ /
| | | | | |
| | | | | |
| | | | | | |
* 'master' of git://scm.dev.nokia.troll.no/qt/qt-fire-team:
Made extension resolving work with Core profile.
|
| | | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | | |
The Core profile was introduced in OpenGL 3.2 and if chosen removes
all deprecated functionality from the OpenGL API.
In the Core profile glGetString(GL_EXTENSIONS) is unsupported, so
instead we need to use glGetStringi(GL_EXTENSIONS, index) together with
glGetIntegerv(GL_NUM_EXTENSIONS). Also optimized the QGLExtensionMatcher
to not have to recompute the split positions all the time.
Preliminary support to prevent non-core-functions to be called in the GL
2 engine has also been added.
Reviewed-by: Kim
|
| | | | |\ \ \
| | | | |/ /
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | | |
* 'master' of git://scm.dev.nokia.troll.no/qt/qt-fire-team: (246 commits)
Avoid some compiler warnings on Windows
Fix positioning in GL2 paint engine with subpixel antialiasing
Update defs files
Doc: Updating 3rdparty license doc
Another compilation fix for WinCE
Remove obsolete patch file
Fix animation tests after merge
Remove duplicated test.
Add missing test file.
Changing width of RTL positioner doesn't relayout
Fix TextInput auto test failure on mac.
PinchArea and Flickable don't work well enough together
Do not set focus unnecessarily at window activation in Symbian
QS60Style: Regression in drawing dialog background
QS60Style: Support menu separator (pt.2)
Fix auto test failure.
Support for new softkey in Symbian^3
Once Image sourceSize is set there is no way to clear it.
Rotation transform with NaN angle can cause crash
QSoftkeyManager auto test update
...
|
| | | | | | | |
|
| | | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | | |
In this case we will use QTextureGlyphCache with FreeType renderer,
which requires the subpixel positition to get correct left bearings,
thus alphaMapBoundingBox is extended to support subPixelPosition.
In QFontEngineFT we also simplify the code a bit by reusing
loadGlyphs for metrics calculation instead of duplicate code. Since
we need to use the glyphs after all, cache them here in
alphaMapBoundingBox shouldn't be a problem.
Reviewed-by: Eskil
|
| | | | | | |
| | | | | |
| | | | | |
| | | | | | |
Reviewed-by: TRUSTME
|
| | | | | |\ \
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | | |
Conflicts:
src/s60installs/bwins/QtOpenVGu.def
|
| | | | | | | |
| | | | | | |
| | | | | | |
| | | | | | | |
Corresponding to the updated zlib, libpng, and libjpeg in src/3rdparty.
|
| | | | | |\ \ \ |
|
| | | | | | | | | |
|
| | | | | | | | |
| | | | | | | |
| | | | | | | |
| | | | | | | |
| | | | | | | |
| | | | | | | |
| | | | | | | | |
This is a clean copy of the official distribution of libjpeg version 8c,
except that various extraneous stuff (examples, tests, etc.) have been
removed, as usual. Modifications to build it in Qt will follow in a
separate commit.
|
| | | | | | | | | |
|
| | | | | | | | | |
|
| | | | |\ \ \ \ \
| | | | | |_|/ /
| | | | |/| | |
| | | | | | | |
| | | | | | | | |
* 'master' of git://scm.dev.nokia.troll.no/qt/qt-fire-team:
Update .def files
|
| | | | | | | | |
| | | | | | | |
| | | | | | | |
| | | | | | | | |
Reviewed-by: TRUSTME
|
