summaryrefslogtreecommitdiffstats
path: root/tests/auto
Commit message (Collapse)AuthorAgeFilesLines
* QSslCertificate: report fraudulent certificates as invalidTimo Turunen2011-03-2810-0/+173
| | | | | | | | | | | | | | | There are some fraudulent certificates in the wild that are not valid; this patch introduces a blacklist of serial numbers of those certificates. Reviewed-by: Richard J. Moore Reviewed-by: Markus Goetz Task-number: QTBUG-18338 (cherry picked from commit 04e074e8d7c097295505e63565abdc7ca2b49f7b) Conflicts: tests/auto/qsslcertificate/tst_qsslcertificate.cpp
* QSslCertificate: fix test for blacklisted certs on WindowsTimo Turunen2011-03-281-0/+9
| | | | | | | | | | | | | Apparently the wildcard matching and the SRCDIR hack don't go well together. Reviewed-by: Markus Goetz Task-number: QTBUG-18338 (cherry picked from commit aeabe790203e7dcb1786e0dad7b4608f1e45b7d5) Conflicts: tests/auto/qsslcertificate/tst_qsslcertificate.cpp
* QSslSocket: add test for blacklisted certificatesPeter Hartmann2011-03-283-3/+74
| | | | | | Reviewed-by: Richard J. Moore Task-number: QTBUG-18338 (cherry picked from commit 764e060a389a18a5804d23c528abdaebcee3ca13)
* Fix qgraphicstransform autotest for Symbian, where qreal is float.Laszlo Agocs2011-03-161-2/+12
| | | | | | | Task-number: QTBUG-17907 Reviewed-by: Samuel Rødal (cherry picked from commit 99aa67f649c44dda8c0da639b4925dbb0e4c9b70)
* Bump Qt version to 4.7.3Timo Turunen2011-03-116-6/+6
| | | | | | | | | Reviewed-by: Trust Me (cherry picked from commit e90cff53cdd7bf0bdfed1f2e8efb90539c6f33ba) Conflicts: tools/qdoc3/test/qt-project.qdocconf
* Fix typo in qglthreads auto test.v4.7.2Jani Hautakangas2011-02-211-1/+1
| | | | | Reviewed-by: TRUSTME (cherry picked from commit 97503dfd7fad9c8023b2f9632e6ef865ccd0cad8)
* Change to release license header.Jason McDonald2011-02-161319-17189/+17189
| | | | Reviewed-by: Trust Me
* Fix declarative autotest compilation on SymbianJoona Petrell2011-02-142-1/+13
| | | | | | Task-number: Reviewed-by: Martin Jones (cherry picked from commit e46c44f9538dbe5b44ce61d3a42403cfa471ae8b)
* Make addImportPath() work for windows paths starting with lower caseBea Lam2011-02-141-1/+11
| | | | | | | | | | | | | Was causing assert failure on windows if the 'c:' was lower case, since it was being added to the import path database with a lower case and thus later lookups with an upper case 'c:' would fail. This change fixes the check for whether the path refers to a local path or not. Task-number: QTBUG-16885 Change-Id: I0a2a2f705443ed453fb2b13f8599e035c2bd2877 Reviewed-by: Martin Jones (cherry picked from commit 33512bc223be373975426ffcc6f8fa783a7582c9)
* Update modules-related tests and docsBea Lam2011-02-145-2/+68
| | | | | | | | Added tests for remote imports and fixed/improved examples and text in the docs. Change-Id: I8f411a0287c4d50ec3cebe5567d803689cd5b1c7 (cherry picked from commit d7e42d7c5b0eb6513526d0c21025939a467e8d68)
* Add test for importing plugins that contain QML filesJason McDonald2011-02-147-1/+91
| | | | | | | | (cherry picked from commit a78f6b1718b8285cb65ae989a070bf8703746b5d) Conflicts: tests/auto/declarative/qdeclarativemoduleplugin/qdeclarativemoduleplugin.pro
* Don't ignore source-text when generating qsTrId translations for QMLTor Arne Vestbø2011-02-102-0/+8
| | | | | Reviewed-by: ossi (cherry picked from commit bb84c5ef4f620af659395b66e6ed792a380b9a1f)
* PathView regression: dragging the path didn't update currentIndexMartin Jones2011-02-102-0/+52
| | | | | | | | | | | Some refectoring while fixing QTBUG-13687 resulted in the private setOffset() method being called rather than the public. The public version was responsible for updating currentIndex. Change-Id: Iac9c7a19d6fa64550b9498e77b8983512e199370 Task-number: QTBUG-17319 Reviewed-by: Michael Brasser (cherry picked from commit eb1db74fb59ecb40d541644ce31ce7ec7b2620d2)
* Fix duplicate definition errorShane Kearns2011-02-091-4/+0
| | | | | | | | As the metatype declaration is now in the qnetworksession header file, it is not needed in the test code (and causes compile error on some platforms) Reviewed-By: Markus Goetz (cherry picked from commit d0d0763f6e0c7709208ad1c573266ee527f6e4ff)
* Don't crash when creating backtrace for built-in JS function (2nd try)Kent Hansen2011-02-092-1/+46
| | | | | | | | | | | | | | | | | | | | | | | | | Commit 147df10403ba280b3f04c1e3d6c4b1cf386abe5d did not quite fix the issue; other places need the same checks. When the JIT is enabled, frames for built-in JS host calls (such as Array.prototype.forEach) are not fully initialized. In particular, the CodeBlock register of such frames is not set (see comment in JITCall.cpp). We need to check if the codeBlock is actually valid before we start using it. This fixes the crash(es) but not the problem of actually getting the arguments for such frames through the API. There's also a related problem when a QtScript function (newFunction()) is called as a callback of a built-in JS host function (QTBUG-17287). These problems will go away once JavaScriptCore is updated to a more recent version (4.8 at the earliest), since the native-vs-script frame handling has been unified. Task-number: QTBUG-17137 Reviewed-by: Olivier Goffart (cherry picked from commit 640436345645b6cf6ff3334399f33c9d1c089492)
* Don't crash when creating backtrace for built-in JS functionKent Hansen2011-02-091-0/+15
| | | | | | | | | | | | When the JIT is enabled, NativeFunctionWrapper (used for built-in functions such as Array.prototype.forEach) inherits JSFunction, so we must check whether the function is actually a JS (script) function before we start accessing script-specific properties. Task-number: QTBUG-17137 Reviewed-by: Olivier Goffart (cherry picked from commit 147df10403ba280b3f04c1e3d6c4b1cf386abe5d)
* Support seperate versions of installed modulesmae2011-02-0910-1/+229
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | QML supports versioned types in modules. There's a version major and a version minor. This makes it possible to have a module com.organisation.fancycomponents with version 1.0, and later you could ship a new module com.organisation.fancycomponents which contains a more recent version 1.1 or 2.0 AND also the old versions to keep old code running. This is good. The problem is that this is difficult with certain QA procedures. It's hard to verify that a new module is indeed 100% compatible with the previous versions. The change extends the import mechanism by adding optional versioning to the component patch. With the patch, you can add a new module com.organisation.fancycomponents.2.0 which will be loaded when the QML file specifies "import com.organisation.fancycomponents 2.0". The patch works as follows: if you try to load com.organisation.fancycomponents in version 2.0, the engine first looks for com/organisation/fancycomponents.2.0, then for com/organisation/fancycomponents.2 then for com.organisation/fancycomponents. Reviewed-by: Aaron Kennedy Task-number: QTBUG-16455 (cherry picked from commit dd49b322b327fe87d8420abcce0e6cee877a88d7)
* QSqlTableModel/QSqlQueryModel and insertColumns problem.Michael Goddard2011-02-093-11/+210
| | | | | | | | | | | | | | | After inserting a column, fetching data through QSqlTableModel was off by one or more, since it passed the indexInQuery through to QSQM. Also, the headerData would sometimes return a blank string for an inserted column, and sometimes the column number. The autotests have been beefed up a little to check insertRows and insertColumns play nicely. Change-Id: I7399d4c4d94f958884b67ab9b39b5cf2485d8416 Task-number: QTBUG-12626 Reviewed-by: Charles Yin (cherry picked from commit 9c61e9a40e774fe32b16c133a5cdd6b9d9d29d83)
* Fix some removeRows issues with QSqlTableModel.Michael Goddard2011-02-091-22/+153
| | | | | | | | | Added some better unit testing around the problem areas. Change-Id: Ie4749da298aebbae6aec9558ebe8c8f2196c705f Task-number: QTBUG-14916 Reviewed-by: Charles Yin (cherry picked from commit bdd4a9149789f60974603e1f7621d51378f0a108)
* Make sure that setRecord emits dataChanged() with OnManualSubmit.Michael Goddard2011-02-081-2/+7
| | | | | | | | | | Since the change is immediately visible through data(), this is needed so that QSortFilterProxyModel etc work correctly. Change-Id: Ied7afce2e6a1f516b502d3501f9d214df54e52f2 Task-number: QTBUG-14831 Reviewed-by: Charles Yin (cherry picked from commit 3bed865c35d8eb920ba5a68276fdf1690c834a64)
* Fix QMutex can deadlock when calling tryLockOlivier Goffart2011-02-031-0/+38
| | | | | | | | | | | | | | in the unix code, if the QMutexPrivate::wait() with a timeout expires in the same moment that the mutex is released, wakeup would be set, but would be then ignored. (reset to false quickly after) If we waken up between the timeout and the re-aquisition of the internal mutex, we consider that the mutex has been locked. Reviewed-by: brad Task-number: QTBUG-16115 (cherry picked from commit 7987d4cfd3ce86c20a55b5661a5221f12246b27e)
* add autotest for digest authenticationPeter Hartmann2011-01-261-10/+20
| | | | | | Reviewed-by: Markus Goetz Task-number: QTBUG-15070 (cherry picked from commit c6a6448272168f0105c973bef5e531114533fc90)
* Fix cursor position adjustment when removing stringsJiang Jiang2011-01-261-0/+28
| | | | | | | | | | | | | | | Commit 0ba1b4d0 introduced a regression to QTextDocument: it postponed cursor position adjustment until the move operation is done, but contentsChanged will be triggered by finishEdit() in this move operation, thus cursor positions in this signal handler will be in inconsistent states (normally we should first update cursor position then trigger contentsChanged). In this case we should also postpone finishEdit() handling after cursor positions have been adjusted, then the states expose to applications will be consistent. Task-number: QTBUG-15857 Reviewed-by: Eskil (cherry picked from commit 34c297faca93e1286573b2a01127e4e7af00aff2)
* positionViewAtIndex can fail when positioned near end of list.Martin Jones2011-01-211-0/+13
| | | | | | | | | | We positioned the view beyond the bounds, which in some cases resulted in only one item being created. Combined with a bug in the bounds fixup very many items were created. Task-number: QT-4441 Reviewed-by: Michael Brasser (cherry picked from commit c3dd455b03a6c03011e2446f69fc262230e91639)
* BorderImage fails for .sci source containing a URLMartin Jones2011-01-212-0/+8
| | | | | | Task-number: QTBUG-16769 Reviewed-by: Bea Lam (cherry picked from commit 7ddec9f3179bfd854ae53e23ab292de1f9a26377)
* Revert "Fix loaded() signal to be emitted only once"Bea Lam2011-01-211-54/+40
| | | | | | | | | | This reverts commit 82ff3f484c7ec49e60b7fddf23794937974a6768. QTBUG-16796 reports that this commit is causing regressions relating to initial sizing of items. Task-number: QTBUG-16796 (cherry picked from commit 8c3086aa36b51a9731fce8eb8146b33ab8196aed)
* Supporting Qt application fonts on SymbianAlessandro Portale2011-01-201-4/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This patch finally implements the missing application font support on Symbian. QFontDatabase's addApplicationFont[FromData], applicationFontFamilies and removeApplicationFont are now functional and allow an application to load, use and unload fonts at run-time. The underlying Symbian API comes with some restrictions/specialties. Most of them are worked around in this patch, the missing ones are left as part of QTBUG-16514: - The font file must be a file, not a memory buffer. Web fonts and qrc fonts come as memory buffers. These buffers are saved to a temporary .ttf file and the file is loaded by the underlying Symbian API. The temporary file can only be deleted after the font is unloaded. - The font file must be in a public location in order to be loadable by Symbian. It can for example not reside in the private application directory. Therefore, all application fonts (also those that are on the file system) become a temporary .ttf file in c:\temp\. - Symbian3/PR2 will come with a font table API which provides direct access to font tables. Symbian3/PR1 and below are missing this API, therefore, an own TFontStore is (ab)used to read font tables out of a font. This patch is considering both code paths in several occasions, making the Qt Symbian font implementation significantly less maintainable. - The fonts are loaded into Symbian's central font server. Loaded fonts from different processes can have colliding font typeface names (not file names) on that server. The server does not separate loaded fonts by their origin processes. Working around such collisions is part of QTBUG-16514. The number of fonts loadable at the same time by a Qt application is limited to the random value 5. Just to prevent abuse of the font server's memory. As usual, this patch was looked at by colleagues, and it was adjusted according to the feedback. But since the bus factor for the interaction of Qt's and Symbian's font systems is 1, I reviewed this patch, myself. Task-Number: QTBUG-6611 Autotest: tst_QFontDatabase::addAppFont (cherry picked from commit 770fb729929764a1f1c5fbd3d54714cf811c81e0)
* Fix a bug that got revealed by 604c51f1fc5c79b7fad12cda911b06b9e6e5005fJan-Arve Sæther2011-01-191-0/+26
| | | | | | | | | | | | | | | | | | | | | | | The bug has been around for a while, but change 604c51f1fc5c7 made it emerge. The problem was that stretches were combined by always *maxing* them. The values of 'stretch' can be interpreted as this: -1: (the default) it means that the items should be stretched with the stretch factor dervived from the size hints. (In practice this means that they are distributed fairly). 0: Means that the item should not be stretched >0: Means that the item should be stretch with that number as a factor. This meant that combining one item with a fixed size(0) and another item with a default stretch (-1) the combined row stretch would end up being fixed. This also fixes how stretches are combined for spanning items too. Task-number: QTBUG-13551 Reviewed-by: John Tapsell (cherry picked from commit 7fbf1829e11504eca6a55f1e5dbddf2f658b5302)
* fixed CI gate flagged spelling error: occured -> occurredJeremy Katz2011-01-171-1/+1
| | | | (cherry picked from commit c3d2d583121219836714609b250e4e52e33e393d)
* various fixes to deal with CI gate failuresJeremy Katz2011-01-173-1/+102
| | | | (cherry picked from commit deef2cb5e01b871008b08b81691ad4a46deca328)
* Fix system proxy test: QNetworkProxyFactory::systemProxyForQuery() is staticJeremy Katz2011-01-173-4/+2
| | | | | | | | The test failed to build because QNetworkProxyFactory can't be instantiated (pure virtual member queryProxy()), but doing so isn't necessary. The test has also been removed from the network tests because it relies on a static configuration, but can not guarantee that the configuration exists. (cherry picked from commit 4d0cd05e98c3e83a4d1871c139cd8b4a2a86e988)
* QNetworkProxyFactory::systemProxyForQuery() for SymbianJyrki Jaakkola2011-01-174-0/+114
| | | | (cherry picked from commit 3c5eb8766e73c855782552f7c6472801e8ae820c)
* Fixed build failure on platforms other than SymbianGareth Stockwell2011-01-131-2/+8
| | | | | Reviewed-by: Ruth Sadler (cherry picked from commit 124ad6e903767fae510e0c2f0aba4029564a95c8)
* Allow IAP to be selected in Phonon MMF backendRuth Sadler2011-01-132-0/+189
| | | | | | | | | | | | | | | | | | | | | The Phonon API does not provide any way for the client to specify which network connection should be used for streaming playback. If the application already has a connection open, using a bearer other than the default (e.g. using WiFi when the device default is GPRS), it may be desirable to use it for streaming, rather than allowing the Phonon backend to open a second connection on the default bearer. This patch adds a custom property on the Phonon::MediaObject, called InternetAccessPointName. The client can specify the IAP which Phonon should use by setting this property. Note that support for this property is only provided in the Phonon MMF backend. Task-number: QTBUG-11436 Reviewed-by: Gareth Stockwell (cherry picked from commit 1640acce5ca8f49c5655edffa2a1108048c5a414)
* Fix qglthreads test crash on SymbianJani Hautakangas2011-01-131-2/+18
| | | | | | | | | | | Use less GPU memory to make tests pass and skip threaded rendering since eventually tries to access main RWindow from secondary thread, which is not allowed on Symbian Task-number: QTBUG-13525 Reviewed-by: TRUSTME (cherry picked from commit e49868217e29f13dba28a2fe199d82268655b9fb)
* Update copyright year to 2011.Jason McDonald2011-01-111309-1316/+1316
| | | | | Reviewed-by: Trust Me (cherry picked from commit ac5c099cc3c5b8c7eec7a49fdeb8a21037230350)
* Fix handle leak in symbian QTimer implementationShane Kearns2011-01-111-0/+38
| | | | | | | | | | | | | | | The timer handle was only being closed when a timer was cancelled, which resulted in a leak for one shot timers that have completed normally. Instead the timer is now closed in a destructor (closing null handles is safe, so it doesn't matter if the handle was never created - e.g. in the case of a zero timer) Also added a handle check before creating a timer to prevent a leak in case the start function is called twice in the backend. Task-number: QTBUG-16380 Reviewed-by: mread (cherry picked from commit 2b1b617664bfc78f6e95e53dc0f9749bd1f2d27a)
* Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7Alan Alpert2011-01-1021-2761/+144
|\
| * Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7-integrationQt Continuous Integration System2011-01-101-40/+54
| |\ | | | | | | | | | | | | * '4.7' of scm.dev.nokia.troll.no:qt/qt-qml: Fix loaded() signal to be emitted only once
| * | network tests: make IMAP, FTP testdata more flexible.Rohan McGovern2011-01-106-51/+142
| | | | | | | | | | | | | | | | | | | | | | | | Move all hardcoded IMAP/FTP fixtures into network-settings.h. Make it work with new and old network test server. Reviewed-by: Markus Goetz Task: QTBUG-15114
| * | Remove garbage empty test.Rohan McGovern2011-01-1014-2710/+0
| | |
| * | tst_networkselftest: add checks for echo, daytimeRohan McGovern2011-01-101-0/+2
| | |
* | | Update pathview testAlan Alpert2011-01-1015-318/+318
| |/ |/| | | | | | | | | | | This updates the tests to match the correct behaviour as of 1ba3e41f09ea719249286fede5d3fe96621ccb61 Task-number: QTBUG-16357
* | Fix loaded() signal to be emitted only onceBea Lam2011-01-101-40/+54
|/ | | | | Task-number: QTBUG-16319 Reviewed-by: Martin Jones
* Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into ↵Qt Continuous Integration System2011-01-071-0/+53
|\ | | | | | | | | | | | | | | 4.7-integration * '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-2: Fixes crash in QGraphicsItem's destructor. Doc: Fixing typo
| * Fixes crash in QGraphicsItem's destructor.Yoann Lopes2011-01-071-0/+53
| | | | | | | | | | | | | | | | Crash introduced by 783a278f243c6411f5f32d11f2165b9eed9b6f8c. Autotest written by Niklas Kurkisuo <ext-niklas.kurkisuo@nokia.com> Task-number: QTBUG-16374 Reviewed-by: TrustMe
* | tst_qnetworkreply: Add EXPECT_FAIL for ioGetFromBuiltinHttpMarkus Goetz2011-01-071-0/+2
| | | | | | | | Reviewed-by: Peter Hartmann
* | Revert "Fix QNetworkReply autotest cases for QT-3494"Markus Goetz2011-01-071-13/+9
| | | | | | | | | | We don't think this is the right fix. This reverts commit 5d18d393808d7a4be56eb00ab9f1e9cda9e211c9.
* | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into ↵Qt Continuous Integration System2011-01-063-13/+123
|\ \ | |/ |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 4.7-integration * '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1: licensing: exclude generated cookie jar table from license check fix include path fix build with namespaces in new cookie jar table cookie jar code: enhance security by keeping track of effective TLDs Add support for QMetaType::QVariant in ActiveQt Fix QNetworkReply autotest cases for QT-3494 Add compiler optimization for QtScript/JSC on Symbian improve performance of QTextEngine, esp. setBoundary by using non-detaching operator[] Improve docs for QTEST_MAIN macro. Work around an apparent GCC optimiser bug accessing arrays beyond end Do not crash in case a future version of libdbus has a new kind of message. Docs: QTBUG-9150 Incorrect snippet in class doc. tst_headers: make failure more detailed when failing to open a file Fix number of chapters in qtestlib tutorial. Fixed QStatusBar not to repaint itself too early QNAM HTTP: Fix missing error() signal Make it clear which security updates are needed for Visual Studio 2005.
| * licensing: exclude generated cookie jar table from license checkPeter Hartmann2011-01-061-1/+3
| | | | | | | | | | | | | | This file is generated from the Public Suffix List, and thus under a different license. Reviewed-by: Markus Goetz