| Commit message (Collapse) | Author | Age | Files | Lines |
|---|
| |
|
|
|
|
| |
Merge-request: 915
Reviewed-by: Donald Carr <donald.carr@nokia.com>
(cherry picked from commit b62079cf17044e09999eb1808788926ea921fb05)
|
| |
|
|
|
|
|
|
|
|
|
|
|
|
| |
The FreeBSD base system does not ship a certificate bundle, but the
ca_root_nss port provides one extracted from Mozilla's root CA list.
As discussed in QTBUG-14013, it should be preferrable to have bundle
files than separate certificate files, so the path for the certificate
has been added directly.
Signed-off-by: Raphael Kubo da Costa <kubito@gmail.com>
Merge-request: 896
Reviewed-by: Thiago Macieira <thiago.macieira@nokia.com>
|
| |
|
|
|
|
|
|
|
|
|
| |
... and not only the last one. One call to OpenSSL can produce several
errors, which we should always read all. Otherwise, malicious clients
could intentionally poison the error queue.
Inspired-by: Merge request 2290
Reviewed-by: Olivier Goffart
Reviewed-by: Markus Goetz
Task-number: QTBUG-14513
|
| |
|
|
| |
Reviewed-by: trustme
|
| |
|
|
|
|
| |
Merge-request: 869
Reviewed-by: Thiago Macieira <thiago.macieira@nokia.com>
(cherry picked from commit aa88b7044dd86850e6986aa80104bb38bb7b12eb)
|
| |
|
|
|
|
|
|
|
| |
intptr_t is defined in some C header that we don't include. I don't
know which one it is, but without it, it fails to compile with:
declarative/qml/qdeclarativecontext.cpp:477: error: 'intptr_t' was not declared in this scope
Reviewed-By: Trust Me
|
| |\
| |
| |
| |
| |
| |
| |
| |
| | |
4.7-integration
* '4.7' of scm.dev.nokia.troll.no:qt/qt-s60-public:
SSL: Fix for capabilities in QSslCertificate auto test
Doc: update symbian capabilities regarding SSL
SSL: Fix crashes/hangs when retrieving CA certificates
|
| | |
| |
| |
| |
| |
| |
| | |
They were in wrong section of the file due to editing error and
therefore ignored.
Reviewed-by: Markus Goetz
|
| | |
| |
| |
| |
| |
| |
| | |
Testing shows some CA certs require ReadUserData depending which part
of the database they are stored in. Updated docs to reflect this.
Reviewed-by: Markus Goetz
|
| | |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| | |
Added error handling to the certificate retrieval thread
Made the certificate retrieval thread process critical (so if it crashes
the process will crash instead of hang)
Filter the certificate list to only fetch CA certificates which are in
X.509 format (symbian also allows WAP formats, but Qt does not support
these).
Put the TPtr8 for asynch function parameter in the class data so it does
not go out of scope while the function is in progress. Previously it was
on the stack so it could be corrupted before the certificate server had
finished using it.
Task-number: QTBUG-15005
Task-number: QTBUG-15126
Reviewed-by: Markus Goetz
|
| |\ \
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | | |
4.7-integration
* '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-2:
Coding style: bang cleanup.
Removed call to glFinish, obsoleted by fence syncs.
Helper-side support for QMeeGoFenceSync.
Plugin-side support for creating/destroying/waiting on fence sync.
Added MeeGo graphicssystem entry points for KHR_fence_sync.
Trailing whitespace fixes.
|
| | | |
| | |
| | |
| | |
| | | |
Merge-request: 2502
Reviewed-by: Samuel Rødal <samuel.rodal@nokia.com>
|
| | | |
| | |
| | |
| | |
| | | |
Merge-request: 2502
Reviewed-by: Samuel Rødal <samuel.rodal@nokia.com>
|
| | | |
| | |
| | |
| | |
| | | |
Merge-request: 2502
Reviewed-by: Samuel Rødal <samuel.rodal@nokia.com>
|
| | | |
| | |
| | |
| | |
| | | |
Merge-request: 2502
Reviewed-by: Samuel Rødal <samuel.rodal@nokia.com>
|
| | | |
| | |
| | |
| | |
| | | |
Merge-request: 2502
Reviewed-by: Samuel Rødal <samuel.rodal@nokia.com>
|
| | | |
| | |
| | |
| | |
| | | |
Merge-request: 2502
Reviewed-by: Samuel Rødal <samuel.rodal@nokia.com>
|
| |\ \ \
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | | |
4.7-integration
* '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1:
remove pointless assignment of deprecated variable
fix tst_headers
Fixed a shell syntax error in configure
Clear X11 structure before use
Make operator QRectF const
Fix GC-related crash in QScriptValue::setData()
get rid of dependency on QtGui
Removed implicity QtGui linking from icd.pro as it is not needed.
DFB: Make sure QPixmap::hasAlpha is respected
fix build on mingw
Fix some painting issues in QDirectFBPaintEngine
QNAM: Do not need QNetworkSession in AlwaysCache load mode
Don't crash if QScriptClass property getter returns an invalid value
QNAM: Remove dead waitForUpstreamBytesWritten() code
QNAM: Remove dead waitForDownstreamReadyRead() code
fix memleak in test
|
| | | | | |
|
| | |\ \ \ |
|
| | | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | | |
When you have EPOCROOT environment variable, but compiling for desktop
Linux, the configure script showed a shell syntax error and failed to set
the install prefix, making "install" target to install to the build
directory.
Task-number: QTBUG-15008
Reviewed-by: axis
Reviewed-by: Oswald Buddenhagen
|
| | |/ / /
| | | |
| | | |
| | | |
| | | | |
Fix the generator and the generated file to ensure that the string
"generated" appears in the first line.
|
| | |\ \ \
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | | |
4.7-integration
* '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1:
Clear X11 structure before use
Make operator QRectF const
Fix GC-related crash in QScriptValue::setData()
get rid of dependency on QtGui
Removed implicity QtGui linking from icd.pro as it is not needed.
DFB: Make sure QPixmap::hasAlpha is respected
fix build on mingw
Fix some painting issues in QDirectFBPaintEngine
QNAM: Do not need QNetworkSession in AlwaysCache load mode
Don't crash if QScriptClass property getter returns an invalid value
QNAM: Remove dead waitForUpstreamBytesWritten() code
QNAM: Remove dead waitForDownstreamReadyRead() code
fix memleak in test
|
| | | |\ \ \ |
|
| | | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | | |
This squelches valgrind warnings about uninitialized reads
Task-number: QT-3973
Reviewed-by: Robert Griebl
|
| | | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | | |
This allows us to convert a QGLRect to a QRectF also in const functions.
Function is inline and private, no ABI break.
Reviewed-by: Samuel Rødal <samuel.rodal@nokia.com>
|
| | | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | | |
Yet another missing API shim.
When converting the QScriptValue to JSC, a JSCell may be allocated,
which can cause the GC to trigger.
If an identifier (JSC::Identifier) is then garbage collected, the
destructor will try to remove itself from the currentIdentifierTable().
Because the API shim was missing, the identifier table was 0.
It's difficult to create a bulletproof test for this case, but the
attached test is a best effort (it crashes on my machine without the
fix).
Task-number: QTBUG-15144
Reviewed-by: Jedrzej Nowacki
|
| | | | |\ \ \ |
|
| | | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | | |
Task-number: QTBUG-15059
Reviewed-by: trustme
|
| | | | |/ / /
| | |/| | |
| | | | | |
| | | | | | |
Task-number: QTBUG-15059
|
| | | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | | |
An IDirectFBSurface can have an alpha channel for an opaque QPixmap.
This change will make sure we don't blend unless QPixmap::hasAlpha
returns true.
Merge-request: 913
Reviewed-by: Donald Carr <donald.carr@nokia.com>
|
| | | |\ \ \ \
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | | |
4.7-integration
* '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1:
fix build on mingw
Fix some painting issues in QDirectFBPaintEngine
QNAM: Do not need QNetworkSession in AlwaysCache load mode
Don't crash if QScriptClass property getter returns an invalid value
QNAM: Remove dead waitForUpstreamBytesWritten() code
QNAM: Remove dead waitForDownstreamReadyRead() code
fix memleak in test
|
| | | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | | |
> data.cpp:2: error: 'ushort' does not name a type
> data.cpp:1133: error: 'ushort' does not name a type
and lot of
> data.cpp:1276: error: too many initializers for 'StringCollection'
when the issue with ushort is fixed (by including qglobal.h, for example)
a bunch of some new build errors occurs:
> data.cpp:4: error: 'stringCollectionData' was declared 'extern' and later 'static'
> data.h:54: error: previous declaration of 'stringCollectionData'
> data.cpp:1131: error: redefinition of 'struct StringCollection'
> data.h:48: error: previous definition of 'struct StringCollection'
> data.cpp:1136: error: invalid type in declaration before '=' token
> data.cpp:1136: error: conflicting declaration 'int stringCollection []'
> data.h:55: error: 'stringCollection' has a previous declaration as 'StringCollection stringCollection []
> data.cpp:1279: error: 'stringCollectionCount' was declared 'extern' and later 'static'
> data.h:56: error: previous declaration of 'stringCollectionCount'
Merge-request: 910
Reviewed-By: Thiago Macieira <thiago.macieira@nokia.com>
|
| | | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | | |
Inspired/rewrite of Denis Oliver Kropp's merge request
(http://qt.gitorious.org/qt/qt/merge_requests/874)
When blitting premultiplied source surfaces one has to set
DSBLIT_SRC_PREMULTIPLY.
This also reverts the erroneous 6acbf6dce98903310023284e27a65c19f9a829bc
Merge-request: 903
Reviewed-by: Donald Carr <donald.carr@nokia.com>
|
| | | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | | |
Move the creation code to the top of QNAM::createRequest()
to avoid setting up a QNetworkSession when it is not needed.
Reviewed-by: ogoffart
|
| | | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | | |
It's possible that a class claims to have a property of a given name
(i.e. queryProperty() returns true), but returns an invalid value
for that property. In that case we should silently convert the value
to undefined, otherwise the value may wreak havoc in JS.
This is a regression from Qt 4.5 (pre-JavaScriptCore-based), which
had this check.
Task-number: QTBUG-15079
Reviewed-by: Jedrzej Nowacki
|
| | | | | | | | |
|
| | | | | | | |
| | | | | | |
| | | | | | |
| | | | | | | |
Reviewed-by: Thiago Macieira
|
| | | | | | | | |
|
| |\ \ \ \ \ \ \
| |_|_|_|_|_|/
|/| | | | | |
| | | | | | |
| | | | | | |
| | | | | | | |
* '4.7' of scm.dev.nokia.troll.no:qt/qt-qml:
QDeclarativeDebug: Keep source information when changing an expression
Flickable does not reposition its content when it is resized.
|
| | | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | | |
Copy over the source code location of an expression when it is changed throu
the debugging facilities. This enables JavaScript breakpoints to be hit even
after the source code of the function has changed.
Task-number: QTCREATORBUG-2824
Reviewed-by: Kai Koehne
|
| | |\ \ \ \ \ \
| | |/ / / / / |
|
| | |\ \ \ \ \ \ |
|
| | | | | | | | |
| | | | | | | |
| | | | | | | |
| | | | | | | |
| | | | | | | |
| | | | | | | |
| | | | | | | |
| | | | | | | | |
Call fixup() after Flickable resize to ensure contents are within
bounds.
Task-number: QTBUG-15173
Reviewed-by: Bea Lam
|
| |\ \ \ \ \ \ \ \
| |_|_|_|_|_|_|/
|/| | | | | | |
| | | | | | | |
| | | | | | | |
| | | | | | | |
| | | | | | | | |
4.7-integration
* '4.7' of scm.dev.nokia.troll.no:qt/qt-s60-public:
Use $${EPOCROOT} variable rather than absolute paths in .pro files
|
| | | | | | | | |
| | | | | | | |
| | | | | | | |
| | | | | | | |
| | | | | | | | |
Task-number: QTBUG-15156
Reviewed-by: Miikka Heikkinen
|
| |\ \ \ \ \ \ \ \
| | | | | | | | |
| | | | | | | | |
| | | | | | | | |
| | | | | | | | |
| | | | | | | | |
| | | | | | | | |
| | | | | | | | |
| | | | | | | | |
| | | | | | | | |
| | | | | | | | |
| | | | | | | | |
| | | | | | | | |
| | | | | | | | |
| | | | | | | | |
| | | | | | | | |
| | | | | | | | |
| | | | | | | | |
| | | | | | | | |
| | | | | | | | |
| | | | | | | | |
| | | | | | | | |
| | | | | | | | |
| | | | | | | | |
| | | | | | | | |
| | | | | | | | |
| | | | | | | | | |
4.7-integration
* '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-2: (21 commits)
Fixed tst_qpixmap::grabWidget autotest failure on QWS.
Doc: Fixing typo
Doc: Fixing typo
Doc: Fixing typo
Fixed tst_qwidget::testContentsPropagation auto-test failure.
Fixed text rendering bug in raster engine when opacity != 1.0.
Prevented race condition on texture destruction.
More fix for QTBUG-14640:oci performance problem with qlonglong
Doc: Fixing typo
Fixed grabWidget sometimes returning uninitialized memory.
Fix Malayalam Rendering - 'Ra' is PreBase
Update .def files for QtGui and QtOpenVG
Use 32bit textures for alpha textures after all.
One more fix for dithering.
Doc: Fixing typo
Fix QTBUG-14640:oci performance problem with qlonglong
32bit => 16bit conversion has 4byte-aligned output.
Fix gcc bug in qReallocAligned
Prevented threading related crash in OpenGL module.
Fix possible crash in QStaticText and QDeclarativeTextLayout
...
|
| | | | | | | | | |
| | | | | | | | |
| | | | | | | | |
| | | | | | | | |
| | | | | | | | |
| | | | | | | | |
| | | | | | | | |
| | | | | | | | |
| | | | | | | | |
| | | | | | | | | |
We need to use the same rendering to compute the expected pixmap as used
in QPixmap::grabWidget(), or the results will look different on a 16-bit
display, as QPixmap::fromImage(ARGB32_Premultiplied_image) will get a
different internal image format compared to QPixmap pixmap(size);
pixmap.fill(Qt::transparent);
Reviewed-by: Kim
|
| | |\ \ \ \ \ \ \ \
| | | | | | | | | |
| | | | | | | | | |
| | | | | | | | | |
| | | | | | | | | |
| | | | | | | | | |
| | | | | | | | | |
| | | | | | | | | |
| | | | | | | | | |
| | | | | | | | | |
| | | | | | | | | |
| | | | | | | | | |
| | | | | | | | | |
| | | | | | | | | |
| | | | | | | | | |
| | | | | | | | | |
| | | | | | | | | |
| | | | | | | | | |
| | | | | | | | | |
| | | | | | | | | |
| | | | | | | | | |
| | | | | | | | | |
| | | | | | | | | |
| | | | | | | | | |
| | | | | | | | | |
| | | | | | | | | | |
4.7-integration
* '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-2:
Doc: Fixing typo
Doc: Fixing typo
Doc: Fixing typo
Fixed tst_qwidget::testContentsPropagation auto-test failure.
Fixed text rendering bug in raster engine when opacity != 1.0.
Prevented race condition on texture destruction.
More fix for QTBUG-14640:oci performance problem with qlonglong
Doc: Fixing typo
Fixed grabWidget sometimes returning uninitialized memory.
Fix Malayalam Rendering - 'Ra' is PreBase
Update .def files for QtGui and QtOpenVG
Use 32bit textures for alpha textures after all.
One more fix for dithering.
Doc: Fixing typo
Fix QTBUG-14640:oci performance problem with qlonglong
32bit => 16bit conversion has 4byte-aligned output.
Fix gcc bug in qReallocAligned
Prevented threading related crash in OpenGL module.
Fix possible crash in QStaticText and QDeclarativeTextLayout
Fix QTBUG-14132 oracle (xe) stored procedures with bind variables get errors
|
| | | | | | | | | | | |
|
