summaryrefslogtreecommitdiffstats
path: root/tests/auto
Commit message (Collapse)AuthorAgeFilesLines
* Fix resolution of relative symlinks from relative path on unixOrgad Shaneh2017-08-271-0/+7
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Consider the following: /root/target - a file /root/path/link -> ../target /root/path/other/exe - executable Running from /root/path/other. exe is: #include <QDebug> #include <QFileInfo> int main() { qDebug() << QFileInfo("../link").symLinkTarget() return 0; } The link references /root/target, but the current output is /root/path/target. The link doesn't depend on the PWD. It depends on its own directory. Change-Id: I61e95018154a75e0e0d795ee801068e18870a5df Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
* Adapt qmake's raw-string parser to avoid confusion by macrosEdward Welbourne2017-08-243-2/+155
| | | | | | | | | | | | | | | | | | | | | | | | | | A macro name ending in R might expand to a string; if this precedes a string constant, we're juxtaposing the strings. My first parser for raw strings would mistake it for a raw string instead, ignoring the part of the identifier before R. Re-worked the exploration of what came before the string to catch these cases, too. The backwards parsing would also allow any messy jumble of [RLUu8]* as prefix for the string; but in fact R must (if present) be last in the prefix and *it* can have at most one prefix, [LUu] or u8. Anything else is an identifier that happens to precede the string. Reworked the parsing to allow only one prefix and not treat R specially unless it's immediately (modulo BSNL) before the string's open-quotes. Add link to the cppreference page about string literals, on which the grammar now parsed is based. Added a test for the issue this addresses. Verified that this fails on 5.6, dev and 5.9 without the fix. Expanded the existing test to cover R-with-prefix cases. Task-number: QTBUG-55633 Change-Id: I541486c2ec909cfb42050907c84bee83ead4a2f4 Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@qt.io>
* Fix invalid placeholder name in tst_qsqlthread.cppSérgio Martins2017-08-231-1/+1
| | | | | Change-Id: I88c0c48888b86b58d85223ad1dc4cafdaea01d77 Reviewed-by: Andy Shaw <andy.shaw@qt.io>
* QWidget: Call appropriate QWindow method from setGeometry_sys()Gabriel de Dietrich2017-08-231-0/+31
| | | | | | | | | | | | | | | | | | | | | | | When calling resize() from showEvent(), we'd set the full geometry on the widget's QWindow. This resulted in the top-level window being moved to the top-left corner, even though no other call to move() or setGeometry() had happened before. The solution consists on calling the proper QWindow methods depending on whether setGeometry_sys() is called for a move, a resize or both. Furthermore, this needs QWindow::resize() to set its position policy to frame-exclusive. The documentation states that is already the case and we're setting the full geometry on the platform window, so we need to convey that bit of information. This also solves the age-old conundrum: "### why do we have isMove as a parameter?" Change-Id: I2e00fd632929ade14b35ae5e6495ed1ab176d32f Task-number: QTBUG-56277 Reviewed-by: Gabriel de Dietrich <gabriel.dedietrich@qt.io> Reviewed-by: Friedemann Kleint <Friedemann.Kleint@qt.io>
* tst_QPrinter: Share printers in testPageRectAndPaperRect/testMarginFriedemann Kleint2017-08-231-64/+68
| | | | | | | | Speeds up testing by a factor of 2. Task-number: QTBUG-61827 Change-Id: I9d6c9d9786d35af3083bc7e98beb9a79dbcc7e11 Reviewed-by: Andy Shaw <andy.shaw@qt.io>
* Fix the test for non-English based setupsAndy Shaw2017-08-231-1/+11
| | | | | | | | | Unsetting the SOFTWARE environment variable will force lpstat to use English for the output, so we can ensure that the test will pass regardless of the language used for the machine. Change-Id: Iddf5e8aadaa546ae3e0dd172df84e4e43ee02c2a Reviewed-by: Friedemann Kleint <Friedemann.Kleint@qt.io>
* tst_QPrinter: Disambiguate all file namesFriedemann Kleint2017-08-231-38/+25
| | | | | | | | | | | Introduce helper function which uses a number to build unique names. Remove helper for deleting files since it now uses a temporary directory. Add a few cases that were overlooked in 88c68f4d9ed649f444bb22c52595da71ce4aac4e. Task-number: QTBUG-61827 Change-Id: I53355f99ffc3bfe6ad6994a5439710c9fa8cdad5 Reviewed-by: Andy Shaw <andy.shaw@qt.io>
* Fix crash when reading a PKCS12 file with no private keyEdward Welbourne2017-08-173-5/+26
| | | | | | | | | | | | | | | | | | The only reason our code wants PKCS12 files is for a private key, but a valid file needn't contain one; and reading a file without lead to a crash in QSslKeyPrivate::fromEVP_PKEY(). So check for missing key and fail the load, since the file is useless to us. Also ensure the caller's pkey is initialized, as we aren't promised that PKCS12_parse() will set it when there is no private key. Add a test for this case (it crashes without the fix) and update the instructions for how to generate test data to cover it also. (Corrected the wording there, too; at the interactive prompt, "providing no password" really provides an empty password.) Task-number: QTBUG-62335 Change-Id: I617508b903f6d9dee40d539b7136b0be8bc2c747 Reviewed-by: Timur Pocheptsov <timur.pocheptsov@qt.io>
* Block input to a window shown while an application modal dialog is visibleAndy Shaw2017-08-161-0/+42
| | | | | | | | | | | Although the window is refused input for the most part from the system, it does not act like that it is blocked by the application modal dialog. This ensures that it is the case and prevents things like being able to double click on the title bar to maximize the window on Windows. Task-number: QTBUG-49102 Change-Id: If1582819b90cb2ec9d891f664da24f13bfec7103 Reviewed-by: Paul Olav Tvete <paul.tvete@qt.io>
* Blacklist tst_QFont::DefaultFamily in B2QtTony Sarajärvi2017-08-161-0/+2
| | | | | | | Task-number: QTBUG-62528 Change-Id: Iadf9a923b2a624c5082fd1bd61691f8100178f94 Reviewed-by: Sami Nurmenniemi <sami.nurmenniemi@qt.io> Reviewed-by: Simon Hausmann <simon.hausmann@qt.io>
* Update binary compatibility files for Qt 5.9.0 for QtBaseMilla Pohjanheimo2017-08-1411-0/+96911
| | | | | | | | | | | Added binary compatibility files for Qt 5.9.0. 'QOpenGLExtraFunctionsPrivate::Functions' and 'QOpenGLExtraFunctionsPrivate' have been blacklisted in qtqa/tests/postbuild/bic/tst_bic.cpp, because those give false positive fail in the binary compatibility tests. Change-Id: I2231daef61a0c4677af36c85575b8dcd81070d44 Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
* Autotest: Fix test when running on a non-Unicode-capable localeThiago Macieira2017-08-121-3/+6
| | | | | | | Like my default FreeBSD environment. Change-Id: I3868166e5efc45538544fffd14d8a7f2dffa6ac9 Reviewed-by: Simon Hausmann <simon.hausmann@qt.io>
* Widgets: Fix ImSurroundingText query for a QLineEdit with maskJarkko Koivikko2017-08-111-0/+13
| | | | | | | | | | | | | | | | | | | | | QLineEdit with a mask does not return empty fields with the ImSurroundingText query. This is a problem for the input context that is not aware of the mask and relies on the fact that the cursor position never exceeds the boundaries of the surrounding text. This change fixes the issue by returning unmasked text with the ImSurroundingText query. [ChangeLog][QtWidgets][QLineEdit] Fixed behavior of the ImSurroundingText query. Previously, it returned a masked text whose length may be less than the cursor position. Now it returns unmasked text, so the text length is always greater than or equal to the cursor position. Task-number: QTBUG-60319 Change-Id: I1c8009164836a1baa2e3a45958bf1ea5fa9be38d Reviewed-by: Mitch Curtis <mitch.curtis@qt.io>
* Fix failing network cookie jar testsSimon Hausmann2017-08-071-4/+4
| | | | | | | | | | | | The test verifies that a cookie with a date in the future is not "expired" and will be sent to the server. This test started failing on August 7th 2017 when the test case "0003" with it's cookie expiring August 7th 2017 started ... expiring ;-) Bumped all suspicious cookie test cases by a hundred years. Change-Id: I7c09069ec4999e2ea0aae7b2a2819cced0fd6a99 Reviewed-by: Jędrzej Nowacki <jedrzej.nowacki@qt.io>
* Revert "Ignore thaiZWJ failure on RHEL 7.2"Simon Hausmann2017-08-071-2/+0
| | | | | | | | | | | The blacklisting is not needed anymore as we now use -qt-harfbuzz. This reverts commit b36e5faad49009778cea873ab30906bf212fc8b8. Task-number: QTQAINFRA-1363 Change-Id: I3ae50588204b27e6880416ae2cbc28dda53bb292 Reviewed-by: Eskil Abrahamsen Blomfeldt <eskil.abrahamsen-blomfeldt@qt.io> Reviewed-by: Jędrzej Nowacki <jedrzej.nowacki@qt.io>
* Add flowId to messages when logging in TeamCity formatBorgar Ovsthus2017-08-0431-874/+874
| | | | | | | | | | | | Added flowId='name' to each message when using TeamCity logging format. This is necessary to distinguish separate processes running in parallel. [ChangeLog][QtTest] Added flowId to messages when logging in TeamCity format. FlowId is used to distinguish logging from multiple processes running in parallel. Change-Id: I7f5046c1058ff02770404caa2c9b3a5398f97f6b Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
* Ignore thaiZWJ failure on RHEL 7.2Simon Hausmann2017-08-041-0/+2
| | | | | | | | The test fails when the system harfbuzz (version 1.3.2) is installed. Change-Id: Id18a5a3c503f64ef56567d71655e433a46908b3f Task-number: QTQAINFRA-1363 Reviewed-by: Jędrzej Nowacki <jedrzej.nowacki@qt.io>
* QAbstractItemView: fix nullptr violationRaschbauer, Reinhard2017-08-041-0/+25
| | | | | | | | | | | | | | | If in a slot connected to QAbstractItemView::clicked QAbstractItemView::setModel(nullptr) is called the method QAbstractItemView::mouseReleaseEvent will cause a segmentation fault. The problem is that the method QAbstractItemView::model used in QAbstractItemView::mouseReleaseEvent will return a nullptr if a null model was set. The solution is to used d->model since it is always a valid model. (See line d->model = (model ? model : QAbstractItemModelPrivate::staticEmptyModel()); in method QAbstractItemView::setModel) Change-Id: I6f01bdeac64495ee4a76adcc7bf8da8a7719ef4d Reviewed-by: David Faure <david.faure@kdab.com>
* tst_NoQtEventLoop: Pass with High DPI scaling activeFriedemann Kleint2017-08-041-7/+34
| | | | | | | | | | | | | | | | - Determine window sizes according to screen size and turn off scrolling. - Center the window to get it out of the way of taskbars. - Make the window top-most. - Turn off scaling so that coordinates passed to the QWindow child match device coordinates and the child is positioned correctly. - Make the child window a yellow raster window for easier debugging. Task-number: QTBUG-45956 Change-Id: I05864770f8ed638d0a36f3e3f2afed73d2952436 Reviewed-by: Oliver Wolff <oliver.wolff@qt.io>
* tst_qwidget::activation expect fail on Win 10Joni Jäntti2017-08-031-0/+6
| | | | | | | This test fails on Windows 10 x64 Creators Update CI builds for unknown reasons. Change-Id: I766bccfd4dea9ea195c68403018b419e800a7b3b Reviewed-by: Simon Hausmann <simon.hausmann@qt.io>
* tst_qgraphicswidget expect fail on Win 10Joni Jäntti2017-08-031-0/+7
| | | | | | | | | tst_qgraphicswidget::checkReason_ActiveWindow fails on Windows 10 Creators Update. Added expect fail for Windows platform. Task-number: QTBUG-62244 Change-Id: I71868a496659e7136af9a5b74684ba39edaf03ae Reviewed-by: Simon Hausmann <simon.hausmann@qt.io>
* tst_qfocusevent activateWindow for Win 10Joni Jäntti2017-08-031-0/+9
| | | | | | | | | This workaround was created to make tst_qfocusevent test pass on Windows 10 x64 Creators Update. Task-number: QTBUG-61467 Change-Id: I63eb149ae850174fb5de99761a6001e000a151a2 Reviewed-by: Simon Hausmann <simon.hausmann@qt.io>
* unbreak tst_qresourceengine for prefix buildsOswald Buddenhagen2017-08-031-2/+3
| | | | | | | | | don't try to execute a binary from the install dir. amends 8e776d39f. Change-Id: I37990bc83b295379f0c93f4ca712e1bbf980fd44 Reviewed-by: Oliver Wolff <oliver.wolff@qt.io>
* tst_QImageReader: Fix the size of the SVG imagesFriedemann Kleint2017-08-021-2/+2
| | | | | | | | | | | | | | | | | | The image appears to be 128x128. Fixes test failures FAIL! : tst_QImageReader::readFromResources(rect.svg) Compared values are not the same Actual (image.size()): QSize(128x128) Expected (size) : QSize(105x137) .\tst_qimagereader.cpp(1493) : failure location FAIL! : tst_QImageReader::readFromResources(rect.svgz) Compared values are not the same Actual (image.size()): QSize(128x128) Expected (size) : QSize(105x137) which likely do not show in the CI since the qtsvg module is not available when checking only qtbase. Change-Id: I84ebdde6f2251f56a00f16a54bd20d0c2b23638e Reviewed-by: Eirik Aavitsland <eirik.aavitsland@qt.io>
* Ignore hanging tst_qinputdialog::getInt/getDouble() test on macOS 10.12Simon Hausmann2017-08-021-0/+16
| | | | | | Change-Id: I495cd98144ba9145e44a9ee5cb8748ae97a6166f Task-number: QTQAINFRA-1356 Reviewed-by: Simon Hausmann <simon.hausmann@qt.io>
* Ignore failures of showMinimizedKeepsFocus/activateWindow on macOS 10.12Simon Hausmann2017-08-021-0/+3
| | | | | | Change-Id: I1b5823b48c5dd5bebb8172fd696fc521b7de75b2 Task-number: QTQAINFRA-1359 Reviewed-by: Frederik Gladhorn <frederik.gladhorn@qt.io>
* Ignore failures of submenuTearOffDontClose on macOS 10.12Simon Hausmann2017-08-021-0/+1
| | | | | | Change-Id: Ie3409da033325aea832907579d4d61dfd3610e7a Task-number: QTQAINFRA-1358 Reviewed-by: Frederik Gladhorn <frederik.gladhorn@qt.io>
* Fix storing of QDateTime timespec for SqliteJoni Poikelin2017-07-311-0/+38
| | | | | | | | | | | | | | Commit 9e64fc9e1cebf1e11694c4f536881128f5aee288 caused a regression which stored all QDateTime entries as if they were in localtime, which causes them to be offset by the amount of local timezone offset. This is fixed by adding "Z" if the time should be in UTC or using "+/-hh:mm" if it should use fixed UTC offset or specific timezone. Task-number: QTBUG-57138 Change-Id: Ie60905dfb3a517db442b636ca41daf8348753d84 Reviewed-by: Edward Welbourne <edward.welbourne@qt.io> Reviewed-by: Andy Shaw <andy.shaw@qt.io>
* Fix bytesAvailable() on UDP under WindowsAlex Trotsenko2017-07-301-1/+0
| | | | | | | | | | | | | | When ::WSAIoctl() reports 1 byte available for reading, we are trying to peek an incoming datagram to ensure that the data is actually delivered. But, according to MSDN docs, we are not allowed to pass NULL as 'lpNumberOfBytesRecvd' parameter to ::WSARecvFrom() call, if 'lpOverlapped' parameter is also NULL. The case with an empty datagram is fixed accordingly. Change-Id: Id13038245332d3fb4bc18038d44a7cfd7ce04775 Reviewed-by: Edward Welbourne <edward.welbourne@qt.io> Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
* Refactor tst_qdir::entryList()Friedemann Kleint2017-07-291-30/+69
| | | | | | | | | | | | | Split the test in two: one test that requires the symlinks and test files and one that does not need them. In the test with test files, verify each step and the deletion of the files. Task-number: QTBUG-58654 Task-number: QTBUG-50835 Change-Id: I14de57ce7a1df2d834d5a7565c804dead1d89088 Reviewed-by: Oliver Wolff <oliver.wolff@qt.io> Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
* Remove tst_qtconcurrentiteratekernel blockSize testJędrzej Nowacki2017-07-291-45/+0
| | | | | | | | | | | | | | | | | | | | | The test is just wrong. It suggests, that it tests minimal block size, but in reality it is checking if a maximal peak of block size is bigger then expected minimum block size. The minimal block size is 1, not 1024 / ideal threads count and it is defined in BlockSizeManagerV2. The maximal block size is defined and it is fixed, but it is an implementation detail, probably not worth testing. The test is based on a race condition as peakBegin and peakBlockSize are modified in parallel from multiple threads, without any synchronization. Change-Id: I430eedcf83b0fa3e2ce2cfd294eaee7b301e48ae Reviewed-by: Simon Hausmann <simon.hausmann@qt.io>
* Ignore tst_QFocusEvent failures on macOS 10.12Simon Hausmann2017-07-291-0/+5
| | | | | | Task-number: QTQAINFRA-1352 Change-Id: Ia5cad1af74a2ea581d768ce150e480f3a97b6495 Reviewed-by: Jędrzej Nowacki <jedrzej.nowacki@qt.io>
* Ignore failure of qaccessbilitymac on macOS 10.12Simon Hausmann2017-07-291-0/+2
| | | | | | Task-number: QTQAINFRA-1351 Change-Id: I9b41e5664cdb6cedcb68be6197fc21b2cc45963d Reviewed-by: Jędrzej Nowacki <jedrzej.nowacki@qt.io>
* Enrich tst_macNativeEvents blacklistSimon Hausmann2017-07-291-0/+16
| | | | | | | | Amends 0c7e4b97a7990b29255abaf4568f62b6a6b6c470 Task-number: QTQAINFRA-1292 Change-Id: I599dc1e7d39a96617d48fa32227093c8501b1323 Reviewed-by: Jędrzej Nowacki <jedrzej.nowacki@qt.io>
* Fix QStandardItem::setChild crash when passing a null pointerJesus Fernandez2017-07-271-0/+27
| | | | | | | | | | | | Passing a null pointer as a parameter to the setChild function no longer crashes when calling the QStandardItemModelPrivate::itemChanged signal. The child is removed from the model. The patch also fixes the behavior of deleting a item. A dataChanged signal is emitted. Change-Id: I027e8b0d84fe33c5fca056df870f0e60a020824b Reviewed-by: David Faure <david.faure@kdab.com>
* Revert "Make QFile::open fail when using an invalid file name"Thiago Macieira2017-07-271-1/+0
| | | | | | | | | | | | | | | | | | This reverts commit 346cd79192ef71afa572812e17f1d422594651a0. The bug report was incorrect, since the suggested file name is actually valid, it just happens to name an Alternate Data Stream (ADS) "20:803Z.txt" in file "testLog-03". [ChangeLog][QtCore][QFile] Reverted an incorrect change from Qt 5.9.0 that forbade the creation and access to Alternate Data Streams on NTFS on Windows. This means that file names containing a colon (':') are allowed again, but note that they are not regular files. Task-number: QTBUG-57023 Change-Id: I81480fdb578d4d43b3fcfffd14d4f2147e8a0ade Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@qt.io> Reviewed-by: Kai Koehne <kai.koehne@qt.io> Reviewed-by: Jesus Fernandez <Jesus.Fernandez@qt.io>
* Blacklist tst_MacGui::nonModalOrderJędrzej Nowacki2017-07-272-3/+1
| | | | | | | | | | | | | | The test is marked as expected failure for the last 3 years, in CI it is proven to be somehow flaky and it is failing now because of XPASS which is not covered by blacklist feature. This patch extends efforts of 7eba6d039dfbb9377a4358842fcd7210dc1fdd86 and 03b4838cb51513bd5d2edf76dccc4bc4a1181681 by blacklisting the test completely. Change-Id: Ia295d61620fa6bc97b168d4de9456a18ed5c064f Task-number: QTQAINFRA-1333 Reviewed-by: Simon Hausmann <simon.hausmann@qt.io>
* Return "en" for QLocale::c().bcp47Name()Jüri Valdmann2017-07-261-1/+1
| | | | | | | | | | | | | | | | | Currently QLocale::c().bcp47Name() returns "C" which, according to [BCP47], is not a valid language tag. In particular it does not conform to the ABNF grammar in section 2.1 which specifies a minimum length of 2 characters for all language tags. [BCP47]: https://tools.ietf.org/html/bcp47 This patch changes the return value to "en" seeing as the documentation for QLocale::Language states that the C language is identical in behavior to English. Task-number: QTBUG-61949 Change-Id: I2a381def8fb7156467e01d105da92bb1f4821204 Reviewed-by: Edward Welbourne <edward.welbourne@qt.io>
* Add test for QLocale::bcp47Name()Jüri Valdmann2017-07-261-0/+23
| | | | | | | Task-number: QTBUG-61949 Change-Id: I34fece0441afb1e69ea84ae59b90c5e2b7cf133f Reviewed-by: Edward Welbourne <edward.welbourne@qt.io> Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
* Convert features.tabbar to QT_[REQUIRE_]CONFIGStephan Binner2017-07-251-3/+3
| | | | | Change-Id: Id21a95cbc61b2559a8f517ee60548b61536e3cc4 Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@qt.io>
* Convert features.dockwidget to QT_[REQUIRE_]CONFIGStephan Binner2017-07-252-5/+7
| | | | | Change-Id: I1d4b0268df01f8bc0aec28af52cc4b639a376863 Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@qt.io>
* Convert features.calendarwidget to QT_[REQUIRE_]CONFIGStephan Binner2017-07-251-2/+2
| | | | | Change-Id: I93c2e00828a233f004c599bd0702d0a470ae29ff Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@qt.io>
* QLineEdit: Don't move the cursor after internalInsert() has done soAndy Shaw2017-07-241-0/+32
| | | | | | | | | | | | internalInsert() will set the cursor to the right position which accounts for any input mask set on the control as well. Therefore it will already be placed at the next correct position and should not be changed again after that. Task-number: QTBUG-40943 Change-Id: Ic0f5fad6999ddd367e435ec4409a5db5b9eacb7b Reviewed-by: Daniel Teske <qt@squorn.de> Reviewed-by: David Faure <david.faure@kdab.com>
* Windows: Don't raise inactive windows when showing a tooltipSergio Martins2017-07-191-0/+2
| | | | | | | | The Qt4 Q_WS_WIN ifdef never got ported. Change-Id: Iad1ca1a3e20bd5254895781eee09897520b7d7d1 Task-Id: QTBUG-39147 Reviewed-by: Friedemann Kleint <Friedemann.Kleint@qt.io>
* Use QSharedPointer::create() moreMarc Mutz2017-07-199-19/+19
| | | | | | | | | | | | | | | This is the result of running the (experimental) clang-tidy check qt-modernize-qsharedpointer-create Discarded changes: - tst_qsharedpointer.cpp: not sure we want these replacements there (→ separate change) - tst_collations.cpp: hit in a template specialization that is instantiated with both QSharedPointer and QSharedDataPointer. Change-Id: I203c2646e91d026735d923473af3d151d19e3820 Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
* Fix race condition in the processEvents testMorten Johan Sørvig2017-07-192-7/+4
| | | | | | | | | | | | | | | | | | This test verifies processEvents(WaitForMoreEvents) behavior by first processing all pending events (in a loop) and then verifying that a following processEvents call actually waits. But there is no guarantee that the OS won’t introduce more events after the first loop has completed. This does indeed seem to happen on recent versions of macOS. Change the test to not require that the processEvents call blocked and de-blacklist. Task-number: QTBUG-61131 Change-Id: Ic8fa74a6085165442791264f6f137a2fa6083138 Reviewed-by: Tor Arne Vestbø <tor.arne.vestbo@qt.io>
* tst_QStyle::drawItemPixmap(): Check on the image colorFriedemann Kleint2017-07-193-8/+8
| | | | | | | | | | | | Verify that all pixels of the grabbed image are green instead of comparing an image loaded from file. The test then also passes when High DPI scaling is active in which case a twice as big pixmap with DPR=2 is obtained when grabbing the widget. Change-Id: Ie5244a39a68ea0defd2590cf30f251d660d0869b Reviewed-by: Oliver Wolff <oliver.wolff@qt.io> Reviewed-by: Joerg Bornemann <joerg.bornemann@qt.io>
* tst_QWidget: Fix to pass with High DPI scaling enabledFriedemann Kleint2017-07-191-4/+5
| | | | | | | | | Scale coordinates in a few places, remove pixmap scaling in grabWindow() (Windows). Change-Id: Iba9e5d3ca55422a14eda09c8d04329a455d3acb3 Reviewed-by: Oliver Wolff <oliver.wolff@qt.io> Reviewed-by: Joerg Bornemann <joerg.bornemann@qt.io>
* Merge qt_error_string and QSystemErrorThiago Macieira2017-07-181-0/+4
| | | | | | | | | | | | | | | | | | | | | | This removes a lot of duplicated code that existed in both qglobal.cpp and qsystemerror.cpp, including the hack to get the correct strerror_r signature. This removes the incorrect use of EACCES, EMFILE, ENOENT, and ENOSPC from qt_error_string on Windows. qt_error_string is supposed to be used only with Win32 error codes from GetLastError(), despite there being a lot of uses in cross-platform and even Windows-specific code that pass errno constants. It may or may not work: that depends on whether the constants happen to match. ENOENT matches ERROR_FILE_NOT_FOUND and one could argue that ENOSPC matching ERROR_OUT_OF_PAPER is acceptable, but EMFILE isn't the same as ERROR_BAD_LENGTH nor is EACCES, ERROR_INVALID_DATA. Change-Id: I1eba2b016de74620bfc8fffd14cccb7f77f4b510 Reviewed-by: Friedemann Kleint <Friedemann.Kleint@qt.io> Reviewed-by: Kai Koehne <kai.koehne@qt.io> Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
* QAsn1Element - fix toDateTime functionTimur Pocheptsov2017-07-181-0/+27
| | | | | | | | | | | | | ASN UTCTime uses two characters to encode a year (YY). When converting it into QDate, it's quite naive to just add 2000. According to RFC 2459, these YY represent dates in the range [1950, 2049]. This patch also introduces a helper function doing the checked conversion from a string to int (to be reused in the following-up patches). Task-number: QTBUG-61934 Change-Id: I3f6f471d24e8357b83b2f5973023b2b842751389 Reviewed-by: Edward Welbourne <edward.welbourne@qt.io> Reviewed-by: Timur Pocheptsov <timur.pocheptsov@qt.io>