| Commit message (Collapse) | Author | Age | Files | Lines |
|\
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| | |
master-integration
* 'master' of scm.dev.nokia.troll.no:qt/qt-symbian-staging: (25 commits)
Horizontal lines appearing under entered characters
Move qts60plugindeployment rule to correct scope
Skipping tst_QEventLoop::processEventsExcludeSocket for qws
Fixed compile of tst_qscriptextensionplugin on some Windows configurations
QS60Style: Checked state is not shown on highlighted itemview item
Removing unused code after introduction of round robin scheduler
tst_qeventloop runs the event loop to ensure socket messages arrive
Schedule Symbian active objects with a round robin scheduler
Fix the build break for QUrl autotest on Symbian
Fixed def files for WINSCW
Fixed def files for ARMV5
Fix the build break for QStyleSheetStyle autotest on Symbian
Fix bug about daylight saving missing on Symbian platfrom.
Fix the build break caused by the missing parameter for QSKIP macro.
Document the Symbian main window size issue at application start.
QS60Style: icon is not shown correctly in a menu item in all cases
QS60Style: Remove 3.x specific code from style
Fix Coverity issues found from QS60Style
Removed qts60plugin references also from config.profiles
Remove s60 plugin dll from the iby file too.
...
|
| |
| |
| |
| |
| |
| |
| |
| |
| | |
tst_QEventLoop::processEventsExcludeSocket is failing on qws after an
upgrade to that test. It looks most likely to be a qws fault, so a
defect QTBUG-19699 has been raised and this test skipped for qws in the
meantime.
Reviewed-by: Laszlo Agocs
|
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| | |
The debug and release versions of staticplugin are qmake'd with the
same destination directory. This causes the generated staticplugin .prl
file to always refer to the debug versions of Qt libraries, even if Qt
was configured with -release.
The .prl mechanism is not useful for this test, so simply disable it to
solve the problem.
Reviewed-by: ckamm
|
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| | |
Auto test tst_qeventloop assumed that socket messages would be received
within a single call to processEvents(). But this is not necessarily
the case, and in particular with the combination of Symbian round robin
active scheduler and new socket engine. So tst_qeventloop now uses an
event loop to complete the test rather than just a single call to
processEvents().
Task-number: QTBUG-15019
Reviewed-by: brad
|
| |
| |
| |
| |
| |
| | |
This commit fixes the linking problem for QUrl autotest on Symbian
Reviewed by: Guoqing Zhang
|
| |
| |
| |
| |
| |
| | |
This commit fixes the build break on Symbian caused by using Motif style which is not supported in Symbian.
Reviewed by: Sami Merila
|
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| | |
Daylight saving support for QDateTime is missing from Symbian
platform. This is bug fix for QTBUG-6859. This bug was fixed by
commit 2a20705. However, this original fix was removed by 01cf310d2
because of different implementation before S60 5.0 platform. This
fix is re-applied since Qt is not going to support S60 3.x platform.
Task-number: QTBUG-6859
Reviewed-by: Trust Me
|
| |
| |
| |
| |
| |
| | |
This commit fixes the build break caused by the missing parameter for QSKIP macro, introduced in commit 05d8caa4c42b5539d993a898830307c21cb942b6.
Reviewed by: Guoqing Zhang
|
| |\ |
|
| |\ \
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | | |
Conflicts:
src/plugins/s60/src/qcoreapplication_3_1.cpp
src/plugins/s60/src/qcoreapplication_3_2.cpp
src/plugins/s60/src/qdesktopservices_3_1.cpp
src/plugins/s60/src/qdesktopservices_3_2.cpp
src/plugins/s60/src/qlocale_3_1.cpp
src/plugins/s60/src/qlocale_3_2.cpp
|
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | | |
QMetaType::QColorGroup requires QT3_SUPPORT, so skip that in builds
that do not include QT3_SUPPORT.
Task-number: QTBUG-19253
Reviewed-by: TrustMe
|
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | | |
QMetaType::QColorGroup requires QT3_SUPPORT, so skip that in builds
that do not include QT3_SUPPORT.
Task-number: QTBUG-19254
Reviewed-by: Sami Merila
|
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | | |
The debug and release versions of staticplugin are qmake'd with the
same destination directory. This causes the generated staticplugin .prl
file to always refer to the debug versions of Qt libraries, even if Qt
was configured with -release.
The .prl mechanism is not useful for this test, so simply disable it to
solve the problem.
Reviewed-by: ckamm
(cherry picked from commit b761f2e1b323012661a9aeed3873b1e5facb0f11)
|
|\ \ \ \
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | | |
master-integration
* 'master' of scm.dev.nokia.troll.no:qt/qt-earth-staging: (25 commits)
Added some of my Qt 4.8 changes to the changelog
Update bearer startup code in network autotests
symbian socket engine: share ip address conversion code
license header check: fix exception for URL TLD table
QUrl TLD: fix documentation file for "Add QUrl::topLevelDomain() ..."
Add QUrl::topLevelDomain() and move TLD table from QtNetwork to QtCore
fix Symbian ordinals for merge request re. utf8 characters in SSL certs
add auto test for SSL certificates containing utf8 characters
fix coding style for merge request re. utf8 characters in SSL certs
Use OpenSSL X509_NAME_ENTRY API to parse UTF8 subjectName/issuerName
Fix the build for QUuid
Improved performance of the QLocale::name() function.
Optimize QUuid::QUuid(const char *)
QDataStream: speedup steaming of QUuid.
Add QUuid::toRfc4122() and fromRfc4122()
Add QUuid::toByteArray() and relevant
Optimize QUuid::toString() and relevant
Add some autotests and benchmarks for QUuid
tst_qhostinfo: Fix IPv6 lookup detection on Windows.
Fix typo in comment
...
|
| |\ \ \ \ |
|
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | | |
The bearer startup code I added to some of the network autotests to
ensure the network was up before testing caused test failures on some
linux configurations due to there being no default network defined.
I've changed it to follow these steps:
1. update the configuration list & wait for update completed signal
- due to the polling engines not having any config defined on the first
run before the initial poll happens
2. check default configuration is valid before attempting to start it
3a. for valid configuration, start it and wait for started as before
3b. for invalid configuration, fail if bearer is mandatory, otherwise ignore
- on symbian bearer use is "mandatory", on desktop platforms it is optional
Reviewed-by: Markus Goetz
|
| |\ \ \ \ \
| | | |_|_|/
| | |/| | | |
|
| | |\ \ \ \
| | | |_|_|/
| | |/| | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | | |
master-integration
* 'master' of scm.dev.nokia.troll.no:qt/qt-qml-staging:
QDeclarativeDebug: Fix autotest
Pass QList as const reference when possible
Fixed crashes in Observer mode related to infinite bounding rects
Doc
QmlDirParser: Fix typeInfo accessor.
|
| | | |\ \ \ |
|
| | |_|_|/ /
| |/| | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | | |
the file was renamed and moved to corelib
Task-number: QTBUG-13601
|
| |\ \ \ \ \
| | |/ / / / |
|
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | | |
Move Qt's copy of the Mozilla public suffix list from QtNetwork
to QtCore and use it to expose a new API function QUrl::topLevelDomain().
This function returns the section of the url that is a registrar-controlled
top level domain.
QtCore now exports a couple of functions to the other Qt modules: qTopLevelDomain,
a helper function for QUrl::topLevelDomain(); and qIsEffectiveTLD(), a helper
function for QNetworkCookeieJar.
The motivation for this new API is to allow QtWebKit implement a Third-Party
Cookie blocking policy. For this QtWebKit needs to know the element of the url
that is the registry-controlled TLD. Without this knowledge it would end up
blocking third-party cookies per host rather than per registry-controlled domain.
See also https://bugs.webkit.org/show_bug.cgi?id=45455
Merge-request: 1205
Task-number: QTBUG-13601
Reviewed-by: Peter Hartmann <peter.hartmann@nokia.com>
|
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | | |
Task-number: QTBUG-7912
Reviewed-by: Peter Hartmann <peter.hartmann@nokia.com>
|
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | | |
Following the RFC4122, provide the interfaces between QUuid
and QByteArray, they are simpler then toByteArray() and
relevant.
Thanks for the suggestion and brief code from Robin Burchell.
Task-number: QTBUG-19420
Reviewed-by: joao
|
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | | |
Add QUuid::toByteArray() and QUuid(const QByteArray &). Same
behavior with QUuid::toString() and QUuid(const QString &).
Task-number: QTBUG-19419
Reviewed-by: joao
|
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | | |
Missing those functions for optimization.
Reviewed-by: joao
|
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | | |
Moved the QTcpServer test to init winsock before we use getaddrinfo.
Reviewed-by: Shane Kearns
|
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | | |
Also disable tests with std::vector in c++0x as they do not compile
Reviewed-by: Joao
|
| | | | | |
| | | | | |
| | | | | |
| | | | | | |
Reviewed-by: Joao
|
|\ \ \ \ \ \
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | | |
master-integration
* 'master' of scm.dev.nokia.troll.no:qt/oslo-staging-1:
skip the ipv6 Host checking for the moment, since it fails on Windows XP. will fix later
remove duplicate message
fix "Host" header of ipv6 URLs in QNAM
uic: Use QString::fromUtf8 for QUrl properties.
uic: #include <QLayout> for QToolBox on non-laid-out forms.
add test case for ipv6 url parsing
|
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | | |
will fix later
Reviewed-by: Peter Hartmann
|
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | | |
Reviewed-by: Markus Goetz
|
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | | |
Reviewed-by: Thiago
|
| | | | | | | |
|
|\ \ \ \ \ \ \
| | |_|/ / / /
| |/| | | / /
| |_|_|_|/ /
|/| | | | | |
|
| |\ \ \ \ \ |
|
| | |\ \ \ \ \
| | | | |_|_|/
| | | |/| | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | | |
master-integration
* 'master' of scm.dev.nokia.troll.no:qt/qt-symbian-staging:
Increased EPOCHEAPSIZE for qpainter benchmark
Increased EPOCHEAPSIZE for few benchmarks
Update Symbian DEF-files
Improve DEFINES crossplatform compatibility in Symbian builds.
Freezing the QtCore defs again for 4.8.
|
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | | |
Insufficient heap size was causing out-of-memory errors in qpainter
benchmark.
Task-number: QTBUG-17724
Reviewed-by: TrustMe
|
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | | |
Insufficient heap size was causing containers-sequential and
qgraphicsscene benchmarks to panic in Symbian^1 devices.
Task-number: QTBUG-17725
Reviewed-by: Sami Merila
|
| | |\ \ \ \ \
| | | | | | | |
| | | | | | | |
| | | | | | | |
| | | | | | | |
| | | | | | | |
| | | | | | | |
| | | | | | | |
| | | | | | | |
| | | | | | | |
| | | | | | | | |
master-integration
* 'master' of scm.dev.nokia.troll.no:qt/qt-releng-staging:
Re-apply licenseheader text in source files for qt4.8
Updating file with CRLF line endings for the updated header
Update licenseheader text in source files for qt4.8
Updated DEF files for QtGui and QtOpenGl
Updated DEF files for QtGui and QtOpenGL
|
| | | |\ \ \ \ \ |
|
| | | | | | | | |
| | | | | | | | |
| | | | | | | | |
| | | | | | | | |
| | | | | | | | |
| | | | | | | | | |
New files after merged from qt/4.8
Reviewed-by: Trust Me
|
| | | |\ \ \ \ \ \
| | | | | | | | | |
| | | | | | | | | |
| | | | | | | | | |
| | | | | | | | | |
| | | | | | | | | |
| | | | | | | | | |
| | | | | | | | | |
| | | | | | | | | |
| | | | | | | | | |
| | | | | | | | | |
| | | | | | | | | |
| | | | | | | | | | |
Conflicts:
doc/src/examples/wheel.qdoc
src/gui/util/qflickgesture.cpp
src/gui/util/qflickgesture_p.h
src/gui/util/qscroller.cpp
src/gui/util/qscroller.h
src/gui/util/qscroller_p.h
src/gui/util/qscrollerproperties.cpp
src/gui/util/qscrollerproperties.h
tests/auto/qscroller/tst_qscroller.cpp
|
| | | | | | | | | |
| | | | | | | | | |
| | | | | | | | | |
| | | | | | | | | |
| | | | | | | | | | |
This file requires CRLF line terminators to pass the tst_moc test
after a license update.
|
| | | | | | | | | |
| | | | | | | | | |
| | | | | | | | | |
| | | | | | | | | |
| | | | | | | | | |
| | | | | | | | | |
| | | | | | | | | | |
Updated version of LGPL and FDL licenseheaders.
Apply release phase licenseheaders for all source files.
Reviewed-by: Trust Me
|
| | |\ \ \ \ \ \ \ \
| | | |_|_|/ / / / /
| | |/| | | | | | |
| | | | | | | | | |
| | | | | | | | | |
| | | | | | | | | |
| | | | | | | | | | |
master-integration
* 'master' of scm.dev.nokia.troll.no:qt/qt-earth-staging:
Update qhostinfo autotest to expect RFC5952 formatted ipv6 addresses
|
| | | | |_|_|_|/ /
| | | |/| | | | |
| | | | | | | | |
| | | | | | | | |
| | | | | | | | |
| | | | | | | | | |
Test required updating due to ebc134db484eee31491836b619aad1ee86e3070e
Reviewed-by: Martin Petersson
|
| | |\ \ \ \ \ \ \
| | | |/ / / / / /
| | | | | | | | |
| | | | | | | | |
| | | | | | | | |
| | | | | | | | |
| | | | | | | | |
| | | | | | | | |
| | | | | | | | |
| | | | | | | | |
| | | | | | | | | |
master-integration
* 'master' of scm.dev.nokia.troll.no:qt/qt-earth-staging:
Symbian socket: Implement systemProxyForQuery for service networks
tst_q3dns: update test to follow RFC-5952.
Doc: update platform notes on Mac to reflect WA_MacNoCocoaChildWindow (cherry picked from commit b240f8a2ee3b7ff82a389fbf5dfd076792f385e8)
QT_USE_QSTRINGBUILDER to fix source compatibility
Make QHostAddress.toString() follow RFC-5952 for IPv6 address format.
|
| | | |\ \ \ \ \ \
| | | | | |/ / / /
| | | | |/| | | | |
|
| | | |\ \ \ \ \ \ |
|