summaryrefslogtreecommitdiffstats
path: root/tests/auto
Commit message (Collapse)AuthorAgeFilesLines
...
* Fixed qchar and qsvgrenderer autotest deployment for WinCE devices.jaanttil2012-02-032-2/+7
| | | | | | Change-Id: Ibac9f5878ea1ec2a7d13868e5e60f1d6e7aa3d36 Reviewed-by: Andreas Holzammer <andreas.holzammer@kdab.com> Reviewed-by: Rohan McGovern <rohan.mcgovern@nokia.com>
* QTextEdit cursor position fix when moving left/right with selectionPasi Matilainen2012-02-032-4/+4
| | | | | | | | | | | When text has been selected in a QTextEdit and the left or right arrow key is pressed, the cursor moves one character beyond the start or end of the selection, when it shouldn't move past the selection. Fixed by moving the cursor to the right place when a selection is active. Task-number: QTBUG-22853 Change-Id: I9ea1863436db98627a6fd041ce554cf10be26493 Reviewed-by: Jiang Jiang <jiang.jiang@nokia.com>
* test: Split `qsqlquery' unit and benchmark testSergio Ahumada2012-02-032-38/+4
| | | | | | | | | | | | Moving benchmark test from 'tests/auto' to 'tests/benchmarks'. Also removing 'qttest_p4' usage while we are at it. - void benchmark(); was moved to 'tests/benchmarks/sql/kernel/qsqlquery' Change-Id: Icbe88fecdfe24a7754079451f635f9c19b3d6683 Reviewed-by: Rohan McGovern <rohan.mcgovern@nokia.com>
* test: Split `qcontiguouscache' unit and benchmark testsSergio Ahumada2012-02-032-138/+3
| | | | | | | | | | | | | | Moving three benchmark tests from 'tests/auto' to 'tests/benchmarks'. Also removing 'qttest_p4' usage while we are at it. - void asScrollingList(); - void cacheBenchmark(); - void contiguousCacheBenchmark(); were moved to 'tests/benchmarks/corelib/tools/qcontiguouscache' Change-Id: Ie6ca7f55db2a218f3ccf699744cb721a8a1e2363 Reviewed-by: Rohan McGovern <rohan.mcgovern@nokia.com>
* Change QUrl::toLocalFile to return path for relative urlsAapo Haapanen2012-02-021-3/+5
| | | | | | | | | | | | | | | | | | This change reverts the behaviour of QUrl::toLocalFile to the state it was before 4.8. After this change the function returns the path if the url is relative. Before this change an empty QString was returned. A relative url can refer to a local file, but that can't be determined from the url alone. Thus, it makes sense to return the path for such urls. Added documentation to explain that the function works like this to maintain backward compatability in 4.x, but the handling of relative URLs will change in 5.0. Task-number: QTBUG-19827 Change-Id: I8bb8f4603a5936c0359afc1b6ff98824fad6cbc9 Reviewed-by: Olivier Goffart <ogoffart@woboq.com> Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
* Skip tst_QEventLoop::deliverInDefinedOrder_QTBUG19637 on SymbianGareth Stockwell2012-02-011-0/+3
| | | | | | | | | | Temporary workaround for QTBUG-23974. This change allows the test suite to run to completion, and is required in order to allow some new test steps, prepared for addition following this change, to be executed. Change-Id: I96c9d8e76646625deb69143a434ed9a186623c72 Reviewed-by: Shane Kearns <ext-shane.2.kearns@nokia.com>
* Fix crash in QTreeWidgetItem::sortChildren when adding new item.Markku Heikkila2012-02-011-0/+32
| | | | | | | | | | | | | | | | Recursive call is caused if user code calls QtreeWidgetItem()::sortChildren and sorting is enbled in QTreeWidget. First call is from user code and second is caused by timer. When timer expires second call is made. This recursion is prevented with QTreeModel::SkipSorting skipSorting() in QTreeWidgetItem::sortChildren(); Task-number: QTBUG-20345 Change-Id: I48af98b03c0291de8da90d1581bc55cc89846b8c Reviewed-by: Stephen Kelly <stephen.kelly@kdab.com>
* Fix exception handling in Symbian event dispatcherMurray Read2012-01-261-0/+10
| | | | | | | | | | | | The Symbian event dispatcher handles exceptions from active objects as well as leaves. But if the active object throws while it has something pushed on the cleanup stack, the exception must be converted to a leave for the cleanup to happen and the cleanup stack balance to be maintained. Task-number: ou1cimx1#970701 Change-Id: I6c8eed61cb1666e36eb4858a2c72ad0d8c6b0c8f Reviewed-by: Shane Kearns <ext-shane.2.kearns@nokia.com>
* Fix exception handling testing on SymbianMurray Read2012-01-261-16/+137
| | | | | | | | | | The Symbian autotest tst_qmainexceptions has been upgraded to run on hardware. Task-number: ou1cimx1#970701 Change-Id: Ia96ebdafb92c986599032c59528ed8633e3bec6c Reviewed-by: Murray Read <ext-murray.2.read@nokia.com> Reviewed-by: Shane Kearns <ext-shane.2.kearns@nokia.com>
* Handle the 'real' datatype correctly in the SQLite driverAndy Shaw2012-01-262-1/+31
| | | | | | | | | | | | | The 'real' datatype should be seen as a QVariant::Double type and not as a QVariant::String type otherwise it does not get presented correctly when using a non Qt application to access it. Test is included for QSqlQuery. Task-number: QTBUG-16373 Change-Id: Ie323ce49eb95e4d6bb4c3814ba9a957a63f4b259 Reviewed-by: Yunqiao Yin <charles.yin@nokia.com>
* Fix crashes and non-portable functionality in QDBusDemarshaller QByteArray ↵Sami Rosendahl2012-01-251-0/+53
| | | | | | | | | | | | | | | | | | | | | | | | | extraction QDBusArgument QByteArray extraction operator and QDBusDemarshaller that implements the extraction do not check the type of the extracted value. When extracting a QByteArray when the value actually is e.g. a struct of mixed types the byte array extraction will crash as it attempts to extract the struct data as a fixed array. The fix adds DBus type checks to QDBusArgument byte array extraction operator implementations. The checks invalidate extracting arrays of other types than bytes to a QByteArray that worked with the unchecked implementation. The rationale for this restriction is 1) extracting a QByteArray to a variant checks already that the array element type is byte 2) Results of extracting arrays of types wider than a byte to a QByteArray are architecture-dependent making such code inherently non-portable. Task-number: QTBUG-22840 Change-Id: Iaa284603c65d7a431a3fd020c18240cd8199ceb9 (From Qt5 commit b9acd85b2f92f887521b952f84ced9a2d1a8a57e) Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
* Fix crash in QDBusDemarshaller QStringList extractionSami Rosendahl2012-01-251-0/+52
| | | | | | | | | | | | | | | | | QDBusArgument QStringList extraction operator and QDBusDemarshaller that implements the extraction do not check the type of the extracted value. When extracting a QStringList and the value actually is e.g. an array of bytes the string list extraction will crash as it interprets the bytes as char pointers. The fix adds DBus type checks to QDBusArgument QStringList extraction operator implementations. The checks are as permissive as possible provided crashes are avoided. Task-number: QTBUG-22840 Change-Id: I83a98097a7cf36f8448afba81d0ad619cdf864e3 (From Qt5 commit b4398dc4e372dbe829b21423e1a0a93a6a542994) Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
* Fix crash in QDBusDemarshaller basic string-like type extractionSami Rosendahl2012-01-251-0/+115
| | | | | | | | | | | | | | | | | | | QDBusArgument string extraction operators and QDBusDemarshaller that implements the extraction do not check the type of the extracted value. When extracting string-like basic DBus type that actually is e.g. an integer the string extraction will crash as it blindly attempts to use the integer as a pointer to char. The fix adds DBus type checks to QDBusArgument string type extraction operator implementations. The checks are as permissive as possible provided crashes are avoided. Previously supported functionality of extracting an object path or type signature to a string type is retained. Task-number: QTBUG-22840 Change-Id: Ia27d4f4d461e5c4d3eac52f3cac85d6734f000b3 (From Qt5 commit 8f19f142745f3cb0690dcd51cebc66153e396805) Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
* Fix failure of tst_QDBusMarshall::demarshallPrimitives()Sami Rosendahl2012-01-251-3/+21
| | | | | | | | | | | | | | | | | | Commit e20eaed5c1968e32eca97cf449fa588cfab35a5d was merged to Qt 4.8 although the originating merge request https://qt.gitorious.org/qt/qt/merge_requests/1469 targeted Qt 4.7. This resulted in test data setup and execution failure for test case tst_QDBusMarshall::demarshallPrimitives() due to changes in the test in Qt 4.8. This commit refactors the sendBasic_data() test data function to support separate initialization of basic numeric and basic string data to be reused by demarshallPrimitives_data(). Same refactoring was done in Qt5 and this commit aligns Qt4.8 commit e20eaed5c1968e32eca97cf449fa588cfab35a5d with Qt5. Change-Id: I10d0fce34c99c7b3b6247c503634b55a93f7d3b2 Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
* Fix set/paperSize(QPrinter::PaperSize) on MacAndy Shaw2012-01-251-9/+16
| | | | | | | | | | | | | This fixes the paper size setting on Mac as it would not return the same paper size that was set with setPaperSize() when calling paperSize(). Test is included. Task-number: QTBUG-20882 Change-Id: Ib0064dd40de147d6db2424cdb31021e66894cc37 Reviewed-by: Jiang Jiang <jiang.jiang@nokia.com>
* Fix BC break with QAbstractFileEngine "mount points"Shane Kearns2012-01-251-1/+92
| | | | | | | | | | | | | | | | | File system cached metadata can't be trusted when custom file engines are in use, because the custom file engine may want to override the metadata. (e.g. present an archive file as a directory) Therefore, check if a file engine should be instantiated for each result in QDirIterator. This is a fast check if no custom file engines are registered. When pushing a directory (using QDirIterator::SubDirectories) the file engine needs to be instantiated also. Task-number: QTBUG-23688 Task-number: ou1cimx1#965023 Change-Id: I0114c8df6258535553783a2486131c4194926649 Reviewed-by: João Abecasis <joao.abecasis@nokia.com>
* make tst_QProcess::softExitInSlots pass in under 120 secondsJoerg Bornemann2012-01-201-4/+25
| | | | | | | | | Due to unconditional waits this test always needed 120 seconds to pass. Now we're using QTRY_VERIFY and make sure that we write the data before the process got killed even in the cases 3 and 4. Change-Id: I4718f2a4f3e53921716c639ae8041114234e9086 Reviewed-by: Bill King <bill.king@nokia.com>
* Fix isolated Thai SARA AM handlingJiang Jiang2012-01-181-0/+25
| | | | | | | | | | | | | | Since 5e07a3ac58f93bd5e09715d43b58c20950c2befa Thai text layout is handled by libthai to special case of the SARA AM. It didn't handle isolated SARA AM. This patch fixed it and added detailed explaination on the special case. The dotted circle should be shown rather than hidden. Added a test case to verify that with Waree. Change-Id: I4967715627cbe15f5a3e9ab3e3844420ab541aed Reviewed-by: Jiang Jiang <jiang.jiang@nokia.com>
* remove NTFS junction and mount point detectionJoerg Bornemann2012-01-181-5/+7
| | | | | | | | Qt now treats neither NTFS junctions nor mount points as symlinks. Task-number: QTBUG-20431 Change-Id: Id9bd17f8b93afe9aeb307358ddad5726913961f3 Reviewed-by: João Abecasis <joao.abecasis@nokia.com>
* Revert "fix NTFS mount points"Joerg Bornemann2012-01-181-1/+1
| | | | | | | | | | We agreed on treating neither junctions nor mount points as symlinks. This will be handled in another commit. This reverts commit 611eb9e5e5c8fe8035482e502b84263f43779dd8. Change-Id: I19f0bd841c7e6dd6e65e5c8df4bdfa1d6f08ce28 Reviewed-by: João Abecasis <joao.abecasis@nokia.com>
* Fix QAbstractFileEngine autotest failure on windows/symbianShane Kearns2012-01-182-2/+1
| | | | | | | | File size does not match when CRLF translation occurs. Added .gitattributes file to fix this. Change-Id: I86ab538d17534b51177486ef1c4626ec52f55c5b Reviewed-by: João Abecasis <joao.abecasis@nokia.com>
* Fix memory leak in QDomDocument entity text expansionSami Rosendahl2012-01-181-2/+2
| | | | | | | | | | | The created entity node's reference count needs to be decremented to 0 before it is added as a child, because appendChild will increment the reference count to correct value of 1. Re-enabled commented-out test data of tst_QDom::setContent to exercise the code path with the leak. Change-Id: I8193699779b688fd818439d6ef9f850b3373dcc3 (from Qt5 commit b6a43cfe9c136e298feaa8d48fc252fdb3d4e7c5) Reviewed-by: Olivier Goffart <ogoffart@woboq.com>
* Fix memory leak in QDomDocument DTD entity declaration handlerSami Rosendahl2012-01-181-0/+25
| | | | | | | | | | | | | | The created entity node's reference count needs to be decremented to 0 before it is added as a child, because appendChild will increment the reference count to correct value of 1. Also added autotest DTDEntityDecl to tst_qdom to expose the leak when executed under valgrind memcheck. There was no previous direct test case for unparsed entity declarations in DTD, only indirect coverage via regression test cloneDTD_QTBUG8398. Task-number: QTBUG-22587 Change-Id: I2c3a78569b564b80ff5e2f63f59fa36c94a22236 (From Qt5 commit d55cdcd59fdddd660193ddff40fbd52bef57c0c9) Reviewed-by: Olivier Goffart <ogoffart@woboq.com>
* Fix memory leak in QDomDocument DTD notation declaration handlerSami Rosendahl2012-01-181-0/+24
| | | | | | | | | | | | | The created notation node's reference count needs to be decremented to 0 before it is added as a child, because appendChild will increment the reference count to correct value of 1. Also added autotest DTDNotationDecl to tst_qdom to expose the leak when executed under valgrind memcheck. There was no previous test coverage for the notation declarations in DTD. Task-number: QTBUG-22588 Change-Id: I452d45cb70dfcda48061e0d4af5085ab1c1ad59e (From Qt5 commit 1bc31fa43ddefe468c9f079156bfad0371e2a61b) Reviewed-by: Olivier Goffart <ogoffart@woboq.com>
* fix NTFS mount pointsJoerg Bornemann2012-01-171-1/+1
| | | | | | | | | | | | NTFS mount points are not treated as symlinks, because they might not have a link target. This is the case when a volume is mounted as a single mount point without a drive letter. This patch fixes building Qt in an NTFS mount point. Task-number: QTBUG-20431 Change-Id: Ie2e15212e1a7ca7fa0067b7ca8857e243e42c21a Reviewed-by: Thomas Hartmann <Thomas.Hartmann@nokia.com>
* Fix a couple of edge cases for WildcardUnix matchingAndy Shaw2012-01-171-1/+3
| | | | | | | | | | | | | | Fix a couple of cases where WildcardUnix was not matching when the string was just [] or ended with a \. The testWildcardEscaping() test has been extended to account for these two cases too. Task-number: QTBUG-20897 Change-Id: I9ddb10f5a1150427e8ccefae0dc87a3d4e104854 Reviewed-by: Konstantin Ritt <ritt.ks@gmail.com> Reviewed-by: Giuseppe D'Angelo <dangelog@gmail.com> Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
* Update year in Nokia copyright messages.Jason McDonald2012-01-111-1/+1
| | | | | | | | Manually update strings that did not get fixed by previous search-and-replace. Change-Id: Ie9ff57f08ce0dcf91d28620fa2dc9eeb8e98481e Reviewed-by: Rohan McGovern <rohan.mcgovern@nokia.com>
* Update year in Nokia copyright messages.Jason McDonald2012-01-111353-1359/+1359
| | | | | | | | | Simple search and replace. This commit doesn't touch 3rd-party files, nor translations (where the change is not so simple and will be handled in a separate commit). Change-Id: I4e48513b8078a44a8cd272326685b25338890148 Reviewed-by: Rohan McGovern <rohan.mcgovern@nokia.com>
* tests: allow unstable tests to be marked with CONFIG+=insignificant_testSergio Ahumada2012-01-096-2/+8
| | | | | | | | | | | Marking a test with CONFIG+=insignificant_test will cause the exit code of the test to be discarded during `make check'. This is intended to be used for tests which are valuable to run, but are known to be unstable and are not feasible to immediately fix. Task-number: QTQAINFRA-428 Change-Id: Idd45b04200182e3673195858ec08d31357dcdfaf Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
* Merge branch 'master' of scm.dev.nokia.troll.no:qt/qt-symbian-staging into ↵Qt Continuous Integration System2012-01-051-0/+218
|\ | | | | | | | | | | | | | | | | | | | | | | | | | | master-integration * 'master' of scm.dev.nokia.troll.no:qt/qt-symbian-staging: Fix http authentication to a different realm on the same server Fix race in http connection channel Don't fetch credentials from cache following a failed proxy authentication Handle plain socket write errors in SSL Fix for assertion failure Fix faulty logic in http connection pipelining Test case for QTBUG-22875 QThreads on Symbian are named to allow them to be opened externally
| * Fix http authentication to a different realm on the same serverShane Kearns2012-01-041-0/+33
| | | | | | | | | | | | | | | | | | | | | | This is a regression caused by the NTLMv2 authentication patch. I have manually tested NTLMv2 authentication against MS IIS and reverting these two lines does not break it. Task-number: QT-5209 Change-Id: I64159cbe468e1a7f834f8726fd0c9d4ab4c54b38 Reviewed-by: Peter Hartmann <peter.hartmann@nokia.com> (cherry-picked from 4954f71648aa7f74a4cb8b1dd26470b5da44459e)
| * Test case for QTBUG-22875Shane Kearns2012-01-041-0/+185
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Test the authentication cache works properly with "cancelled dialogs" or if the user enters username/password incorrectly. Expected behaviour is based on web browsers: If cancelled, current request fails, and prompt again the next time. If wrong password is given, prompt again and retry the current request. If bad credentials are in the cache, prompt again Task-number: QTBUG-22875 Change-Id: Ic02ccac8dbeb3f2580ca4ffe47d0773982c4ab25 Reviewed-by: Peter Hartmann <peter.hartmann@nokia.com> (cherry picked from 4be2430)
* | Merge remote branch 'dev-codereview/4.8' into qa-staging-masterRohan McGovern2012-01-0398-328/+411
|\ \
| * | tests: eliminated usage of qttest_p4.prf [part 3]Sergio Ahumada2011-12-2933-120/+143
| | | | | | | | | | | | | | | | | | | | | | | | | | | qttest_p4.prf was added as a convenience for Qt's own autotests in Qt4. It enables various crufty undocumented magic, of dubious value. Stop using it, and explicitly enable the things from it which we want. Change-Id: I65ba34a59db7aa15bc6304e690c825a4d6cd1037 Reviewed-by: Sergio Ahumada <sergio.ahumada@nokia.com>
| * | tests: eliminated usage of qttest_p4.prf [part 2]Sergio Ahumada2011-12-2966-209/+269
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | qttest_p4.prf was added as a convenience for Qt's own autotests in Qt4. It enables various crufty undocumented magic, of dubious value. Stop using it, and explicitly enable the things from it which we want. Change-Id: I8a0bed9161ea9ac010ef3269f2e9baed7bbc2f41 Reviewed-by: Rohan McGovern Reviewed-by: Sergio Ahumada <sergio.ahumada@nokia.com>
* | | Merge branch 'master' of scm.dev.nokia.troll.no:qt/qt-qml-staging into ↵Qt Continuous Integration System2012-01-023-6/+6
|\ \ \ | |/ / |/| | | | | | | | | | | | | | | | | | | | master-integration * 'master' of scm.dev.nokia.troll.no:qt/qt-qml-staging: Adapt autotests to commit e2773a9 Declarative: Use qDebug() for debugger status updates Declarative: Unify output of warning messages in debug server
| * | Merge remote-tracking branch 'qt-qml-review/master' into master-qml-stagingKai Koehne2012-01-023-6/+6
| |\ \
| | * | Adapt autotests to commit e2773a9Kai Koehne2011-11-293-6/+6
| | | | | | | | | | | | | | | | | | | | Reviewed-by: Aurindam Jana <aurindam.jana@nokia.com> Change-Id: I30f996099346668f7b8067246c98b9ccc137ba57
* | | | tests: allow unstable tests to be marked with CONFIG+=insignificant_testSergio Ahumada2011-12-28102-35/+155
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Marking a test with CONFIG+=insignificant_test will cause the exit code of the test to be discarded during `make check'. This is intended to be used for tests which are valuable to run, but are known to be unstable and are not feasible to immediately fix. Change-Id: Id7b2407d0a13c8de19a58badb78fa7c018c9b50a Reviewed-by: Jo Asplin
* | | | tests: eliminated usage of qttest_p4.prfSergio Ahumada2011-12-2599-235/+294
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | qttest_p4.prf was added as a convenience for Qt's own autotests in Qt4. It enables various crufty undocumented magic, of dubious value. Stop using it, and explicitly enable the things from it which we want. Change-Id: If1f16810614f7965dc7d5bf680effed911bee114 Reviewed-by: Jason McDonald
* | | | Merge branch 'master' of scm.dev.nokia.troll.no:qt/qt-symbian-staging into ↵Qt Continuous Integration System2011-12-2214-13/+28
|\ \ \ \ | | |_|/ | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | master-integration * 'master' of scm.dev.nokia.troll.no:qt/qt-symbian-staging: Symbian: Fix exporting and importing of some functions for autotests Symbian: Fix SRCDIR usage in qlayout autotest. Symbian: Fix qcssparser autotest Symbian: Fix qscriptextensionplugin autotest
| * | | Symbian: Fix exporting and importing of some functions for autotestsMiikka Heikkinen2011-12-2110-11/+11
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Symbian builds seem more strict about properly declaring exports than other builds, so added proper exporting and importing to some function declarations. Task-number: ou1cimx1#957184 Reviewed-by: mread
| * | | Symbian: Fix SRCDIR usage in qlayout autotest.Miikka Heikkinen2011-12-211-0/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | SRCDIR was not defined at all in Symbian builds. Task-number: ou1cimx1#957098 Reviewed-by: mread
| * | | Symbian: Fix qcssparser autotestMiikka Heikkinen2011-12-211-1/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | No need to deploy "c:/windows/fonts/times.ttf" into Symbian devices, as they already have that font by default. The code that loads this file is only executed in WinCE, so it was never used in Symbian, anyway. Task-number: ou1cimx1#957049 Reviewed-by: mread
| * | | Symbian: Fix qscriptextensionplugin autotestMiikka Heikkinen2011-12-212-1/+9
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | - Linking of static library needed to be explicitly stated in Symbian. - Plugin deployment was added. - Had to rename the simpleplugin in Symbian builds as the name was too generic and was causing conflict in /sys/bin. Task-number: ou1cimx1#956851 Reviewed-by: mread
| * | | Revert "Fix sqlite driver memory eating due to close failure"Honglei Zhang2011-12-071-49/+0
| | | | | | | | | | | | | | | | | | | | | | | | This reverts commit 9a5fb6bd5f0fb3b37897bf722e4cc1673309623c. The mentioned fix has caused failure in qtcreator. Thus it has to be reverted and new fix for the memory leak will be made.
| * | | Merge remote-tracking branch 'qt/4.8'Pasi Pentikainen2011-12-06143-19/+216
| |\ \ \
* | | | | selftests: eliminated usage of qttest_p4.prfSergio Ahumada2011-12-2138-80/+41
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | qttest_p4.prf was added as a convenience for Qt's own autotests in Qt4. It enables various crufty undocumented magic, of dubious value. Stop using it, and explicitly enable the things from it which we want. Change-Id: Ib6f0a59fa54d1e002a05587362f95678c3b3fc26 Reviewed-by: Jason McDonald
* | | | | tests: fixed compile of qscriptextensionplugin test with high -jNRohan McGovern2011-12-091-0/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Dependencies between this test and some helper projects were not declared, so aggressively parallel builds would fail semi-randomly. Reviewed-by: Jason McDonald (cherry picked from commit f567467a3ac4182a4c6bb592e4ec596ec458c11b) Change-Id: If5b1998e18009ffac58637f6723c0a2ddd49c85d
* | | | | Merge branch 'master' of scm.dev.nokia.troll.no:qt/qt-qa-staging into ↵Qt Continuous Integration System2011-12-089-6/+44
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | master-integration * 'master' of scm.dev.nokia.troll.no:qt/qt-qa-staging: tests: make tests compile or disable those which don't compile