summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Fix comparison of absolute, unclean paths in QDirShane Kearns2011-09-025-1/+78
| | | | | | | | | | | | | | QDir::operator== was creating a clean absolute path for comparison purposes if the original path was relative. However original absolute paths were trusted, even though they could be unclean. Now they are checked for cleanliness first. Task-Number: QTBUG-19995 Task-Number: QTBUG-20495 Change-Id: I047a1a40ae5151e4604085e4ac87f30a4e4979c4 Reviewed-on: http://codereview.qt.nokia.com/4099 Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com> Reviewed-by: Prasanth Ullattil <prasanth.ullattil@nokia.com>
* qssl: add auto test to QSsl::Opaque QSslKeysCorentin Chary2011-09-023-2/+43
| | | | | | | | | | | Also export two symbols for auto tests since opaque keys need EVP_PKEY * created by openssl. Change-Id: Ib7801ddfceb259de7291bfaa5940df87f68af97d Merge-request: 48 Reviewed-by: Peter Hartmann <peter.hartmann@nokia.com> Reviewed-on: http://codereview.qt.nokia.com/4011 Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
* Remove circular dependency in testlib loggingJason McDonald2011-09-022-2/+2
| | | | | | | | | | | | Remove one of the circular dependencies between QPlainTestLogger and QTestLog by directly checking whether we're writing to stdout rather than inferring the same by examining whether the output file name is null. Change-Id: I798288482c9e2e071e17a8622e8a8f8d5016dc7e Reviewed-on: http://codereview.qt.nokia.com/4052 Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com> Reviewed-by: Rohan McGovern <rohan.mcgovern@nokia.com>
* test: removed bogus CONFIG+=debug in qdiriterator benchmarkRohan McGovern2011-09-011-2/+0
| | | | | | | | | | This doesn't make sense, none of the other benchmarks do it, and it breaks compilation for a release-only mac build. Change-Id: I3bc73f670688d413afcae7fa88bab19f7b3dac33 Reviewed-on: http://codereview.qt.nokia.com/4017 Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com> Reviewed-by: Jason McDonald <jason.mcdonald@nokia.com>
* test: removed bogus CONFIG+=debug for badxml selftestRohan McGovern2011-09-011-1/+0
| | | | | | | | | | This appears to serve no purpose. It was probably copy-pasted from assert.pro. Change-Id: Ie3d9605b969ee11f2d64c1ac3e480e9efb862a3c Reviewed-on: http://codereview.qt.nokia.com/4016 Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com> Reviewed-by: Jason McDonald <jason.mcdonald@nokia.com>
* test: fixed `assert' selftest for release-only mac buildsRohan McGovern2011-09-012-2/+4
| | | | | | | | | | | | | | | | | | | | This test intentionally crashes itself by using Q_ASSERT. Since Q_ASSERT is a no-op in release builds, the .pro file was attempting to always force debug mode for this project. However, on platforms where debug vs release affect linkage (e.g. mac and windows), this is invalid. On these platforms, debug mode can't be enabled unless debug versions of the Qt libraries are available, which they are not if Qt is configured with `-no-debug-and-release -release'. Use a different method to ensure that Q_ASSERT really asserts, for both debug and release builds. Change-Id: I13eea2c72c77a0a981850dbcaa77f65f147c8490 Reviewed-on: http://codereview.qt.nokia.com/4015 Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com> Reviewed-by: Jason McDonald <jason.mcdonald@nokia.com>
* Try to ensure that QT_ARCH is always set when configuring v8Kent Hansen2011-09-011-0/+7
| | | | | | | | | | | | | | | | | | This is a workaround for QTBUG-21224. For v8 we want to use QT_ARCH as the primary variable for detecting the target platform. Unfortunately, QT_ARCH isn't set when v8.pro is parsed using fromfile() from within another .pro file (namely src/src.pro). qt_config seems to be the bare minimum that's needed to get qconfig.pri (which sets QT_ARCH and friends) loaded. Change-Id: Ideb713724b98dd100560eaf6d7be39df9a22a71e Reviewed-on: http://codereview.qt.nokia.com/4094 Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com> Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com> Reviewed-by: Marius Storm-Olsen <marius.storm-olsen@nokia.com>
* omit unassigned (and too recent) codepoints from the text Normalization processRitt Konstantin2011-09-012-6/+14
| | | | | | | | | | | | | | | http://www.unicode.org/reports/tr15/#Guaranteeing_Process_Stability: > handle any code points that were not defined in the earlier version > as if they were unassigned: such code points will not decompose or compose, > and their Canonical_Combining_Class value will be zero. since QChar::Unicode_Unassigned value is 0, it's less than any other QChar::UnicodeVersion value and must ba handled explicitly Change-Id: I6df025b4173d407660adae77ec5eeb98d15cb8ce Reviewed-on: http://codereview.qt.nokia.com/4084 Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com> Reviewed-by: Lars Knoll <lars.knoll@nokia.com>
* Add option to compare to different platform in lancelot autotestaavit2011-09-018-74/+141
| | | | | | | | | | | | | (cherry picked from commit b6b160d9ba1e0a5f1fbd67112f8c78ba48e7cad7) Conflicts: tests/baselineserver/src/baselineserver.cpp Change-Id: Ie8bdff26b8394bb6a5b6b48225b20833dbee0637 Reviewed-on: http://codereview.qt.nokia.com/4082 Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com> Reviewed-by: Jiang Jiang <jiang.jiang@nokia.com>
* Check for V8 when auto-enabling Declarative moduleKent Hansen2011-09-011-1/+1
| | | | | | | | | | Declarative no longer used QtScript, it uses V8. This check in the configure script was stale. Change-Id: I3c598c0343fc421fdd191a256e07eaa6f4e80058 Reviewed-on: http://codereview.qt.nokia.com/4077 Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com> Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
* Don't build v8 when -no-v8 is passed to configureKent Hansen2011-09-011-1/+1
| | | | | | | | | | | When v8 is enabled, QT_CONFIG contains "v8". There is no "no-v8", meaning that v8 was built regardless. Change-Id: I66740b23e5f7cae80740576ea0f13c3ad2f9ad40 Reviewed-on: http://codereview.qt.nokia.com/4073 Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com> Reviewed-by: Marius Storm-Olsen <marius.storm-olsen@nokia.com>
* Rename the private helper function QList::free() to QList::dealloc()Bradley T. Hughes2011-09-011-7/+6
| | | | | | | | | | As the comment suggests, renaming this function avoids confusion with libc's free(). Change-Id: Ia077b92c947d81ef9d78de940a1cd8ed022edb3c Reviewed-on: http://codereview.qt.nokia.com/4063 Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com> Reviewed-by: Samuel Rødal <samuel.rodal@nokia.com>
* Remove declarations for QListData functions removed by 36c29abBradley T. Hughes2011-09-012-6/+2
| | | | | | | | | | | | | This commit removed the function implementations, but not the declarations. This removes QListData::append2(T) but moves the optimized QListData::append2(T) implementation to QListData::append(T) Change-Id: I39b6dea31420a7cefe079b94a91a96eb16000d2a Reviewed-on: http://codereview.qt.nokia.com/4062 Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com> Reviewed-by: Samuel Rødal <samuel.rodal@nokia.com>
* Update license headersGabriel de Dietrich2011-09-013-54/+57
| | | | | | | | | | | | This ammends commit 9aeadca09ab4e27ebf299873f90490d585b4fb7f Reviewed-by: Frederik Gladhorn Merge-request: 1254 (cherry picked from commit eee351a2af7e34dfc851a95820075842f856a8f2) Change-Id: Idd83457f87fea063843f8eaa47287531de7eb854 Reviewed-on: http://codereview.qt.nokia.com/4057 Reviewed-by: Frederik Gladhorn <frederik.gladhorn@nokia.com>
* Fix various trivial formatting issues.Jason McDonald2011-09-0119-101/+96
| | | | | | Change-Id: Ifa2a2dd2aa26dab178ec1334376db42fc3ebb355 Reviewed-on: http://codereview.qt.nokia.com/4029 Reviewed-by: Rohan McGovern <rohan.mcgovern@nokia.com>
* Remove QXmlTestLogger constructor default paramJason McDonald2011-09-011-1/+1
| | | | | | | | | This class is never constructed with the parameter defaulted. Change-Id: If9c3f6562da1e48635a9cf5332bee7e9641255fa Reviewed-on: http://codereview.qt.nokia.com/4021 Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com> Reviewed-by: Rohan McGovern <rohan.mcgovern@nokia.com>
* Fix inclusion of .qmake.cache for modules with config tests.Aaron McCarthy2011-09-011-3/+10
| | | | | | | | | | | | | | | | | Qt modules with config tests generate a module level .qmake.cache with the results of the config tests. The existance of this file prevents qmake from walking up the directory tree and finding the Qt global cache file. This results in the system build not working as expected. For example running 'make' in the module would only build the contents of src and skip tests and examples. Fixed by adding a include statement to the end of the config test generated .qmake.cache. Change-Id: I68a5f2a96f4ee02076b6457ae085f45d894cd4ed Reviewed-on: http://codereview.qt.nokia.com/3830 Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com> Reviewed-by: Michael Goddard <michael.goddard@nokia.com>
* Simplify qtestlib logging code, part 3Jason McDonald2011-09-017-266/+37
| | | | | | | | Collapse the QTestBasicStreamer class into QTestXunitStreamer. Change-Id: I349b8db432fd45f9352084f60b36b460f3b61f6a Reviewed-on: http://codereview.qt.nokia.com/3925 Reviewed-by: Rohan McGovern <rohan.mcgovern@nokia.com>
* Simplify qtestlib logging code, part 2Jason McDonald2011-09-018-29/+29
| | | | | | | | | Rename the QTestLogger class to QXunitTestLogger. Change-Id: I7b93f9de4f4744e53997ccc001a745c36f375599 Reviewed-on: http://codereview.qt.nokia.com/3924 Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com> Reviewed-by: Rohan McGovern <rohan.mcgovern@nokia.com>
* Simplify qtestlib logging code, part 1Jason McDonald2011-09-0112-678/+46
| | | | | | | | | | | | | | | | | | | | | | | | | | | Both the old and new XML loggers produce the Complete and Light XML log formats, while only the new logger produces Xunit XML logs. The disadvantage of the new logger is that it is more complex and doesn't produce a partial log if the test fails to terminate gracefully. This behaviour arises because Xunit format output cannot be written correctly until all tests have been executed. This commit removes the Complete and Light XML formats from the new logger, using the old logger to produce those formats and the new logger to produce only Xunit XML. Prior to this commit, the qtestlib selftests demonstrate that the old and new loggers produce identical output for Complete and Light XML. This commit also removes the undocumented -flush command-line option, which was used rather obscurely to select between the old and new loggers. The newer logger will be renamed to QXunitTestLogger in a subsequent commit. Change-Id: Id304f5b411bdd520409ee233f6bc34e8917942ab Reviewed-on: http://codereview.qt.nokia.com/3923 Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com> Reviewed-by: Rohan McGovern <rohan.mcgovern@nokia.com>
* qssl: add support for QSsl::Opaque keyCorentin Chary2011-08-315-15/+61
| | | | | | | | | | | This allow to use directly EVP_PKEY * with QSslKey (for example comming from a PKCS#11 dongle). Change-Id: Icb1ba5081506a831ec3d8cfffe13ce70939608ea Merge-request: 48 Reviewed-by: Peter Hartmann <peter.hartmann@nokia.com> Reviewed-on: http://codereview.qt.nokia.com/4010 Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
* Add src/v8/qtv8version.h to .gitignoreBradley T. Hughes2011-08-311-0/+1
| | | | | | | Change-Id: I3e63a3b7cfc06ea4b71c55c1530433438c902aa7 Reviewed-on: http://codereview.qt.nokia.com/3979 Reviewed-by: Lars Knoll <lars.knoll@nokia.com> Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
* Fix build with Clang for libpng versions 1.4.0 to 1.5.2Tor Arne Vestbø2011-08-311-0/+23
| | | | | | | | | | | | | | | | | | | | | Versions 1.4.0 to 1.5.2 of libpng declare png_longjmp_ptr to have a noreturn attribute if PNG_PEDANTIC_WARNINGS_SUPPORTED is enabled, but most declarations of longjmp in the wild do not add this attribute. This causes problems when the png_jmpbuf macro expands to calling png_set_longjmp_fn with a mismatched longjmp, as compilers such as Clang will treat this as an error. To work around this we override the png_jmpbuf macro to cast longjmp to a png_longjmp_ptr. See also http://llvm.org/bugs/show_bug.cgi?id=10338 Reviewed-by: Simon Hausmann <simon.hausmann@nokia.com> Reviewed-by: Marius Storm-Olsen <marius.storm-olsen@nokia.com> Change-Id: I197cfa12af76410310e409bc0fce7d4332ee66a6 Reviewed-on: http://codereview.qt.nokia.com/3929 Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com> Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com>
* Introduce menubar plugin systemAurélien Gâteau2011-08-314-1/+42
| | | | | | | | | | Merge-request: 1254 Reviewed-by: Gabriel de Dietrich <gabriel.dietrich-de@nokia.com> (cherry picked from commit 31ff55bbeb84f10e75e997c75a63deda83e62507) Change-Id: I0644514299c16cabe19d1e6d024dd652b2d7bc4e Reviewed-on: http://codereview.qt.nokia.com/3933 Reviewed-by: Gabriel de Dietrich <gabriel.dietrich-de@nokia.com>
* Introduce QAbstractPlatformMenuBarAurélien Gâteau2011-08-316-11/+457
| | | | | | | | | | Merge-request: 1254 Reviewed-by: Gabriel de Dietrich <gabriel.dietrich-de@nokia.com> (cherry picked from commit 9aeadca09ab4e27ebf299873f90490d585b4fb7f) Change-Id: Ib0f035ac15ad0cc6be52807e8101f5dcfb5b041b Reviewed-on: http://codereview.qt.nokia.com/3932 Reviewed-by: Gabriel de Dietrich <gabriel.dietrich-de@nokia.com>
* Hide Q<Platform>MenuActionAurelien Gateau2011-08-315-10/+10
| | | | | | | | | | | | | | This will help abstracting the platform specific parts of QMenuBarPrivate in a common interface. Merge-request: 1254 Reviewed-by: Gabriel de Dietrich <gabriel.dietrich-de@nokia.com> (cherry picked from commit 68d633cc840c5526a0ad77985404f53ada6ba91a) Change-Id: I733b8dfb71ae0dc78536cfe48b466394206d1de3 Reviewed-on: http://codereview.qt.nokia.com/3931 Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com> Reviewed-by: Gabriel de Dietrich <gabriel.dietrich-de@nokia.com>
* Fix warning about initialization orderAurélien Gâteau2011-08-311-3/+3
| | | | | | | | | | | Merge-request: 1254 Reviewed-by: Gabriel de Dietrich <gabriel.dietrich-de@nokia.com> (cherry picked from commit b4ddcbbf1ce067a823815c07a357a065be731d48) Change-Id: I809de3c201f47cd8936845447ad60b00cf4c0db7 Reviewed-on: http://codereview.qt.nokia.com/3930 Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com> Reviewed-by: Gabriel de Dietrich <gabriel.dietrich-de@nokia.com>
* Remove XFAIL from selftests for some platformsJason McDonald2011-08-315-11/+14
| | | | | | | | | | | | | | | | | | | The selftest for assert messages calls QEXPECT_FAIL if the assert message doesn't exactly match the expected output. This is because Q_ASSERT uses __FILE__, which is compiler-dependant. The expected output for this test contains various hard-coded unix paths meaning that the test never passes on any platform. This commit removes those paths from the test data so that the test passes for compilers that don't put path information in __FILE__. This commit also makes the XFAIL message more accurate -- absolute paths in assert messages don't come from QTestLib, they come from Q_ASSERT's use of __FILE__. Change-Id: I9aae212379b43a29ae83715717cc978b4b619420 Reviewed-on: http://codereview.qt.nokia.com/3908 Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com> Reviewed-by: Rohan McGovern <rohan.mcgovern@nokia.com>
* Add QLocale::toUpper/LowerLars Knoll2011-08-314-30/+61
| | | | | | | | | | | | | | | | | The toUpper/Lower() methods in QString should not be locale dependent, as this can lead to rather hard to find bugs in at least a turkish locale. Rather have explicit, locale dependend case conversions available in QLocale. Reviewed-by: Denis Dzyubenko (cherry picked from commit da0e1e101bb4c44c25b6523357fa81ad1b2d6539) Change-Id: I1cc3f341bef17ad573a736dc94c9c5d514ace54e Reviewed-on: http://codereview.qt.nokia.com/3259 Reviewed-by: Lars Knoll <lars.knoll@nokia.com> Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
* Correctly position aliased lines with flat capsLars Knoll2011-08-312-28/+32
| | | | | | | | | | | | | | | | | | | The code was mispositioning lines by half a pixel, as it added half a pixel offset and then rounded in addition. This submit fixes this and also removes certain artifacts when drawing rects at .5 pixel positions. Lance now doesn't show any significant differences to the 4.7 rendering anymore. Task-number: QTBUG-20199 Reviewed-by: Aavit (cherry picked from commit 49409f612c47f30434aa809e4d2c963f1a6bb88a) Change-Id: Iab3936e688eba16b82f5cdb4f36f54af807d78ea Reviewed-on: http://codereview.qt.nokia.com/3260 Reviewed-by: Lars Knoll <lars.knoll@nokia.com> Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
* QSslCertificate: regenerate blacklisted certificates, they were expiredPeter Hartmann2011-08-319-90/+90
| | | | | | | | | | | regenerating blacklisted certificates with same serial number and common name, but longer validity: Now they are valid for 10 years. (cherry picked from commit a3d22777028b102b7f65cf2db9719f5d57308b04) Change-Id: I7884484c2f61b3a55f671faa38967e62fc8954f0 Reviewed-on: http://codereview.qt.nokia.com/3894 Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com> Reviewed-by: Martin Petersson <Martin.Petersson@nokia.com>
* Fix errors in lightxml test loggerJason McDonald2011-08-3118-68/+177
| | | | | | | | | | | | | | | | | | | | | | | | The newer test logger did not produce the same light XML output as the logger that it replaced. In particular, it did not output the <DataTag> tag and it incorrectly nested a <Message> tag inside the <Incident> tag when a fatal error occured in a test. Unfortunately, it appears that the expected lightxml output for the selftests was produced by running tests using the newer logger, while the selftests did not use the older lightxml logger. Thus the errors were not detected by the selftests. This commit adds the older lightxml logger to the selftests, updates the expected test data accordingly, and modifies the newer lightxml logger to behave correctly. This last item is achieved by making the lightxml streamer copy most of the code from the xml streamer -- lightxml output is supposed to be same as xml, except for the omission of the root and <TestCase> tags. Change-Id: Ie6e1f69dd6000df2b9d0c5c8e2109fe7bbff3956 Reviewed-on: http://codereview.qt.nokia.com/3902 Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com> Reviewed-by: Rohan McGovern <rohan.mcgovern@nokia.com>
* Make lightxml and xml log formatting consistentJason McDonald2011-08-3129-63/+63
| | | | | | | | | | | For XML logs, an Incident tag with no sub-tags has a space before the closing slash. For Light XML logs, this space was missing unless the -flush command line option was supplied. Change-Id: I6de2e140f9309f333b5b97ed7f8116e4e727a149 Reviewed-on: http://codereview.qt.nokia.com/3871 Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com> Reviewed-by: Rohan McGovern <rohan.mcgovern@nokia.com>
* Remove ability to run tests in random order.Jason McDonald2011-08-3112-171/+11
| | | | | | | | | | | | | | | | | | | | | | | | | | | Remove the undocumented feature that allows test functions to be executed in random order. The feature was designed to expose unintended dependencies between test functions -- test functions are only supposed to depend on the initTestCase() and init() functions. Aside from the lack of documentation, there are a number of problems with this feature. Most importantly, running the tests in random order has only a 50% chance of exposing dependencies between test functions. A better strategy would be to run the test functions in reverse order and complain if that produces different results to running the tests in the normal order. Additionally, the random order is not deterministic, so even if a dependency is exposed during a test run, there's no guarantee that it will be exposed again. The feature allows the user to optionally supply a random seed to make the "random" order deterministic, but as rand() implementations are not identical across platforms, even that does not guarantee that dependencies between test functions will be exposed deterministically. Change-Id: I39eac34c532ccb988116778bbc5ab05d835874c5 Reviewed-on: http://codereview.qt.nokia.com/3720 Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com> Reviewed-by: Rohan McGovern <rohan.mcgovern@nokia.com>
* Make sure tests/auto/v8.pro doesn't clobber auto.proKent Hansen2011-08-311-2/+2
| | | | | | | | | | | | The omission of spaces is crucial in order for the regular expressions in configure to be able to detect that v8.pro isn't a "main project" file. Task-number: QTBUG-21168 Change-Id: I2e94736ee3195bed7fd528759b1bc1812f1ae54c Reviewed-on: http://codereview.qt.nokia.com/3878 Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com> Reviewed-by: Rohan McGovern <rohan.mcgovern@nokia.com>
* QSslCertificate: blacklist fraudulent *.google.comPeter Hartmann2011-08-302-0/+31
| | | | | | | | | | | | | | blacklist the leaf certificate for now. There might well be more fake certificates in the wild, for that either the Diginotar.nl root cert needs to be disabled on the system or OCSP would need to be enabled (not supported by Qt yet). Reviewed-by: Richard J. Moore <rich@kde.org> (cherry picked from commit 70f6a1b91b242174682c30be976c2aa36c450cc7) Change-Id: I7cd3fdc4c6e85202914764f983a60d301e54aa35 Reviewed-on: http://codereview.qt.nokia.com/3893 Reviewed-by: Peter Hartmann <peter.hartmann@nokia.com>
* Compile fix on Mac OS XBradley T. Hughes2011-08-301-1/+1
| | | | | | | | | | The file is called shapeitem.cpp (lowercase i), not shapeItem.cpp (with uppercase I) Change-Id: I0dd230158cf8c8323bfa779901475535e7c7d694 Reviewed-on: http://codereview.qt.nokia.com/3883 Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com> Reviewed-by: Samuel Rødal <samuel.rodal@nokia.com>
* QHttpNetworkConnection : Fix the case when we only have one channelMartin Petersson2011-08-302-31/+46
| | | | | | | | | | | | | | For the Happy eyeballs implementation we use two channels for the case where a host lookup gives us both Ipv4 and Ipv6 addresses. In the case where the Connection is setup to only use one channel we can not use this solution, so in this case we should use the old way of connecting with one channel. Task-number: QTBUG-20981 Change-Id: I6590fb4c67d6a8261cd0e4da8f99cd3603bbb524 Reviewed-on: http://codereview.qt.nokia.com/3524 Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com> Reviewed-by: Peter Hartmann <peter.hartmann@nokia.com>
* QHttpNetworkReply: Change dataReadProgress to qint64.Martin Petersson2011-08-303-5/+4
| | | | | | | | Task-number: QTBUG-20890 Change-Id: I36d942d26247c99eb70c035da48dc0afa6afc591 Reviewed-on: http://codereview.qt.nokia.com/3316 Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com> Reviewed-by: Peter Hartmann <peter.hartmann@nokia.com>
* Add a signal emitted callback to QAbstractDeclarativeDataAaron Kennedy2011-08-302-0/+6
| | | | | | | | | | | For property notify signals, QtDeclarative can manage connections in a more special case - and more performant - way. This patch adds a callback hook so that QtDeclarative can intercept signals being emitted by declarative objects. Change-Id: I72554e80df0a4257da65d81cc1c5db88a11446a4 Reviewed-on: http://codereview.qt.nokia.com/3363 Reviewed-by: Martin Jones <martin.jones@nokia.com>
* Fix fontconfig configure testJiang Jiang2011-08-291-1/+0
| | | | | | | | It does not necessarily require X11. Change-Id: Ie10f91b2052af21ea877d6c7d322fc43e84108cb Reviewed-on: http://codereview.qt.nokia.com/3815 Reviewed-by: Jiang Jiang <jiang.jiang@nokia.com>
* Add QtV8 library to QtBaseKent Hansen2011-08-2934-10/+5789
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This adds Aaron's copy of V8 to src/3rdparty/v8 (as a git submodule), and builds it as a "normal" Qt library (without any dependencies on Qt itself). The library can be added to a project with QT += v8-private V8 API headers are available as private includes, e.g. #include <private/v8.h> The API is private because we're exposing a third-party API directly, and we don't want to (and cannot) make source or binary compatibility guarantees for it. Since we want the V8 public API headers to be private headers in Qt, syncqt and sync.profile were extended to understand a new configuration option, the @allmoduleheadersprivate array, that tells syncqt whether all the library headers should be treated as private even though they don't follow the _p.h Qt convention. The V8 project files, patches and autotests are copied from the QtDeclarative repository. The next step after this commit is to remove QtDeclarative's copy of V8 and link with QtV8 instead. Task-number: QTBUG-20963 Change-Id: Ib8820362cdbc8fa662a5e97db841656cf38d1b62 Reviewed-on: http://codereview.qt.nokia.com/3092 Reviewed-by: Kent Hansen <kent.hansen@nokia.com> Reviewed-by: Lars Knoll <lars.knoll@nokia.com>
* Optimized QMatrix4x4 by improving how 'flagBits' are used.Kim Motoyoshi Kalland2011-08-293-422/+666
| | | | | | | Change-Id: Ic417336489d334e25b547c719d457faf65307cac Reviewed-on: http://codereview.qt.nokia.com/3670 Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com> Reviewed-by: Gunnar Sletta <gunnar.sletta@nokia.com>
* Remove the QTEST_NOEXITCODE define.Jason McDonald2011-08-291-6/+0
| | | | | | | | | | Tests that are expected to return a non-zero exitcode should be marked with "CONFIG+=insignificant_test" in their .pro file. Change-Id: Iebb9c7129c08833ed517115f569086d6fcfe827b Reviewed-on: http://codereview.qt.nokia.com/3689 Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com> Reviewed-by: Rohan McGovern <rohan.mcgovern@nokia.com>
* Rename COMPARE_IMPL2 to TO_STRING_IMPL.Jason McDonald2011-08-291-15/+15
| | | | | | | Change-Id: Idbc8c78815f9259c5ecc36fbb053d64f6802c66b Reviewed-on: http://codereview.qt.nokia.com/3649 Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com> Reviewed-by: Rohan McGovern <rohan.mcgovern@nokia.com>
* Remove unused functionJason McDonald2011-08-291-6/+0
| | | | | | | Change-Id: I04eea17a3674beb59c84e3992f9bb2754f7b3525 Reviewed-on: http://codereview.qt.nokia.com/3646 Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com> Reviewed-by: Rohan McGovern <rohan.mcgovern@nokia.com>
* Remove literal tabsJason McDonald2011-08-291-5/+5
| | | | | | | Change-Id: I06064f68a0ca23968cec30ccb063dadf2e67571b Reviewed-on: http://codereview.qt.nokia.com/3645 Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com> Reviewed-by: Rohan McGovern <rohan.mcgovern@nokia.com>
* Remove default params from QTestData constructorJason McDonald2011-08-291-1/+1
| | | | | | | | | | The constructor asserts if either parameter is null, so having defaults seems to be pointless. Change-Id: I8cec52e17e5f94458e8d8323855eaed6433686e7 Reviewed-on: http://codereview.qt.nokia.com/3644 Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com> Reviewed-by: Rohan McGovern <rohan.mcgovern@nokia.com>
* Remove obsolete ifdef.Jason McDonald2011-08-291-3/+1
| | | | | | | | | | QTEST_EMBED is not defined in Qt itself, nor is it defined by any of the CI builds for Qt's supported platforms. Change-Id: I73a3979630130fc8f1ef99dcbc17b4d1875ba246 Reviewed-on: http://codereview.qt.nokia.com/3641 Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com> Reviewed-by: Rohan McGovern <rohan.mcgovern@nokia.com>
* Remove debugging printf.Jason McDonald2011-08-291-1/+0
| | | | | | | Change-Id: Ib5733e96d3a6cec956d2f4c326d7be42e813c440 Reviewed-on: http://codereview.qt.nokia.com/3639 Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com> Reviewed-by: Rohan McGovern <rohan.mcgovern@nokia.com>