| Commit message (Collapse) | Author | Age | Files | Lines |
|
|
|
|
|
|
|
|
|
|
|
|
|
| |
Reviewed-by: Trust Me
(cherry picked from commit cb086eb5340c4c41efaf45373aa05c37e8aa974a)
Conflicts:
doc/src/index.qdoc
src/dbus/qdbusconnection.cpp
src/declarative/util/qdeclarativeanimation.cpp
src/gui/s60framework/qs60mainapplication.cpp
src/gui/s60framework/qs60mainappui.cpp
src/network/access/qnetworkrequest.cpp
|
|
|
|
| |
(cherry picked from commit 167b63d2250e7923d7b660076a80e82af07d9cdb)
|
|
|
|
|
|
|
|
|
| |
Due to a wrong ifdef sequence, the unix code was being compiled instead
of the symbian code for retrieving the system certificates.
Task-number: QTBUG-12718
Reviewed-by: Peter Hartmann
(cherry picked from commit 8229eded4cba85ae53c1b03ce87981ebabd2f3ae)
|
|
|
|
|
|
|
|
|
|
| |
This fixes Westpoint Security issue with Advisory ID#: wp-10-0001.
Before, we would allow wildcards in IP addresses like *.2.3.4 ; now,
IP addresses must match excatly.
Patch-by: Richard J. Moore <rich@kde.org>
Task-number: QT-3704
(cherry picked from commit 846f1b44eea4bb34d080d055badb40a4a13d369e)
|
|
|
|
|
|
|
|
|
|
|
|
| |
QtMobility uses the Qt header when compiling applications which
link against Mobility's Bearer library. Therefore
QNetworkConfiguration::bearerName() cannot be inline and refer to the
new QNetworkConfiguration::bearerTypeName() function (which doesn't
exist in Mobility)
Task-number: QTBUG-12378
Reviewed-by: Rohan McGovern
(cherry picked from commit d524da81ee257a6bd67d32d0bc870280a7d5b8a4)
|
|
|
|
|
| |
Task-number: QTBUG-12378
Reviewed-by: Alex
|
|
|
|
|
|
|
|
|
|
|
|
| |
bearerName() -> bearerTypeName().
bearerName() is deprecated and converted into an inline function which
calls bearerTypeName(). This is required to keep existing code source
compatible between Qt Mobility 1.0.x and Qt 4.7.
Task-number: QTBUG-12378
Reviewed-by: Alex
(cherry picked from commit 613bc8eb31d8a80b43aa045ab2040b7cb7e0eadf)
|
|
|
|
|
|
|
|
|
| |
It is useful to know the priority order of the sub configurations of
a service network.
Task-number: QTBUG-11678
RevBy: juhvu <qt-info@nokia.com>
(cherry picked from commit 959efa8daab2715d18440ed8b890b9dd2b501fc7)
|
|
|
|
|
|
| |
7ef45318255c5cf1f10508753c9a2c55fc2cb8c0
321bd8b7b54e34a983b1ba142af836cf3e153a66
(cherry picked from commit c16f0a839743af36b36aea9c35f0d5ddfda3d6ac)
|
|
|
|
|
|
|
|
|
| |
The problem was that the QT_BEGIN_NAMESPACE was in the wrong place.
I moved it 10 lines before and the problem is gone.
Task-number: QTBUG-12262
Reviewed-by: Prasanth
(cherry picked from commit b0998a44a5dc384a6cf65c1d5910cb3dd40620cf)
|
|
|
|
|
| |
Task-number: QTBUG-12106
(cherry picked from commit bca7646d81d8c580820cf5f6e52122da6d984c6b)
|
|
|
|
|
|
| |
QString::lower() is QT3_SUPPORT, the correct method is
QString::toLower().
(cherry picked from commit 46175e55c8d053b61a45aea89a3e1b8371207dee)
|
|
|
|
|
|
| |
Reviewed-by: Markus Goetz
Task-number: QT-3567
(cherry picked from commit c25c7c9bdfade6b906f37ac8bad44f6f0de57597)
|
|
|
|
|
| |
Reviewed-by: Peter Hartmann
(cherry picked from commit 1c34bf050da3c4d6c303e1dd1dad9eb99e7ccbf4)
|
|
|
|
| |
(cherry picked from commit 079a4105aff9c63d4107762aec478ade9900c7c2)
|
|
|
|
| |
(cherry picked from commit 2c48de46fdfeb935d1f31ae18f13add52c162ac8)
|
|
|
|
|
|
|
| |
Merge-request: 731
Task-number: QTBUG-4455
Reviewed-by: Peter Hartmann
(cherry picked from commit 5f6018564668d368f75e431c4cdac88d7421cff0)
|
|
|
|
|
|
| |
Task-number: QT-3573
Reviewed-by: Markus Goetz
(cherry picked from commit 1af3362a321dd055798173737d3aede367a1d30c)
|
|
|
|
|
|
| |
Task-number: QT-3573
Reviewed-By: Markus Goetz
(cherry picked from commit 69027cdb2ab9b89673edf29d5034bed33e614a05)
|
|
|
|
|
| |
Reviewed-by: Markus Goetz
(cherry picked from commit 367aa34cbcfa109926087e89d49f9223c1409d44)
|
|
|
|
|
|
|
|
|
|
|
| |
This also fixes a long-standing bug in handling usernames of type
"domainname\username", typical of Windows domains, that didn't work
with the previous NTLMv1 code.
Patch by subcontractor.
Task-number: QTBUG-9408, QTBUG-2421, QT-3248
Reviewed-By: Markus Goetz
(cherry picked from commit 1b98fbd82c7145c2f81292f8a1feb6cac74e775d)
|
|
|
|
|
| |
Task-number: QTBUG-12004
(cherry picked from commit 10039e4b5bb80e5a9705126e7c62c588039acde6)
|
|
|
|
|
|
|
|
| |
Partial update allows you to build a qtnetwork.sis which can be installed
on top of a matching qt.sis, but contains only the qtnetwork.dll file.
This is faster to install, so it's useful when developing qtnetwork.
Reviewed-by: Simon Hausmann
|
|
|
|
|
|
|
|
|
| |
Implemented access to the unified certificate store on Symbian with
Shane and Peter's help.
Task-number: QTBUG-11399
Reviewed-by: Shane Kearns <shane.kearns@accenture.com>
Reviewed-by: Peter Hartmann <peter.hartmann@nokia.com>
|
|
|
|
|
|
|
| |
Only try auto config retrieval once.
Patch by Kai Koehne.
Task-number: QTBUG-10106
|
|
|
|
|
|
|
|
| |
on WinCE the function is called "CertOpenStore", and not
"CertOpenSystemStoreW".
Patch-by: Ismail Donmez
Task-number: QTBUG-11905
|
|
|
|
|
| |
Merge-request: 715
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com>
|
|
|
|
|
| |
Merge-request: 715
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com>
|
|
|
|
| |
Reviewed-by: Simon Hausmann
|
|
|
|
|
|
|
|
|
|
|
| |
Some CAs have several root certificates with the same SubjectInfo, but
different expiration date. This means that OpenSSL needs to choose the
valid root certificate over the expired ones when verifying a
certificate chain. Apparently, the certs added to the store first are
the ones that get used first, so we add the expired ones at the end.
Reviewed-by: Thiago Macieira
Task-number: QTBUG-11664
|
|\
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| | |
4.7-integration
* '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1:
Enable SSE2 for MSVC x64 builds, as it was incorrectly disabled
Updated JavaScriptCore from /home/khansen/dev/qtwebkit-qtscript-integration to javascriptcore-snapshot-28062010 ( 0fccd26d3624e80cf68873701ef70ad72ca66bec )
ignore *.vcxproj.user
doc: Added more DITA output to the XML generator
Don't load ciphers and system certificates for QSslSocket::supportsSsl()
Doc: Fixed whitespace issues and added missing files to lists.
Doc: Fixed links in the QML documentation.
Doc: Changed links to explicitly refer to QML objects.
qdoc: Added a workaround for QML/Qt class name clashes.
|
| |
| |
| |
| |
| |
| |
| | |
Loading these uses about 1 MB of memory and can be be deferred until
it's actually needed.
Reviewed-by: Peter Hartmann <peter.hartmann@nokia.com>
|
|\ \
| |/
|/|
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| | |
4.7-integration
* '4.7' of scm.dev.nokia.troll.no:qt/qt-s60-public: (31 commits)
Make symbian/unix shadow builds work again.
Change the files to camelcase as avkon now does that
Update EABI and WINSCW DEF files for Symbian
Fix linking on arm with def files
Updated Harfbuzz from git+ssh://git.freedesktop.org/git/harfbuzz to 4b88f595ab62b7c5f703a286c4f5f13f8784a936
Fixed incorrect parsing of TARGET.EPOCHEAPSIZE.
Fixed make runonphone that looked for the package in the wrong place.
Fixed several problems with the postlinker for Symbian (elf2e32).
Don't crash when cleaning the uninitialized fontdatabase (Symbian)
Revert "Fixing the race condition in event dispatcher implementation on"
Revert "Fixing race condition in qeventdispatcher_symbian.cpp code path"
Updated Harfbuzz from git+ssh://git.freedesktop.org/git/harfbuzz to a80fd59e3b3b18116803a14e6369345933994236
Updated Harfbuzz from git+ssh://git.freedesktop.org/git/harfbuzz to a80fd59e3b3b18116803a14e6369345933994236
Fixed memory restrictions not being passed on to elf2e32.
Allow TLW translucency on Symbian without Qt::FramelessWindowHint
Updated UIDs for spectrum demo
Ensure that compiling with the no debug/warning output defines works
Updated Harfbuzz from git+ssh://git.freedesktop.org/git/harfbuzz to f0dcb906fe56b5dc06aa305b6cfc821d5dd25a28
Clean up HB_Anchor's DeviceTables on failure when loading format 3
Make sure ValueRecord's DeviceTables are cleaned up on failure
...
|
| |\
| | |
| | |
| | |
| | |
| | |
| | |
| | | |
Conflicts:
src/3rdparty/phonon/qt7/mediaobject.mm
src/3rdparty/webkit/VERSION
src/3rdparty/webkit/WebCore/ChangeLog
src/plugins/phonon/mmf/mmf.pro
|
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | | |
The defines that can be used are QT_NO_DEBUG_OUTPUT and
QT_NO_WARNING_OUTPUT in order to turn off qDebug and qWarning output.
Reviewed-by: cduclos
Reviewed-by: Markus Goetz
|
| | |\
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | | |
4.6-integration
* '4.6' of scm.dev.nokia.troll.no:qt/qt-s60-public:
Fix QTBUG-8687.
Debug prints and another attempt to fix QTBUG-8687 for N8.
|
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | | |
The fix is based on 9897aece975e0a4a77e0cc6b8590305baba1fccb.
Task-number: QTBUG-8687
Reviewed-by: TrustMe
|
| | | | |
|
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | | |
The case doesn't matter when building on Windows, but does
when cross-compiling on Unix.
Merge-request: 709
Reviewed-by: Andreas Kling <andreas.kling@nokia.com>
|
|/ / /
| | |
| | |
| | | |
Reviewed-by: Markus Goetz
|
|\ \ \
| |/ /
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | | |
src/3rdparty/* is left untouched and not merged from 4.6. The corresponding
changes in Harfbuzz and WebKit are already in the 4.6 staging areas.
Conflicts:
src/3rdparty/webkit/VERSION
src/3rdparty/webkit/WebCore/ChangeLog
src/3rdparty/webkit/WebKit/qt/ChangeLog
src/3rdparty/webkit/WebKit/qt/tests/qgraphicswebview/tst_qgraphicswebview.cpp
src/3rdparty/webkit/WebKit/qt/tests/qwebview/tst_qwebview.cpp
src/3rdparty/webkit/WebKit/qt/tests/qwebview/tst_qwebview.qrc
tests/auto/qtextlayout/tst_qtextlayout.cpp
tests/auto/qwidgetaction/tst_qwidgetaction.cpp
|
| |/
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| | |
If we're connected to a name pipe which is in message mode, we have to
handle the following case: ReadFile() or GetOverlappedResult() return
FALSE and GetLastError() returns ERROR_MORE_DATA.
This just means, that the message didn't fit into the pipe's internal
buffer. We must not handle this as error.
Task-number: QTBUG-11490
Reviewed-by: ossi
|
|\ \ |
|
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | | |
The regression was introduced with 164f347aba7287407615223dc2219a016ebc8248.
As soon as possible we should probably rewrite the fromPath() function,
to have a proper solution.
Nevertheless this might be a bigger change and should not be done
so late in release cycle.
Reviewed-by: TrustMe
|
| | |
| | |
| | |
| | | |
Reviewed-by: Zeno Albisser
|
| |\ \
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | | |
4.7-integration
* '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1: (55 commits)
Fix symbian-abld build failure with bearer plugins
remove certificate bundle
make QSslSocket::systemCaCertificates() use system certs
Adjusted RegExp in QSslCertificate::fromPath()
Fix QSystemTrayIcon::supportsMessages() on Windows
Use NIM_SETVERSION to get the latest behavior
Cleanup obsolete stuff
doc: Added DITA XML generator
Fixed a broken merge.
Changed the way we detect touch screen on Windows.
Fixed error deploying qsymbianbearer.qtplugin on Symbian.
Revert "Attempt to fix build failure on Symbian."
Attempt to fix build failure on Symbian.
Replaced redundant "!contains" scopes in "contains(A, B) {...} !contains(A, B) {...}" constructions with "else"
Updated leading whitespace to make indentation more consistent
Updated project files so it is now possible to use "-system-zlib" configuration option on Windows and Symbian platforms.
make postgresql support sensitive to PSQL_LIBS
support for cross building Qt for MinGW (win32-g++) on Unix
use "win32-g++*" scope to match all MinGW makespecs
Demos: Fix compilation with namespace.
...
|
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | | |
since we now use the system certificates we should
not provide our own certificate bundle anymore.
Patch-by: Zeno Albisser and Peter Hartmann
Reviewed-by: Thiago
Task-number: QTBUG-8833
Task-number: QT-3361
|
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | | |
before, we were shipping our own bundle of CA certificates.
Now we read the certificates from the system CA store.
Patch-by: Zeno Albisser and Peter Hartmann
Reviewed-by: Thiago
Task-number: QTBUG-8833
Task-number: QT-3361
|
| | | |
| | | |
| | | |
| | | |
| | | | |
Reviewed-by: Thiago
Task-number: QTBUG-2706
|
| | | |
| | | |
| | | |
| | | |
| | | | |
Merge-request: 2411
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com>
|