summaryrefslogtreecommitdiffstats
path: root/tests
Commit message (Collapse)AuthorAgeFilesLines
* Fix event delevery orderOlivier Goffart2011-06-271-0/+75
| | | | | | | | | | | | | | Some functions (such as QObject::moveToThread) did not keep the event ordered by priority. And because qUpperBound is used to add events, that mean new events would not be inserted in order. Task-number: QTBUG19637 Change-Id: I38eb9addb1cdd45b8566e000361ac6e5f1f2c2b8 Reviewed-on: http://codereview.qt.nokia.com/733 Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com> Reviewed-by: Bradley T. Hughes <bradley.hughes@nokia.com> Reviewed-by: Olivier Goffart <olivier.goffart@nokia.com>
* SSL certificate printing: fix auto test for different OpenSSL versionsPeter Hartmann2011-06-223-4/+52
| | | | | | | | | | OpenSSL versions 0.9.8 and 1.0.0 produce slightly different output when dumping a certificate. Change-Id: I2cf27213237a2e1e08f1b0345c29ca2cd441f41c Reviewed-on: http://codereview.qt.nokia.com/555 Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com> Reviewed-by: Martin Petersson <Martin.Petersson@nokia.com>
* IPv4 + IPv6 dual stack socketsShane Kearns2011-06-224-38/+145
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Adds support for binding "dual stack" sockets (via QUdpSocket or QTcpServer). A dual stack socket will accept incoming connections on either IPv4 or IPv6 interfaces. QHostAddress::Any - use this to bind a dual stack socket QHostAddress::AnyIPv6 - use this to bind a socket for IPv6 only QHostAddress::AnyIPv4 - use this to bind a socket for IPv4 only Binding to a specific address rather than one of the "any" addresses is restricting you to a protocol anyway so no behaviour change there. IPv6 sockets were previously dual stack on some OS and v6 only on others Any previously meant IPv4 only This commit implemented & tested on Windows 7, Linux (Ubuntu 10.04) and Mac OS 10.6.7. Windows XP and server 2003 do not support dual stack sockets, even though they can support IPv6. On those versions, QHostAddress::Any will still bind to IPv4 0.0.0.0 (which is also the behaviour anywhere QT_NO_IPV6 is defined) Autotests run: qudpsocket (includes a new test case) qtcpserver (includes a new test case) qtcpsocket qnetworkreply qhostaddress Task-number: QTBUG-17080 Change-Id: Id486677c4f832e18dc0ff1a86c5f5fc422c9eb4f Reviewed-on: http://codereview.qt.nokia.com/421 Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com> Reviewed-by: Thiago Macieira <thiago.macieira@nokia.com> Reviewed-by: Markus Goetz
* Update autotest case after toHtml changeJiang Jiang2011-06-221-1/+1
| | | | | | | | | | | | | | cb760eaef631abd49836ae5c8dc12a61ef5eff0d changed the way we generate HTML for empty blocks. tst_QTextDocument::toHtml has to be updated accordingly. Reviewed-by: Samuel (cherry picked from commit 2701802511d9c09a11212cc37838154245b0c0ca) Change-Id: I0664557f9d74e1aacd46cfcf4cfa2cde4f21a719 Reviewed-on: http://codereview.qt.nokia.com/581 Reviewed-by: Jiang Jiang <jiang.jiang@nokia.com> Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
* Don't attempt to build benchmarks if release-mode Qt is not availableRohan McGovern2011-06-211-2/+4
| | | | | | | | | | | | | | | All of the benchmarks explicitly turn on release mode. This fails on Mac and Windows if Qt is configured as debug-only. It is also possibly misleading on Linux, as compiling the benchmark in release mode does not imply that Qt is compiled in release mode. The results are generally not useful if release mode Qt is not available, so disable them by default in this case. Change-Id: Ifa2bb6ab6412dd360ff9dfb890ace2f51e0eef86 Reviewed-on: http://codereview.qt.nokia.com/549 Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com> Reviewed-by: Jo Asplin <jo.asplin@nokia.com>
* Add an autotest for the conversion of certificates to text.Richard Moore2011-06-212-0/+57
| | | | | | | | | | Loads one of the test certs then compares the result with a known good text version. Change-Id: I3a0d6a7f60ce0f48e0cd8032c9964e9c4217dca7 Merge-request: 2 Reviewed-by: Peter Hartmann <peter.hartmann@nokia.com> Reviewed-on: http://codereview.qt.nokia.com/552
* Fixed compile of autotests for Mac & QPARohan McGovern2011-06-215-6/+6
| | | | | | | | | | Several autotests were assuming that Q_OS_MAC == Mac cocoa port, which caused compile failures when QPA is used. Change-Id: I4480ed815c15b6d9ce83edf0057b7293f2e3ad7e Reviewed-on: http://codereview.qt.nokia.com/533 Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com> Reviewed-by: Morten Johan Sørvig <morten.sorvig@nokia.com>
* Fixed compile of tst_qsettings in debug-only mode on Mac, WindowsRohan McGovern2011-06-211-2/+0
| | | | | | | | | | This test was forcing on release mode, which does not work if the user requested to build Qt in debug mode only, and this affects the library name (as on Mac and Windows). Change-Id: I11111c0ffee11111111111111111111111111111 Reviewed-on: http://codereview.qt.nokia.com/532 Reviewed-by: Jo Asplin <jo.asplin@nokia.com>
* Fix QProcess emitting two started signals on X11Christian Strømme2011-06-201-2/+26
| | | | | | | | | | | | | On X11 QProcess would emit two started signals when calling QProcess::waitForStarted(). We should expect that the private implementation of waitForStarted() should emit the started signal and return true or false appropriately. Task-number: QTBUG-7039 Change-Id: I3d381399ab7a39bf57db03a110fa6747a4fc6a24 Reviewed-by: pending Reviewed-on: http://codereview.qt.nokia.com/331 Reviewed-by: Thiago Macieira <thiago.macieira@nokia.com>
* fix an incorrect OpenMode flags handling in QBuffer::open()Ritt Konstantin2011-06-101-0/+50
| | | | | | | | | | | | | | which leads to absurd statement (QBuffer::open() == !QBuffer::isOpen()) to be true. also treat Truncate as (Truncate | WriteOnly) to satisfy lazy ones Reviewed-by: Joao Merge-request: 2612 (cherry picked from commit 6b91affb9a355e668bc9d06dee580d95230ac63a) Change-Id: I657d4d0a33f7993313fe2a1a8ba408371991717f Reviewed-on: http://codereview.qt.nokia.com/447 Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com> Reviewed-by: Peter Hartmann <peter.hartmann@nokia.com>
* Fix missing empty lines in Qt HTML when displayed in compliant browsersEskil Abrahamsen Blomfeldt2011-06-101-1/+25
| | | | | | | | | | | | | | | | | | | | | When QTextDocument exports HTML, it makes an effort to be compatible with its own importer, hence it has to be compatible with the dialect of HTML which Qt has developed over the years. One incorrect interpretation in Qt is that an empty paragraph is interpreted as an empty line. So if you use a QTextDocument to produce HTML for text where an empty line has been added, this empty line will not be visible when the document is viewed in a compliant browser. The fix is to set the height of the empty paragraph to 1em, so that it will match the current pixel size of the font, thus look the same as a <p><br /></p> but without altering the structure of the document. Reviewed-by: Gunnar (cherry picked from commit f541c78e1bc5b293466b40e6f10496199a4a5d73) Change-Id: Ic0eae2c81609b8872eb2eb9344a3ec416cd09149 Reviewed-on: http://codereview.qt.nokia.com/445 Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com> Reviewed-by: Eskil Abrahamsen Blomfeldt <eskil.abrahamsen-blomfeldt@nokia.com>
* tst_qnetworkreply: Fix divide by zero crash on MacOS XShane2011-06-101-1/+1
| | | | | | | Change-Id: Ie1b6d5aa25a745eb6c16041151141efe99c051aa Reviewed-on: http://codereview.qt.nokia.com/422 Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com> Reviewed-by: Martin Petersson <Martin.Petersson@nokia.com>
* Allow selecting fonts with irregular style namesJiang Jiang2011-06-091-0/+13
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fonts like "Helvetica Neue UltraLight" or "Skia Regular Black Condensed" can't be selected in Qt because either they don't report correct numeric values for weight/stretch/etc. or these values are not mapped from QFont enums in a linear way. Thus we provide a shortcut to select these fonts with PostScript name or full name without resorting to family name matching in QFontDatabase (these fonts are not registered in font database anyway). After this, we can simply use: QFont font("Helvetica Neue"); font.setStyleName("UltraLight"); to select these fonts. QCoreTextFontEngineMulti matched like this can be created directly from the CTFontRef instance instead of creating from the font name, making this process faster. The commit also cleaned up the font loading process in Mac font database a bit, moving the code for family matching into a separate function. Add QFontInfo::styleName() and QRawFont::styleName() to access the resolved style name for a font. Task-number: QTBUG-19366 Change-Id: Iad07768c02ed06cc8d6b7395dec554384f410506 Reviewed-on: http://codereview.qt.nokia.com/333 Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com> Reviewed-by: Jiang Jiang <jiang.jiang@nokia.com>
* Add tilde (both ~ and ~<user>) expansion to QFileDialog on UNIX.Pierre Rossi2011-06-081-0/+39
| | | | | | | | Task-number: QTBUG-3265 Change-Id: Id8062afe69e798e1f9cf3f4e967ae0d30c362b72 Reviewed-on: http://codereview.qt.nokia.com/411 Reviewed-by: Pierre Rossi <pierre.rossi@gmail.com>
* Fix regression that caused waitForXXX(-1) to fail.Thiago Macieira2011-06-072-4/+47
| | | | | | | | | | | | | | | | | | | Regression was introduced by 8d4cd52b6981a4e6deea7fdb77f56e40c4f3e6ba when it failed to check when msecs == -1. This manifested visibly in KDE failing to connect to any SSL site -- kioslaves are synchronous and use waitForXXX(-1) (in this particular case, waitForEncrypted, which calls waitForReadyRead). Also, take the opportunity to convert these tests in QTcpSocket to use port 80 (a defined service in the test server) instead of port 22. Reviewed-by: Martin Petersson (cherry picked from commit cb5b6799333794496269aa7e6515f96c2ac96d37) Change-Id: I256a1e138e43fd45844976fe84cd2bc938552e47 Reviewed-on: http://codereview.qt.nokia.com/359 Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com> Reviewed-by: Peter Hartmann <peter.hartmann@nokia.com>
* Add function QGlyphRun::setRawData()Eskil Abrahamsen Blomfeldt2011-06-071-0/+79
| | | | | | | | | | | | | | | | | | | | | | | | | | To provide an optimized way of constructing QGlyphRun objects with no copying or allocation, we add function setRawData() (naming inspired by QByteArray::setRawData()). Data retrieved from QRawFont can be passed directly into this. The logic is now that the data pointers in QGlyphRunPrivate should always point to the current valid data and is what will be used in comparisons and drawing calls. The vectors are optimizations to avoid unnecessary copying if the user wants to use the QVector based API (which makes it easier to manage the memory.) This reflected in the functions that return QVectors, which will return the stored vector if and only if it is identical to the current pointer. Otherwise we will have to copy the memory. The internal addition operators in QGlyphRun have been removed since they really provide no real optimization and have an unclear definition if the two glyph runs are based on different fonts. Reviewed-by: Jiang Jiang (cherry picked from commit 86d88c5b719fd3d50336d9d8e7127b8045ee82ae) Change-Id: Id5bb55ee3d93afb32ffca850f53382e856df7b3e Reviewed-on: http://codereview.qt.nokia.com/342 Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com> Reviewed-by: Eskil Abrahamsen Blomfeldt <eskil.abrahamsen-blomfeldt@nokia.com>
* Disable trying to compile network tests which require QtScriptMarius Storm-Olsen2011-06-062-3/+2
| | | | | | | | | | Those tests should be moved to QtScript/tests/auto Change-Id: Icc0c50ef35ac08e604ab18cb87b0c2b19f2fc72c Reviewed-on: http://codereview.qt.nokia.com/197 Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com> Reviewed-by: Markus Goetz Reviewed-by: Liang Qi <liang.qi@nokia.com>
* Correct QStaticText tests after recent changesJiang Jiang2011-06-041-2/+2
| | | | | | | | | | | Raster engine on Mac now correctly handles transformation, so no need to XFAIL anymore. Also fixes a drawStaticText origin mistake, the y origin should be the top left point rather than the baseline. Change-Id: I6058e7099b336d9d5a6586344a07be3c7d76fb64 Reviewed-on: http://codereview.qt.nokia.com/329 Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com> Reviewed-by: Jiang Jiang <jiang.jiang@nokia.com>
* Add basic static text drawing capability to lanceJiang Jiang2011-06-033-0/+143
| | | | | | | | Task-number: QTBUG-17514 Change-Id: Ife7cd8f940424d805f634ca190bcbf6fd83d8682 Reviewed-on: http://codereview.qt.nokia.com/321 Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com> Reviewed-by: aavit <qt_aavit@ovi.com>
* tst_qnetworkreply: add a test for http abort.Martin Petersson2011-06-011-6/+52
| | | | | | | Change-Id: Iec5fe195ff2befe92e759f77768240728bef31bd Reviewed-on: http://codereview.qt.nokia.com/302 Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com> Reviewed-by: Markus Goetz
* Support placing cursor in ligature with mouse or touchJiang Jiang2011-05-301-0/+25
| | | | | | | | | | | | | | | | | We need to find out the closest element in the ligature to the point we clicked (or tapped), currently we do this by dividing the width of that ligature glyph evenly by the number of characters it covered. We only support Common and Greek script at this point, ligatures in other scripts are still handled as a whole. Task-number: QTBUG-19260 Reviewed-by: Eskil (cherry picked from commit 5338d78aa9d80ddd2bcb21e6b22cd2cf1522a7d3) Change-Id: Ic747e9458d561aca0848dcd1e8b94e0a23fd8189 Reviewed-on: http://codereview.qt.nokia.com/196 Reviewed-by: Jiang Jiang <jiang.jiang@nokia.com>
* Fix ligature offset in multi-line textJiang Jiang2011-05-271-0/+17
| | | | | | | | | Reviewed-by: Eskil (cherry picked from commit 278cf1f37945050c4a46d5acab0659f3a7546a43) Change-Id: Ice20aa38a49ea16cf56bd3705c7d400ee165a9c2 Reviewed-on: http://codereview.qt.nokia.com/195 Reviewed-by: Jiang Jiang <jiang.jiang@nokia.com>
* Add QUuid::toRfc4122() and fromRfc4122()Liang Qi2011-05-272-0/+34
| | | | | | | | | | | | | | | | 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 (cherry picked from commit 06873e467d98ad60d827afae29500bf2ff783c03) Change-Id: I4623ae3363f1d5affa45de73fac616bb67a9eaa1 Reviewed-on: http://codereview.qt.nokia.com/168 Reviewed-by: Liang Qi <liang.qi@nokia.com>
* Add QUuid::toByteArray() and relevantLiang Qi2011-05-272-0/+38
| | | | | | | | | | | | | Add QUuid::toByteArray() and QUuid(const QByteArray &). Same behavior with QUuid::toString() and QUuid(const QString &). Task-number: QTBUG-19419 Reviewed-by: joao (cherry picked from commit 71f923f29e2c60444a85fc765fc582e06cb7eca4) Change-Id: I41dad65e269f739ba9ec1c27e9da96af6401356c Reviewed-on: http://codereview.qt.nokia.com/167 Reviewed-by: Liang Qi <liang.qi@nokia.com>
* Fix a regression in QList::mid()Liang Qi2011-05-271-0/+3
| | | | | | | | | | | | It doesn't need to copy anything when pos is after size(). Task-number: QTBUG-19164 Reviewed-by: Oswald Buddenhagen (cherry picked from commit 8befc4982a32752e48c82cacbed045e7336a3569) Change-Id: Iccac75842616f0d41e457e844a15d1a3ccfeb642 Reviewed-on: http://codereview.qt.nokia.com/164 Reviewed-by: Liang Qi <liang.qi@nokia.com>
* Add some autotests and benchmarks for QUuidLiang Qi2011-05-272-2/+152
| | | | | | | | | | | Missing those functions for optimization. Reviewed-by: joao (cherry picked from commit 4e9286880fd2686e61de2c4be3c317e01f0d9989) Change-Id: I147e028f10cec7abc545dcbcca911d39a89d830e Reviewed-on: http://codereview.qt.nokia.com/165 Reviewed-by: Liang Qi <liang.qi@nokia.com>
* tests: fixed compile of tst_macguiRohan McGovern2011-05-271-0/+2
| | | | | | | | This test uses private headers. Mark it as such. Change-Id: Icb6463629e1414b9da5403d0e0d766d8a113bd57 Reviewed-on: http://codereview.qt.nokia.com/160 Reviewed-by: Jason McDonald <jason.mcdonald@nokia.com>
* tests: fixed compilation of qstring benchmark on macRohan McGovern2011-05-271-2/+7
| | | | | | | | | | | | | On Mac, MAP_ANONYMOUS and MAP_POPULATE are not defined. Fix MAP_ANONYMOUS by defining it to MAP_ANON. Fix MAP_POPULATE by removing it, because its usage was unnecessary in this code (the page was explicitly faulted in a few lines later anyway). Change-Id: Iead82e1a949b35fe3c304d38babac8d4dc6f0769 Reviewed-on: http://codereview.qt.nokia.com/162 Reviewed-by: Jason McDonald <jason.mcdonald@nokia.com>
* Use "QT += testlib" consistentlyJason McDonald2011-05-276-31/+2
| | | | | | | | | | If a project uses "load(qttest_p4)" it doesn't need to add testlib to the CONFIG or QT variables. If a project does not use "load(qttest_p4)", it should add "testlib" to the QT variable. Change-Id: If28353713ccdfe13612682e3e88dadebe2f2eefd Reviewed-on: http://codereview.qt.nokia.com/159 Reviewed-by: Rohan McGovern <rohan.mcgovern@nokia.com>
* Fix infinite recursion when changing geometry on MacGabriel de Dietrich2011-05-261-0/+14
| | | | | | | | | | | | Some complex widgets might get a negatively sized rectangle when calling QWidgetPrivate:setGeometry_sys_helper(), triggering a infinite recursion. Normalizing the rectangle size before checking for size change is enough to break this infinite recursion. Task-number: QTBUG-17333 Change-Id: I4682c3088ea53fb9f28f746c8264f573b5284825 Reviewed-on: http://codereview.qt.nokia.com/156 Reviewed-by: Olivier Goffart <olivier.goffart@nokia.com>
* Support of lambdas in QtConcurrent::runOlivier Goffart2011-05-261-0/+67
| | | | | | | | Reviewed-by: Joao (cherry picked from commit 917f2ff617209bcc283eb3590b422bcf239c0537) Change-Id: I837f18f043b18410c1d93b9f1156acf729dad510 Reviewed-on: http://codereview.qt.nokia.com/142 Reviewed-by: Olivier Goffart <olivier.goffart@nokia.com>
* Tests for QtConcurrent::map using lambdasOlivier Goffart2011-05-261-0/+21
| | | | | | | | | | Also disable tests with std::vector in c++0x as they do not compile Reviewed-by: Joao (cherry picked from commit 38d1b31006ecc83811bbb13e5a4182eac593a970) Change-Id: I837f18f043b18410c1d93b9f1156acf729dad510 Reviewed-on: http://codereview.qt.nokia.com/144 Reviewed-by: Olivier Goffart <olivier.goffart@nokia.com>
* Fix instability in QNetworkConfigurationManager autotestShane Kearns2011-05-261-2/+4
| | | | | | | | | | | | | | | QThread::isFinished() can return false after the finished() signal is emitted, so test the event loop's timeout() function instead. Don't compare prescan configurations, as these may be cached by the OS. It was causing the test to fail on linux if run before any other network test. Reviewed-by: mread (cherry picked from commit e2320ec17446dc6e851fcf4ea2d998177b0d8049) Change-Id: I35d67294871a35e2e63619f4acb0c3c32caa5eea Reviewed-on: http://codereview.qt.nokia.com/137 Reviewed-by: Markus Goetz
* Update qhostinfo autotest to expect RFC5952 formatted ipv6 addressesShane Kearns2011-05-261-6/+6
| | | | | | | | | | | Test required updating due to ebc134db484eee31491836b619aad1ee86e3070e Reviewed-by: Martin Petersson (cherry picked from commit e46e32644720f0ddeb553b8a658c1711a4b5cdfb) Change-Id: Idf3df633534a0d914bd22fd589a8c521eb426bc8 Reviewed-on: http://codereview.qt.nokia.com/139 Reviewed-by: Markus Goetz
* fix "Host" header of ipv6 URLs in QNAMshiroki2011-05-261-9/+9
| | | | | | Change-Id: I6bf3320e5ab285e3d1f4d72bd1ef0a0e42813e5b Reviewed-on: http://codereview.qt.nokia.com/115 Reviewed-by: Markus Goetz
* Remove the redundant QTEST_ACCESSIBILITY define.Jason McDonald2011-05-261-13/+0
| | | | | | | | | | | | | QTEST_ACCESSIBILITY was always defined and only used in one autotest. Code that uses accessibility features should be excluded if Qt was built without accessibility rather than based on a define in the test framework. Change-Id: I3a517a579a51f536a0983b43bd99e86292026552 Reviewed-by: pending Reviewed-on: http://codereview.qt.nokia.com/129 Reviewed-by: Morten Johan Sørvig <morten.sorvig@nokia.com> Reviewed-by: Rohan McGovern <rohan.mcgovern@nokia.com>
* Merge branch 'master' of git://scm.dev.nokia.troll.no/qt/qtbase-stagingQt Continuous Integration System2011-05-251097-18847/+18847
|\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * 'master' of git://scm.dev.nokia.troll.no/qt/qtbase-staging: (21 commits) Fixed line endings. Update licenseheader text in source files for qtbase Qt module New configure.exe binary Add -qpa option on Windows Use qglobal.h's VERSION number instead of hardcoded current version More examples adjusted to Symbian and Maemo5. (cherry picked from commit a97b9620a584c9b1a2e006873183526b3d7e001e) Doc: Added some details to the accessibility events API documentation. Doc: Fixed qdoc warnings. Doc: Fixed qdoc warnings. Doc: Made an additional change for clarity. Doc: Noted that the example will not work as expected with a mouse. Doc: Fixed qdoc warnings. Doc: Applying a pending change from previous merges. Doc: Fixed qdoc warning. Doc: Fixed qdoc warnings. Doc: Applied pending fixes to API documentation. Doc: Various fixes to documentation, some based on changes in master. Doc: Added missing project and desktop files. Doc: Documented the value returned when no field can be found. Squashed commit of changes from the 4.8-temp branch. ...
| * Update licenseheader text in source files for qtbase Qt moduleJyri Tahtela2011-05-241097-18847/+18847
| | | | | | | | | | | | | | Updated version of LGPL and FDL licenseheaders. Apply release phase licenseheaders for all source files. Reviewed-by: Trust Me
* | Merge branch 'master' of git://scm.dev.nokia.troll.no/qt/qtbase-earth-stagingQt Continuous Integration System2011-05-243-3/+29
|\ \ | | | | | | | | | | | | | | | | | | * 'master' of git://scm.dev.nokia.troll.no/qt/qtbase-earth-staging: QUrl auto test: include core-private headers QUrl TLD: fix documentation file for "Add QUrl::topLevelDomain() ..." Add QUrl::topLevelDomain() and move TLD table from QtNetwork to QtCore
| * | QUrl auto test: include core-private headersPeter Hartmann2011-05-241-1/+1
| | | | | | | | | | | | | | | | | | ... for the newly introduced TLD test. Task-number: QTBUG-13601
| * | Add QUrl::topLevelDomain() and move TLD table from QtNetwork to QtCoreRobert Hogan2011-05-242-2/+28
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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> (cherry picked from commit 154402f56dcf8303a6ce601a52215226af8d31ba)
* | | Merge branch 'master' of git://scm.dev.nokia.troll.no/qt/qtbase-earth-stagingQt Continuous Integration System2011-05-244-5/+58
|\| | | |/ |/| | | | | | | | | * 'master' of git://scm.dev.nokia.troll.no/qt/qtbase-earth-staging: 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
| * add auto test for SSL certificates containing utf8 charactersPierre Rossi2011-05-234-5/+58
| | | | | | | | | | | | Task-number: QTBUG-7912 Reviewed-by: Peter Hartmann <peter.hartmann@nokia.com> (cherry picked from commit 19c77b5e5e5fefedafcfbd587c3fbb4114d7c641)
* | Add task numbers for disabled autotestsJason McDonald2011-05-231-2/+2
| | | | | | | | | | Change-Id: I830cdbf60ad1edf554b19cd7e6fdbd459f3e160f Reviewed-by: Trust Me
* | Fix inconsistency between Qt and ICU in Shift-JIS codec with regards to ↵Simon Hausmann2011-05-201-0/+15
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | ASCII range Qt's Shift-JIS codec maps the characters 0x5c and 0x7e to unicode yen (0x5a) and unicode overline (0x203e). ICU and (as it turns out) Symbian's native Shift-JIS codec preserve 0x5c and 0x7e when converting to Unicode. Qt's behaviour creates a problem when loading japanese web sites that are encoded in Shift-JIS. When they reference external JavaScript files, those tend to inherit the current page encoding (unless the character set is explicitly specified). Consequently JavaScript tends to contain regular expressions (as a built-in feature of the language), which in turn uses backslashes for escape sequences. Therefore it is crucial that the encodings used to decode the script preserve the ASCII range, i.e. do not convert 0x5c (ascii backslash) to something else. This patch corrects the behaviour of Qt's Shift-JIS codec to leave all characters < 0x80 unaltered in the process of conversion to and from Unicode. Task: QTBUG-19335 Reviewed-by: Lars Knoll <lars.knoll@nokia.com> (cherry picked from commit 8e321cd869da7ff1cf0168da41aa0246b44867cc)
* | add test case for ipv6 url parsingshiroki2011-05-201-4/+53
| | | | | | | | | | Reviewed-by: Thiago (cherry picked from commit fd043eb78212de5935bc101624818070e1b4fb1b)
* | Merge branch 'master' of git://scm.dev.nokia.troll.no/qt/qtbase-stagingQt Continuous Integration System2011-05-202-24/+30
|\ \ | | | | | | | | | | | | | | | | | | * 'master' of git://scm.dev.nokia.troll.no/qt/qtbase-staging: tst_qhostinfo: Fix IPv6 lookup detection on Windows. Fix incorrect hardware address on systems without getifaddrs() Make QHostAddress.toString() follow RFC-5952 for IPv6 address format.
| * | tst_qhostinfo: Fix IPv6 lookup detection on Windows.Martin Petersson2011-05-201-7/+7
| | | | | | | | | | | | | | | | | | | | | Moved the QTcpServer test to init winsock before we use getaddrinfo. Reviewed-by: Shane Kearns (cherry picked from commit 0ccf01368adcabbb25958a55976083f72116a2d5)
| * | Make QHostAddress.toString() follow RFC-5952 for IPv6 address format.Martin Petersson2011-05-201-17/+23
| | | | | | | | | | | | | | | | | | Task-number: QTBUG-18426 Reviewed-by: Peter Hartmann (cherry picked from commit ebc134db484eee31491836b619aad1ee86e3070e)
* | | Merge branch 'master' of git://scm.dev.nokia.troll.no/qt/qtbase-stagingQt Continuous Integration System2011-05-205-5/+5
|\| | | | | | | | | | | | | | * 'master' of git://scm.dev.nokia.troll.no/qt/qtbase-staging: Allow arthur tests to use private headers.
generated by cgit v1.2.3 (git 2.25.1) at 2024-05-06 05:07:00 +0000