summaryrefslogtreecommitdiffstats
path: root/tests
Commit message (Collapse)AuthorAgeFilesLines
* Do not run tst_qcolumnview in parallelFriedemann Kleint2014-03-191-1/+0
| | | | | | | | | Task-number: QTBUG-36395 Change-Id: Id1f5cfeca3f18d6d7d1f2354211e15d349dd7b8f Reviewed-by: Sergio Ahumada <sahumada@blackberry.com> Reviewed-by: Frederik Gladhorn <frederik.gladhorn@digia.com> Reviewed-by: J-P Nurmi <jpnurmi@digia.com>
* Fix tst_QColumnView::scrollTo()J-P Nurmi2014-03-191-0/+3
| | | | | | | | | | The test relies on active focus, so activate the test window in the beginning of the test to avoid undesired focus widget changes by QApplication::setActiveWindow() during the test. Task-number: QTBUG-36395 Change-Id: I6febec7d552224b1754aaf57520ed6d435d29563 Reviewed-by: Friedemann Kleint <Friedemann.Kleint@digia.com>
* Do not run tst_qabstractitemview in parallelFrederik Gladhorn2014-03-191-1/+0
| | | | | | | | | | This test waits for window activation and gets disturbed by mouse movements. The test duration is not long enough to justify the flakyness (around 10 seconds on my laptop). Change-Id: I985044f954c09442220db3ca318045c04ef6bb77 Reviewed-by: Sergio Ahumada <sahumada@blackberry.com>
* Merge "Merge remote-tracking branch 'origin/release' into stable" into ↵Jani Heikkinen2014-03-172-7/+53
|\ | | | | | | refs/staging/stable
| * Merge remote-tracking branch 'origin/release' into stableFrederik Gladhorn2014-03-172-7/+53
| |\ | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: src/gui/painting/qdrawhelper.cpp src/gui/painting/qdrawhelper_avx.cpp src/gui/painting/qdrawhelper_x86_p.h Change-Id: I09352d05119f6fd000319074a2705b38361b2c90
| | * CSS parser: fix the pseudo-classes array lengthGiuseppe D'Angelo2014-02-261-0/+32
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The pseudoclass array is declared with length "NumPseudos - 1", but the declaration has actually 44 elements, not 45. This caused a zero-initialized last element to be silently appended to the array. The zero-initialized element broke the sorting of the array, which in turn broke std::lower_bound usage (although of course the problem was there from before switching to the standard library algorithms). Task-number: QTBUG-36933 Change-Id: I8a02891fc36761b6ae72d15a0a8d6c6a96813947 Reviewed-by: Olivier Goffart <ogoffart@woboq.com>
| | * Fix drawCachedGlyphs on RGBA8888Allan Sandfeld Jensen2014-02-261-7/+21
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | drawCachedGlyphs draws with the wrong color on RGBA8888. The issue is that the draw routines bitmapblit_quint32 and alphamapblit_quint32 while safe to use on rgba formats, needs to have the input color converted. This patch adds small wrapper functions for bitmapblit and alphamapblit that converts the formats. Two tests are extended to ensure we have test coverage. Change-Id: I5f99f3795eba46a69d4df5b167e6099024e9a060 Reviewed-by: Gunnar Sletta <gunnar.sletta@jollamobile.com>
* | | QPrinter - Expect failure of QPrinter page size testJohn Layt2014-03-171-1/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The page size test can get confused when two printer papers have the same size, but the code being tested is actaully correct. Put a temp QEXPECT_FAIL on the test and some debug statements so we can see why it fails and fix the test as required. Change-Id: I160ba2ed7344500d89bdcb9bb416863713fef84b Reviewed-by: Lars Knoll <lars.knoll@digia.com>
* | | QtPrintSupport - Fix QT_NO_PRINTER buildJohn Layt2014-03-171-0/+2
| | | | | | | | | | | | | | | | | | | | | | | | Fix the QT_NO_PRINTER build for issues that have accumulated over last few months, and in the new changes already approved. Change-Id: I9aed21dee861837fd1a68a96692c873a4f5be293 Reviewed-by: Lars Knoll <lars.knoll@digia.com>
* | | QPrinter - Fix winPageSize() on Mac and LinuxJohn Layt2014-03-171-13/+17
| | | | | | | | | | | | | | | | | | | | | | | | | | | Using QPageSize internally provides the Windows ID on all platforms so remove the conditional compile on the QPrinter api and add support to the print engines. Change-Id: I31e23d5090a9b6ceb087c29dead050b0ee1855a5 Reviewed-by: Lars Knoll <lars.knoll@digia.com>
* | | QPrinter - Use QPageSize and QPageLayoutJohn Layt2014-03-171-104/+54
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Use QPageSize and QPageMargins to get/set values in the print engines, add api to directly set the values, and rewrite the docs to make the paper-based api obsolete instead of the page-based api. Add new PPK keys to pass QPageSize, QPageMargins and QPageLayout to the print engines to ensure no level of detail is lost, e.g. for custom sizes passed to QPrinter. [ChangeLog][QtPrintSupport][QPrinter] QPrinter can now use QPageSize and QPageLayout in the public api to control the page layout for a print job. Change-Id: Iee39a4042bcd6141d29b0a82b49066d7a7a78120 Reviewed-by: Lars Knoll <lars.knoll@digia.com>
* | | QPrintEngine - Switch Windows to QPlatformPrintDeviceJohn Layt2014-03-171-39/+8
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Change the Windows QPrintEngine implementation to use the QPlatformPrintDevice to obtain device information, and use QPageSize to obtain page size conversions. A following change will use QPageLayout to store that page size. Change-Id: I990943e2b62ab6dab2c4d4a292c7ed7261beadf2 Reviewed-by: Lars Knoll <lars.knoll@digia.com>
* | | QPdfWriter - Use QPageSize and QPageLayoutJohn Layt2014-03-174-0/+276
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Add support to QPdfWriter for QPageSize, QPageLayout, and resolution. [ChangeLog][QtGui][QPdfWriter] The QPdfWriter now supports setting the PDF orientation, layout and resolution by using QPageSize and QPageLayout. Change-Id: I9c269f997ec540dac1989f355c6a2e7488947966 Reviewed-by: Lars Knoll <lars.knoll@digia.com>
* | | QPrinterInfo - Switch to QPlatformPrintDeviceJohn Layt2014-03-172-30/+72
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Change the QPrinterInfo implementation to use QPlatformPrintDevice as the backend. Remove all the old QPrinterInfo related code from the QPA plugin. Add public api to QPrinterInfo to support some features from QPlatformPrintDevice. [ChangeLog][QtPrintSupport][QPrinterInfo] Added new public api for isRemote(), state(), defaultPageSize(), supportedPageSizes(), supportsCustomPageSizes(), minimumPhysicalPageSize(), maximumPhysicalPageSize(), supportedResolutions(), availablePrinterNames(), and defaultPrinterName(). The use of availablePrinters() is discouraged due to performance concerns. Task-number: QTBUG-35248 Change-Id: Ic38323a930549ad67bf04a1a6bb43d623dfe6a33 Reviewed-by: Lars Knoll <lars.knoll@digia.com>
* | | QPlatformPrintDevice - New QPA base classJohn Layt2014-03-176-0/+307
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Add a new QPA class to abstract Print Devices. Each platform instance will encapsulate all required details about a print device instead of the code being distributed throughout the print engine and print plugin. Change-Id: I7f6a537ad55a6e7f599d83f461b1e2ee62b15094 Reviewed-by: Lars Knoll <lars.knoll@digia.com>
* | | QPageLayout - Add new QPageLayout classJohn Layt2014-03-174-0/+288
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | New QPageLayout to encapsulate page layout details including page size, orientation and margins. Scale may be added later. Subsequent changes will use this class in the paged paint devices, paint engines, print engines, and print plugins to replace multiple inconsistent local implementations. [ChangeLog][QtGui] Added class QPageLayout to support handling page layouts including the page size, orientation and margins. Change-Id: Ife1ddd6c2a8d1516542be2eb37425111f41cd5c7 Reviewed-by: Lars Knoll <lars.knoll@digia.com> Reviewed-by: Andy Shaw <andy.shaw@digia.com>
* | | QPageSize - Add new QPageSize classJohn Layt2014-03-174-0/+269
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | New QPageSize class to encapsulate paper sizes and names to ensure all sizes and conversions are consistent and match the Postscript standard sizes. Subsequent changes will use this class in the paged paint devices, paint engines, print engines, and print plugins to replace multiple inconsistent local implementations. [ChangeLog][QtGui][QPageSize] Added new QPageSize class to implement Adobe Postscript PPD standard page sizes. This class supports the standard page sizes, names and keys from the PPD standard, and provides convenient size and rect conversion methods. Change-Id: Ie2c8be0c3df0d29ac5da4cd9877ad41d0982633c Reviewed-by: Lars Knoll <lars.knoll@digia.com>
* | | QPrinter - Add page metric testsJohn Layt2014-03-171-64/+220
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Add more page metrics tests to expose the many bugs and inconsistencies in the page layout handling. No platform or pdf backend passes all these tests so they are skipped for now, but following commits will use the tests to ensure the re-write of the page layout handling fixes the many problems in a consistent way for all backends. Change-Id: Ic5b16aa08dfe2bd9a9191662fd2bbe6b913e15c9 Reviewed-by: Friedemann Kleint <Friedemann.Kleint@digia.com> Reviewed-by: Lars Knoll <lars.knoll@digia.com> Reviewed-by: Andy Shaw <andy.shaw@digia.com>
* | | Fix Q_DECLARE_METATYPE macroJędrzej Nowacki2014-03-171-1/+7
|/ / | | | | | | | | | | | | | | | | The macro should stringify value of the given token not the token itself. Task-number: QTBUG-37547 Change-Id: I90f4fa613bd13d5a581828ab13f620b40dfd3593 Reviewed-by: Olivier Goffart <ogoffart@woboq.com>
* | Add verbose messages to tst_qnetworkreply.Friedemann Kleint2014-03-151-52/+70
| | | | | | | | | | | | | | Task-number: QTBUG-37449 Change-Id: Ib3802ddd51b908a68d8c893ce49010aeeb117db8 Reviewed-by: Peter Hartmann <phartmann@blackberry.com>
* | Remove the _qt_filedialog_xxx hooksJ-P Nurmi2014-03-151-93/+0
| | | | | | | | | | | | | | | | | | | | These internal and obsolete hooks are no longer used. The correct way to provide platform dialogs in Qt 5.x is to implement a platform theme plugin, as was done for GTK+ 2.x. Change-Id: I3f1474fbf760130106b3c47173eaedd2f1a919bf Reviewed-by: Shawn Rutledge <shawn.rutledge@digia.com> Reviewed-by: David Faure <david.faure@kdab.com>
* | d3dcompiler_qt: Remove control file semanticsAndrew Knight2014-03-141-11/+7
| | | | | | | | | | | | | | | | | | | | | | | | | | | | This simplifies the compiler control semantics by always using the packaged compiler if it is available. With no packaged compiler, the service is assumed to be running if the directory structure is present. Use of a packaged library can be overridden by setting the environment variable QT_D3DCOMPILER_DISABLE_DLL to 1. When the runtime compiler is used, the source will no longer be logged, and the compilation output will no longer be cached. Change-Id: Ib07f517e7043d7785bdfa9da55abd34df518eeed Reviewed-by: Oliver Wolff <oliver.wolff@digia.com>
* | Introduce GENERATED_TESTDATA variable and fix qresourceengine test.Janne Anttila2014-03-141-8/+1
| | | | | | | | | | | | | | | | | | | | | | testcase.prf cannot be loaded from pro file for various reasons, see qtbase commit history for details. Moved runtime testdata logic from pro file to testdata.prf, and thus made is reusable in other test cases as well. Change-Id: I500d08dc4951e4eda862071e4ddd3e0f6de8c3d2 Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@digia.com>
* | Add GL information to qpainfo.Friedemann Kleint2014-03-141-0/+72
| | | | | | | | | | | | | | Task-number: QTBUG-31611 Change-Id: Ibf9bcb74ed8dbf8625e77ef0870d758a77ea65cb Reviewed-by: Jørgen Lind <jorgen.lind@digia.com> Reviewed-by: Laszlo Agocs <laszlo.agocs@digia.com>
* | Fix spurious XPASS in tst_QGraphicsAnchorLayout.Friedemann Kleint2014-03-141-12/+19
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Seen on Windows: XPASS : tst_QGraphicsAnchorLayout::stability() QCOMPARE(sameAsPreviousArrangement, true) returned TRUE unexpectedly. tst_qgraphicsanchorlayout.cpp(1399) : failure location Move check into loop with descriptive message on fail, do not error out if it actually passes. This now typically prints: XFAIL : tst_QGraphicsAnchorLayout::stability() The layout has several solutions, but which solution it picks is not stable ( QRectF(30,0 0x10) != QRectF(30,0 10x10) , iteration 3 , item 4 ) Change-Id: Iae8553dbbcedeb70d5d672e3cefbd1f06a63d27d Reviewed-by: Jan Arve Sæther <jan-arve.saether@digia.com>
* | Fix tst_qthreadpool under high load.David Faure2014-03-141-0/+1
| | | | | | | | | | | | | | | | | | | | The tasks might not have run yet at the time of the QCOMPARE, so we need to acquire on the semaphore in order to ensure that this is the case, just like in the previous testcase. Change-Id: I1da72bb07c2f53760b3bf912fc26aaf10ed18d48 Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@digia.com> Reviewed-by: Friedemann Kleint <Friedemann.Kleint@digia.com>
* | Fix qchar testdata installation.Janne Anttila2014-03-141-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | NormalizationTest.txt does not exist in the project root, but under 'data' directory. TESTDATA is converted to INSTALLS rules in testcase.prf. INSTALLS rules generated in testcase.prf does not set 'no_check_exist' CONFIG variable. Thus qmake will not install NormalizationTest.txt since it cannot find it from defined location. Even TESTDATA has been incorrectly defined, NormalizationTest.txt has been found in majority of the platforms thanks to QFINDTESTDATA flexibility. However it causes problems on sand-boxed platforms such as WinRT. Fixed by defining the relative path to NormalizationTest.txt in TESTDATA so that qmake can find the file when processing INSTALLS variable. Change-Id: Id9a28db2a00b17d2c0136e6ff32f421b21137898 Reviewed-by: Andrew Knight <andrew.knight@digia.com> Reviewed-by: Liang Qi <liang.qi@digia.com>
* | correct send vs sent grammarDavid Fries2014-03-143-3/+3
| | | | | | | | | | | | | | | | Correct the tense of send vs sent in comments and documentation. Change-Id: I1c5ce9a7b1e49b8b0e8dcfde7d732e4c69acf73a Reviewed-by: Kurt Pattyn <pattyn.kurt@gmail.com> Reviewed-by: Laszlo Agocs <laszlo.agocs@digia.com>
* | Disable UNC tests on WinRT.Janne Anttila2014-03-143-9/+9
| | | | | | | | | | | | | | | | Based on file system implementation for WinRT, the UNC paths are not supported on WinRT, so lets disable corresponding tests as well. Change-Id: Ib45ae618f39d5da39a822160096599b30204cf71 Reviewed-by: Andrew Knight <andrew.knight@digia.com>
* | Add sizeLessWindow test case.Morten Johan Sørvig2014-03-141-0/+38
| | | | | | | | | | | | | | | | | | | | | | Verify that QOpenGLContext works with QWindows that do not have an explicit size set. Task-number: QTBUG-35342 Change-Id: I91be7beb0062c5825fc58273c701c396b6423256 Reviewed-by: Gabriel de Dietrich <gabriel.dedietrich@digia.com> Reviewed-by: Gunnar Sletta <gunnar.sletta@jollamobile.com>
* | Removed unnecessary TESTDATA statement from qmessageauthenticationcode.Janne Anttila2014-03-141-1/+0
| | | | | | | | | | | | | | | | | | | | | | QMessageAuthenticationCode autotest does not have data folder for TESTDATA. It seems that pro file is copy/pasted from another one which actually have data. Removed the unnecessary statement since it caused problems for https://codereview.qt-project.org/77981. Change-Id: Ide753e5692bd2f469217760173a9b60f2f646770 Reviewed-by: Andrew Knight <andrew.knight@digia.com> Reviewed-by: Liang Qi <liang.qi@digia.com>
* | Disable splashScreenModality test: dialog is going under splash screenShawn Rutledge2014-03-141-0/+2
| | | | | | | | | | | | | | | | | | That's a bug, but this test causes CI problems until it's fixed. Task-number: QTBUG-35169 Change-Id: I27b3a61437312d2217743670fa14510d9340d8c1 Reviewed-by: Morten Johan Sørvig <morten.sorvig@digia.com> Reviewed-by: Simo Fält <simo.falt@digia.com>
* | Logging: Let user configure rules via QT_LOGGING_RULESKai Koehne2014-03-131-0/+8
| | | | | | | | | | | | | | | | | | | | | | | | Check also for rules set in an environment variable QT_LOGGING_RULES. This makes it even more convenient to set rules e.g. for just one run of an application, without having to create a logging configuration file. It is also more in place with the current way we enable/disable debugging of parts of Qt via environment variables. Change-Id: I4d05976f2b6c12bca472552ffa22345475cd01de Reviewed-by: Laszlo Agocs <laszlo.agocs@digia.com> Reviewed-by: Tomasz Olszak <olszak.tomasz@gmail.com>
* | Use QStringRef for parsing of logging rulesKai Koehne2014-03-131-1/+1
| | | | | | | | | | | | | | | | Use QStringRef to speed up the parsing of the left side of logging rules. Change-Id: Idd4d75496e3865d092f2802c45928a414c14c615 Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@digia.com> Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
* | Make parsing of categories in logging rules more strictKai Koehne2014-03-131-0/+8
| | | | | | | | | | | | | | Do not accept rules with wildcards in the middle. Change-Id: If6fa71629c46bc4127aa8bd475643bc0e8a9f57c Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
* | Make parsing of categories in logging rules consistent.Kai Koehne2014-03-131-0/+114
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The documentation says that the left side of a logging rule has the syntax <category>[.<type>] with optional wildcard '*' as the first or the last character (or at both positions. However, so far we didn't allow qt.*.debug But what we did allow is implicit dropping of trailing '.', e.g. qt.* matched also 'qt' Fix these by splitting up the '.type' in advance, and then do string matching only on the 'real' category names. Change-Id: Iab50ad0fc673464e870f5ab8dfb3245d829b3107 Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
* | QDebug: Allow text stream formatting for 64 bit numbersKai Koehne2014-03-131-0/+13
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Use the QTextStream stream operator for formatting 64 bit numbers, just like we do for other numbers, too. This ensures all numbers in a QDebug stream e.g. respect the hex and showbase modifiers. The original reason for formatting qin64, quint64 with QString::number is unclear (pre-dates the original qt4 git import). Maybe QTextStream did lack proper support for 64 bit numbers back then. Task-number: QTBUG-36841 Change-Id: I049516c2a8394c9c1a708f86c3d950418a20a957 Reviewed-by: Friedemann Kleint <Friedemann.Kleint@digia.com> Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
* | tests: Mark tst_qdbus* tests as insignificant on OS XSergio Ahumada2014-03-1314-0/+28
| | | | | | | | | | | | | | | | | | D-Bus libraries were recently added to OS X 10.7 making these tests to be executed for first time. Task-number: QTBUG-37469 Change-Id: Ia7a74a45b18d4a645307f7fb7666236c5e009e5f Reviewed-by: Simo Fält <simo.falt@digia.com>
* | Stabilize tst_qnetworkreply on Windows.Friedemann Kleint2014-03-131-6/+13
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Do not close connection in slot bytesWritten() since that can cause clients to fail with "Connection Closed". Instead, use deleteLater() to close properly and prevent leaking the sockets. FAIL! : tst_QNetworkReply::qtbug28035browserDoesNotLoadQtProjectOrgCorrectly() 'waitForFinish(reply) == Success' returned FALSE. ( QUrl( "http://localhost:58240" ) failed: # 2 "Connection closed" ) ..\tst_qnetworkreply.cpp(7067) : failure location Task-number: QTBUG-37449 Change-Id: Ib92cb62fae523370b2fb45e1ccfa217559732bc8 Reviewed-by: Peter Hartmann <phartmann@blackberry.com> Reviewed-by: Joerg Bornemann <joerg.bornemann@digia.com>
* | Fix network tests relying on troll.noSimo Fält2014-03-133-5/+5
| | | | | | | | | | | | | | | | Replacing old troll.no domain with qt-project.org domain. Using troll.no doesn't work anymore. Change-Id: Ic6fa71b044d1adbdc66c875b47bfdc256a2afc8e Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@digia.com>
* | Skip the test 'abort' of tst_qftp.Friedemann Kleint2014-03-101-0/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The test takes too long and fails: FAIL! : tst_QFtp::abort(WithoutProxy:get_fluke01) '(int)newData_ba.size() == bytesDone' returned FALSE. () tst_qftp.cpp(1886) : failure location FAIL! : tst_QFtp::abort(WithoutProxy:get_fluke01) Network operation timed out tst_qftp.cpp(1392) : failure location FAIL! : tst_QFtp::abort(WithoutProxy:put_fluke01) 'bytesDone != bytesTotal' returned FALSE. () tst_qftp.cpp(1406) : failure location FAIL! : tst_QFtp::abort(WithSocks5Proxy:get_fluke01) '(int)newData_ba.size() == bytesDone' returned FALSE. () tst_qftp.cpp(1886) : failure location FAIL! : tst_QFtp::abort(WithSocks5Proxy:get_fluke01) Network operation timed out tst_qftp.cpp(1392) : failure location FAIL! : tst_QFtp::abort(WithoutProxyWithSession:get_fluke01) '(int)newData_ba.size() == bytesDone' returned FALSE. () tst_qftp.cpp(1886) : failure location FAIL! : tst_QFtp::abort(WithoutProxyWithSession:get_fluke01) Network operation timed out tst_qftp.cpp(1392) : failure location FAIL! : tst_QFtp::abort(WithoutProxyWithSession:put_fluke01) 'bytesDone != bytesTotal' returned FALSE. () tst_qftp.cpp(1406) : failure location FAIL! : tst_QFtp::abort(WithSocks5ProxyAndSession:get_fluke01) '(int)newData_ba.size() == bytesDone' returned FALSE. () tst_qftp.cpp(1886) : failure location FAIL! : tst_QFtp::abort(WithSocks5ProxyAndSession:get_fluke01) Network operation timed out tst_qftp.cpp(1392) : failure location Totals: 327 passed, 10 failed, 4 skipped QtQA::App::TestRunner: warning: test duration (398 seconds) is dangerously close to maximum permitted time (450 seconds) QtQA::App::TestRunner: warning: Either modify the test to reduce its runtime, or use a higher timeout. QtQA::App::TestRunner: test failed, running again to see if it is flaky... Change-Id: I122641f174927c6b3668df05c79f88e38b88042f Reviewed-by: Peter Hartmann <phartmann@blackberry.com>
* | Increase timeout in tst_NetworkSelfTest.Friedemann Kleint2014-03-101-5/+16
| | | | | | | | | | | | | | | | | | | | | | | | | | Try to fix frequently failing test: FAIL! : tst_NetworkSelfTest::ftpProxyServer() Failed to receive data in step 32: timeout tst_networkselftest.cpp(230) : failure location on Windows. Introduce timeout constant, add message. Change-Id: I709f0b34cd1cfe5d3c64cf61ccb7907bd616bc54 Reviewed-by: Peter Hartmann <phartmann@blackberry.com> Reviewed-by: Richard J. Moore <rich@kde.org>
* | Revert the QByteArrayList addition to Qt 5.3Thiago Macieira2014-03-083-228/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This reverts commits f12b0f9a38c792abb13f3e6ecff4542986a6f96b ("QByteArrayList: optimize op+"), f96f2fe3670bc8a32389795dc21b9839407465a1 ("Enable QByteArrayList tests"), and 4f23f0530a9c59400a7f3821cd2c9355801ed8cd ("new QByteArrayList class"). This class is coming back in Qt 5.4. [ChangeLog][CHANGELOG FIX] Remove the line about QByteArrayList being added. Change-Id: I890ab2b34a9b3e575512eb306d0f241143a867cf Reviewed-by: Jędrzej Nowacki <jedrzej.nowacki@digia.com>
* | Add Objective-C specific type converters to QByteArraySamuel Gaist2014-03-083-0/+131
| | | | | | | | | | | | | | | | | | | | | | | | | | | | This patch adds the Objective-C NSData/CDataRef converters to QByteArray This will replace the current converters offered in QMacExtras [ChangeLog][QtCore][Objective-C] Added NSData/CDataRef converters for QByteArray Change-Id: I7a0f14bee4271798db345f3c5efd26ac671a3ea4 Reviewed-by: Jake Petroules <jake.petroules@petroules.com> Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
* | Sanitize tst_qftp.Friedemann Kleint2014-03-062-92/+113
| | | | | | | | | | | | | | | | | | - Replace SRCDIR define by QFINDTESTDATA - Replace QVERIFY by QCOMPARE where applicable - Introduce QVERIFY2 with message for comparisons Change-Id: Ib5a6b0f09428587281e1b9521e4d8a8117c1afdb Reviewed-by: Peter Hartmann <phartmann@blackberry.com>
* | Try to speedup tst_qmetatype.cpp compilation with clang.Jędrzej Nowacki2014-03-062-4/+15
| | | | | | | | | | | | | | | | | | | | | | | | | | The test instantiates enormous amounts of templates in one compilation unit. All clang versions, that I tested, suffers from performance issues while compiling the test, the cost depends on the version. The most affected are shipped by Apple. Task-number: QTBUG-37237 Change-Id: I0959c1a4a6faee448ae1dae5c1e70ee06cefbd9c Reviewed-by: Simo Fält <simo.falt@digia.com> Reviewed-by: Frederik Gladhorn <frederik.gladhorn@digia.com>
* | Reduce clang compilation time of tst_qmetatype by ~50%Jędrzej Nowacki2014-03-061-13/+1
| | | | | | | | | | | | | | | | | | We do not need to check all possible basic type combinations in the autoregistration test. Change-Id: Ibfb97a93d9d1862e669d843988976690bbc83c74 Reviewed-by: Stephen Kelly <stephen.kelly@kdab.com> Reviewed-by: Olivier Goffart <ogoffart@woboq.com>
* | Simplify tst_QMetaType::automaticTemplateRegistrationJędrzej Nowacki2014-03-061-55/+62
| | | | | | | | | | | | | | | | | | | | Redundant and unused variadic macro arguments were removed. For macros with known count of arguments, named arguments are preferred. Common code was moved out from macros so it is not generated over and over. Change-Id: Ib5106555d0d3c6cadfbdbdbd614831240b6d762f Reviewed-by: Stephen Kelly <stephen.kelly@kdab.com>
* | tst_QGLThreads: Fix errors about makeCurrent() in different thread.Friedemann Kleint2014-03-061-0/+12
| | | | | | | | | | | | | | | | | | | | QFATAL : tst_QGLThreads::textureUploadInThread() Cannot make QOpenGLContext current in a different thread QFATAL : tst_QGLThreads::painterOnPboInThread() Cannot make QOpenGLContext current in a different thread Task-number: QTBUG-28264 Change-Id: I281cf0593e01b43456410a9a53746bbb15f34f24 Reviewed-by: Laszlo Agocs <laszlo.agocs@digia.com>
* | Increase CI timeout for cmake tests.Friedemann Kleint2014-03-061-0/+1
| | | | | | | | | | | | Change-Id: I1711f99f9e46f1d195684e3c3a714b00618dca2e Reviewed-by: Sergio Ahumada <sahumada@blackberry.com> Reviewed-by: Stephen Kelly <stephen.kelly@kdab.com>