summaryrefslogtreecommitdiffstats
path: root/tests
Commit message (Collapse)AuthorAgeFilesLines
...
| | * 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>
* | | Introduce QHstsStore - the permanent store for HSTS policiesTimur Pocheptsov2017-08-021-0/+72
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The store is using QSettings under the hood. A user can enable/disable storing HSTS policies (via QNAM's setter method) and we take care of the rest - filling QHstsCache from the store, writing updated/observed targets, removing expired policies. Change-Id: I26e4a98761ddfe5005fedd18be56a6303fe7b35a Reviewed-by: Timur Pocheptsov <timur.pocheptsov@qt.io> Reviewed-by: Edward Welbourne <edward.welbourne@qt.io>
* | | Add QThreadPool::stackSizeMorten Johan Sørvig2017-08-021-0/+34
| | | | | | | | | | | | | | | | | | | | | | | | | | | Allows setting the stack size for the thread pool worker threads. Implemented using QThread::stackSize. Task-number: QTBUG-2568 Change-Id: Ic7f3981289290685195bbaee977a23e0c3c49bf0 Reviewed-by: Morten Johan Sørvig <morten.sorvig@qt.io>
* | | Allow conversion of QVariants with real null valuesAllan Sandfeld Jensen2017-08-021-1/+29
|/ / | | | | | | | | | | | | | | | | Update documentation to be clearer on the special null variant state with no value as opposed to a variant with a null value, and only block conversions of the former. Change-Id: I24fd50285414e049de87de54a63700a89bd5adf1 Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
* | Implement graph layers support in QShaderGeneratorKevin Ottens2017-08-021-2/+185
| | | | | | | | | | Change-Id: I823f7866bc5e1f3b262f1aacf4c341dabda7305d Reviewed-by: Sean Harmer <sean.harmer@kdab.com>
* | Add support for layers in QShaderGraphLoader formatKevin Ottens2017-08-021-8/+14
| | | | | | | | | | Change-Id: I5038600e73523ac7eb37a88ddff1f942af18f18e Reviewed-by: Sean Harmer <sean.harmer@kdab.com>
* | Implement graph layers support in QShaderGraphKevin Ottens2017-08-021-0/+117
| | | | | | | | | | | | | | | | | | | | | | When creating the statements, it is now possible to pass a list of enabled layer names. Every node or edge which is not in the list of enabled layers will be pruned from the graph prior to traversal. Note that an empty layer list for a node or an edge means it is on all layers. Change-Id: I61a4df7d395b4beb42ee55ce08fef8ebe04263c9 Reviewed-by: Sean Harmer <sean.harmer@kdab.com>
* | Add the layer concept to QShaderNode and QShaderGraph::EdgeKevin Ottens2017-08-022-2/+12
| | | | | | | | | | | | | | This will be used in further commits Change-Id: I49977f1ea482b97dc0a159f69a0d2eda3865ec44 Reviewed-by: Sean Harmer <sean.harmer@kdab.com>
* | Add support for QShaderLanguage enums in QShaderGeneratorKevin Ottens2017-08-021-0/+357
| | | | | | | | | | Change-Id: I93306d783309cda09fedae3713afde851df3e9a3 Reviewed-by: Sean Harmer <sean.harmer@kdab.com>
* | Extend the parameter support in QShaderGraphLoader for richer typesKevin Ottens2017-08-021-13/+28
| | | | | | | | | | | | | | In particular, go through QMetaType/QMetaEnum to deal with enums. Change-Id: I2e847ba328eb46609b86b3dfd6c4dbf532d78b7d Reviewed-by: Sean Harmer <sean.harmer@kdab.com>
* | Extend the parameter support in QShaderNodeLoader for richer typesKevin Ottens2017-08-021-1/+17
| | | | | | | | | | | | | | In particular, go through QMetaType/QMetaEnum to deal with enums. Change-Id: Idbe16c913c1d471a4a91d219f77876e498c192d9 Reviewed-by: Sean Harmer <sean.harmer@kdab.com>
* | Add a date-time test for time-zones near epoch and odd transitionsEdward Welbourne2017-07-311-0/+67
| | | | | | | | | | | | | | | | | | | | | | | | Check we do handle DST after epoch and don't before. Check we do notice various unusual transitions. Check we do handle non-whole-hour-offset zones. (Unfortunately, MS-Win lacks data for some of the zones and is wrong about the two date-line crossers, so we skip those for it.) Change-Id: If420d61b9db7f914ca25c22297c16e917ad2307a Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org> Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
* | Support more than 62 instances of QWinEventNotifier, take 2Joerg Bornemann2017-07-301-0/+88
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | QWinEventNotifiers were limited to 62 instances, because of WaitForMultipleObject's limitation to MAXIMUM_WAIT_OBJECTS - 1 handles. Use the RegisterWaitForSingleObject API which does not have this restriction and executes waits in threads managed by the system. A central manual reset event per event dispatcher is signaled in the RegisterWaitForSingleObject callback and waited for in the event loop. Task-number: QTBUG-8819 Change-Id: I3061811c18e669becf9de603bbdd7ba96e4d2fcd Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@qt.io> Reviewed-by: Oliver Wolff <oliver.wolff@qt.io>
* | Add test for time zone transitions near the epochEdward Welbourne2017-07-281-0/+44
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This needs a zone with transitions near the epoch; and the only CET with DST that winter was Italy (copied by Malta), for which the Olson database had a recent (2016) correction to its data, for that winter. That means we get inconsistent results on O/Sen of different ages. So add a separate testEpochTranPrivate(), alongside testCetPrivate(), and test it with America/Toronto. (Unfortunately, MS-Win gets the date wrong on the first transition after the epoch, so we have to code round that.) Since information before the epoch isn't reliably available, only test the search backwards if nextTransition does find something before it. (We can safely assume all real transitions happened since 1601; non-celestial time-keeping wasn't accurate enough, before that, for anyone to synchronize with anything but celestial time.) Change-Id: I984b46938a2805b93bb2afd6855e317b5d66b386 Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
* | Test locale propagation from date-time editor to its calendar popupSoroush Rabiei2017-07-281-0/+21
| | | | | | | | | | | | | | Done-with: Edward Welbourne <edward.welbourne@qt.io> Task-number: QTBUG-59106 Change-Id: I5b79b76087f0e980de5ea4ec687e8b8e2184506f Reviewed-by: David Faure <david.faure@kdab.com>
* | Fix use of getentropy on larger blocksThiago Macieira2017-07-271-1/+1
| | | | | | | | | | | | | | | | | | | | | | Found while working on suppressing the warning about the return value (which is either 0 or -1) was being ignored. Task-number: QTBUG-61968 Change-Id: I02d22222fff64d4dbda4fffd14d148b1724547ca Reviewed-by: Florian Bruhin <qt-project.org@the-compiler.org> Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@qt.io> Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
* | Add API to disable text shaping on fontsEskil Abrahamsen Blomfeldt2017-07-262-0/+66
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | In the past, we had an undocumented text flag that worked with one of the QPainter::drawText() overloads. This was never intended as public API and served a specific cause in Qt WebKit at one point. But there is a general need for such API, as disabling shaping features easily gives 25% performance improvement on text rendering even for fairly short strings. This patch adds a new style strategy flag to disable shaping and will just uses the CMAP and HDMX tables to get glyph indices and advances for the characters. In Qt 6, the TextBypassShaping flag can be removed completely and be replaced by the style strategy. [ChangeLog][QtGui][Text] Added QFont::PreferNoShaping style strategy to support improvements to performance at the expense of some cosmetic font features. Task-number: QTBUG-56728 Change-Id: I48e025dcc06afe02824bf5b5011702a7e0036f6d Reviewed-by: Simon Hausmann <simon.hausmann@qt.io>
* | tst_QTimeZone: improve readability of code and failure reportsEdward Welbourne2017-07-251-36/+64
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | When QCOMPARE(,) reports two 12-digit numbers, it's not always immediately obvious what the difference is (much less what 1/3600000 of it is); nor is it obvious that (or why) a given 12-digit number is in fact correct. In contrast, our eyes can make sense of a QDateTime's reported value quite well, enabling us to see what's different; and it's possible to at least confirm the plausibility of 2-or-3 am on a spring or autumn day at a plausible transition (or even to confirm it exactly by consulting suitable web-sites). Also document the actual transition happening in each case (since I *did* consult a suitable web-site). So prefer to QCOMPARE(,) two QDateTime values instead of two 12-digit qint64s. Where a that would be unsuitable, at least compare the difference to zero, to make the error easier to understand (except when one of the twelve-digit numbers consists entirely of 9s; that, for once, actually is easy to see). Write various multiples of 3600 as the relevant intelligible whole number times 3600, rather than premultiplying, to make it obvious to reders what's going on. None of this changes what is actually tested. Change-Id: I488e751283a55d4623c93612af13ad631144900d Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
* | Fix a loop-test and the bogus data the loop expectedEdward Welbourne2017-07-251-3/+3
| | | | | | | | | | | | | | | | | | | | | | A loop initialized i = 0 and used i > 2 as its condition; it didn't get very far. Consequently, the test it was in never checked whether CET's 2011 transitions happened at the times expected - which they didn't, as the times in question were in fact the times at which Pacific/Auckland had its transitions that year. Change-Id: I94d1f8df615c5bcfe48e73d41b4c7faf2beccb96 Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
* | tst_QSslSocket::ephemeralServerKey - fix for OpenSSL 1.1Timur Pocheptsov2017-07-251-0/+2
| | | | | | | | | | | | | | | | | | | | The original test is quite unfortunate - it has cipher names hardcoded, and it fails with OpenSSL 1.1 - no matching cipher found for 'RC4-SHA' and QSslContext::initSsl fails with 'Invalid or empty cipher list'. We skip this test entry for 1.1. Change-Id: I810b80a62d9e27a60db71fd412af0c80630d976c Reviewed-by: Edward Welbourne <edward.welbourne@qt.io>
* | Fix tst_QAbstractItemView::task200665_itemEnteredTor Arne Vestbø2017-07-251-2/+2
| | | | | | | | | | | | | | | | Moving the cursor is not synchronous. Change-Id: I6b820af026585e1fcfef845cc712fa8f6812e941 Reviewed-by: Simon Hausmann <simon.hausmann@qt.io> Reviewed-by: Tor Arne Vestbø <tor.arne.vestbo@qt.io>
* | Improve symmetry of variant json conversionsAllan Sandfeld Jensen2017-07-251-21/+49
| | | | | | | | | | | | | | | | Make QVariant::toJsonValue do conversions as well as QJsonValue::fromVariant. Change-Id: I175d43677061470691e2e0104a800be355fbbd3d Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
* | macOS: Blacklist flakey test tst_QMenu::tearOff()Tor Arne Vestbø2017-07-241-0/+2
| | | | | | | | | | | | Change-Id: Id220f10f4ff756230155c7c8f37713d53ed3ca0c Reviewed-by: Gabriel de Dietrich <gabriel.dedietrich@qt.io> Reviewed-by: Tor Arne Vestbø <tor.arne.vestbo@qt.io>
* | macOS: Blacklist tst_QMenu::pushButtonPopulateOnAboutToShowTor Arne Vestbø2017-07-241-0/+2
| | | | | | | | | | | | | | | | | | It's flakey/failing on macOS, the menu is opened but opened above the button, so the intersection test fails. Change-Id: I6b13a1b0df2b07fa36bbb73071cdeb55547ac93a Reviewed-by: Gabriel de Dietrich <gabriel.dedietrich@qt.io> Reviewed-by: Tor Arne Vestbø <tor.arne.vestbo@qt.io>
* | Fix warning about self assignFrank Meerkoetter2017-07-231-3/+2
| | | | | | | | | | | | | | | | | | | | ...tst_qlineedit.cpp:1938:9: warning: explicitly assigning value of variable of type 'Qt::Key' to itself -Wself-assign] key = key; ~~~ ^ ~~~ Change-Id: I18a46f61e13f6e2c74edce869a1c36a7f3a0fb70 Reviewed-by: Marc Mutz <marc.mutz@kdab.com>
* | macOS: Blacklist tst_QComboBox::task_QTBUG_56693_itemFontFromModelTor Arne Vestbø2017-07-221-0/+4
| | | | | | | | | | | | | | | | | | | | | | Counting draw calls in the style is not a reliable way to count italic items in the combobox. Task-number: QTBUG-62080 Change-Id: I6cb6d54535f073f66cfcf61bb19eb645284c835d Reviewed-by: Simon Hausmann <simon.hausmann@qt.io> Reviewed-by: Timur Pocheptsov <timur.pocheptsov@qt.io> Reviewed-by: Tor Arne Vestbø <tor.arne.vestbo@qt.io>
* | Fix tst_QListWidget::QTBUG50891_ensureSelectionModelSignalConnectionsAreSetTor Arne Vestbø2017-07-211-2/+1
| | | | | | | | | | | | | | | | | | | | Don't assume signals will not be emitted during show. The test should focus on testing that changing the model results in change signals. What happens before that is not under test, and not stable. Change-Id: I71e62abc15fc81c069d7685e4342e795449c3632 Reviewed-by: Jake Petroules <jake.petroules@qt.io> Reviewed-by: Tor Arne Vestbø <tor.arne.vestbo@qt.io>
* | Deprecate and remove the unused bearer support in QNetworkProxyThiago Macieira2017-07-211-113/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This hasn't done anything since at least Qt 5.0. It's possible it was only used in Symbian, which we removed before the 5.0 release. This only served to make the tst_QNetworkProxyFactory test slow. [ChangeLog][QtNetwork][QNetworkProxy] The functions related to QNetworkConfiguration are deprecated. They've performed no action since Qt 5.0, so code using them can safely stop doing so. Change-Id: I84e45059a888497fb55ffffd14d31b7c2978a04e Reviewed-by: Edward Welbourne <edward.welbourne@qt.io> Reviewed-by: Jesus Fernandez <Jesus.Fernandez@qt.io> Reviewed-by: Timur Pocheptsov <timur.pocheptsov@qt.io> Reviewed-by: Alex Blasche <alexander.blasche@qt.io>
* | macOS: Blacklist tst_QMenu::layoutDirectionTor Arne Vestbø2017-07-211-0/+3
| | | | | | | | | | | | | | | | | | | | | | | | It's failing when enabling synchronous expose events, but likely due to making assumptions about expose behavior. Will be looked at in more detail once the expose event patch is in, so we can move forward. Task-number: QTBUG-62092 Change-Id: Ie76b5f11ccf841981a42d2eda19fbcda8b43c36c Reviewed-by: Simon Hausmann <simon.hausmann@qt.io> Reviewed-by: Tor Arne Vestbø <tor.arne.vestbo@qt.io>
* | QLineEdit: Add selectionEnd() and selectionLength()Daniel Teske2017-07-201-0/+13
| | | | | | | | | | | | | | | | | | | | Getting the end position of the selection was not possible. [ChangeLog][QtWidgets][QLineEdit] Added selectionEnd(), selectionLength(), complementing selectionStart(). Change-Id: Iaecc624063d7c043f9502351f07eb76f869e86f1 Reviewed-by: Marc Mutz <marc.mutz@kdab.com>
* | Merge "Merge remote-tracking branch 'origin/5.9' into dev" into refs/staging/devSimon Hausmann2017-07-202-0/+31
|\ \
| * | Merge remote-tracking branch 'origin/5.9' into devSimon Hausmann2017-07-192-0/+31
| |\| | | | | | | | | | | | | | | | | | | | | | Conflicts: src/corelib/io/qwindowspipewriter.cpp src/widgets/styles/qcommonstyle.cpp Change-Id: I0d33efdc4dc256e234abc490a18ccda72cd1d9e6
| | * 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>
* | | tst_QWindow: Wait for platform to ack window states before continuingTor Arne Vestbø2017-07-191-5/+20
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fixes flakiness where we enter and exit window states too fast on macOS, while also removing 2 second waits in the positioning tests that were slowing things down needlessly. Change-Id: Ia4ee4d4812474c520fdd3f76b047f4eabe1a8220 Reviewed-by: Simon Hausmann <simon.hausmann@qt.io> Reviewed-by: Tor Arne Vestbø <tor.arne.vestbo@qt.io>
* | | macOS: Blacklist tst_MacNativeEvents::testKeyPressOnToplevel and friendsTor Arne Vestbø2017-07-191-0/+11
|/ / | | | | | | | | | | | | | | | | | | | | They fail when enabling synchronous expose events. Disabled for now until we can look into why, but it's assumed to be an issue with the test harness/how we hook into Quartz to send/observe events. Task-number: QTBUG-62042 Change-Id: I723d049ec5d1029edb0ad3b1f47fffc829a8924b Reviewed-by: Morten Johan Sørvig <morten.sorvig@qt.io> Reviewed-by: Tor Arne Vestbø <tor.arne.vestbo@qt.io>
* | Blacklist tst_QWidget::setToolTip on all macOS platformsTor Arne Vestbø2017-07-171-1/+1
| | | | | | | | | | | | | | | | | | | | It's broken due to tst_QWidget::testDeletionInEventHandlers, but the root cause is not known yet. Task-number: QTBUG-61986 Change-Id: I5b77efaf6910123d10a1456c54b873100e538a69 Reviewed-by: Simon Hausmann <simon.hausmann@qt.io> Reviewed-by: Tor Arne Vestbø <tor.arne.vestbo@qt.io>
* | tst_QGL::graphicsViewClipping: Wait for viewport's window handleTor Arne Vestbø2017-07-171-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | The QWidget overload of qWaitForWindowExposed waits for the widget's top level QWindow, which for the viewport is the graphics-view. We want to explicitly wait for the viewport to be exposed, as the viewport is covering the whole graphics-view, preventing it from being exposed. See a6991376c. Change-Id: I86df43871126562f09e4ce14931bc6fc7f06263d Reviewed-by: Simon Hausmann <simon.hausmann@qt.io> Reviewed-by: Tor Arne Vestbø <tor.arne.vestbo@qt.io>
* | Stabilize tst_QWidget::setMaskInResizeEvent on OS X 10.10Tor Arne Vestbø2017-07-171-2/+2
| | | | | | | | | | | | Change-Id: I7dbe9c7a91301e0002f9e1827f6d0b495d2b9ec5 Reviewed-by: Simon Hausmann <simon.hausmann@qt.io> Reviewed-by: Tor Arne Vestbø <tor.arne.vestbo@qt.io>
* | macOS: Skip tst_QWindow::modalDialogTor Arne Vestbø2017-07-141-0/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | The tests uses QWindow::requestActivate() to verify that a window does not become active when a modal dialog is running, but on macOS we have no guards for this, so the test can potentially fail. In addition, due to a bug in QCocoaEventDispatcher, we end up waiting 5 seconds for that failure to manifest. Task-number: QTBUG-61965 Task-number: QTBUG-61964 Change-Id: I2f1b62d953e9b6dabf2df0c3023564f27919c498 Reviewed-by: Timur Pocheptsov <timur.pocheptsov@qt.io>
* | Skip tst_QWidget::testForOutsideWSRangeFlagTor Arne Vestbø2017-07-141-0/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The test assumes that resizing a QWidget to 0x0 will result in the QWindow ending up with that size, and hence not being exposed, but this is not the case. On a QWindow level we treat 0x0 as a trigger for the platform layer to set the default size, and the window ends up exposed. Ideally QWindows should allow 0x0 sizes, but this is a bigger change. In the meantime, we skip the tests so that other changes can be integrated without the test failing. Task-number: QTBUG-61953 Change-Id: Ib17187b4afd1b06eaa76653be18e93abea555b59 Reviewed-by: Tor Arne Vestbø <tor.arne.vestbo@qt.io> Reviewed-by: Gabriel de Dietrich <gabriel.dedietrich@qt.io>
* | Merge remote-tracking branch 'origin/5.9' into devGabriel de Dietrich2017-07-1315-36/+521
|\| | | | | | | | | | | | | Conflicts: src/widgets/widgets/qmainwindowlayout.cpp Change-Id: I306b4f5ad11bceb336c9091241b468d455fe6bb6
| * QLineEdit: Fix length calculation for input mask "\\\\"Daniel Teske2017-07-131-1/+10
| | | | | | | | | | | | | | | | | | | | | | Consider the raw string \\\\. The previous algorithm would consider the last 3 \ to be escaped because the previous character is a \ and thus calculating a maxLength of 3. But this should be treated as two escaped \ with a maxLength of 2. Change-Id: I6c4b8d090a2e1c6e85195d5920ce8b80aea1bc2d Reviewed-by: Marc Mutz <marc.mutz@kdab.com>
| * Handle conversion and comparison between qvarianthash and qvariantmapAllan Sandfeld Jensen2017-07-111-0/+8
| | | | | | | | | | | | | | | | | | QVariant claims to be able to QVariantHash and QVariantMap, but the actual conversion implementation is missing. Task-number: QTBUG-61471 Change-Id: I0cba74642aa77dc423effed289bc7619922a89eb Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
| * Skip the dbus abstract adaptor test on OpenSuSE 42.1Simon Hausmann2017-07-071-0/+5
| | | | | | | | | | | | | | It has been crashing for months... Change-Id: I1d6077f949d642465771c4d618babc64ebc340f6 Reviewed-by: Friedemann Kleint <Friedemann.Kleint@qt.io>
| * QListView: Fix viewport size when checking scroll bar visibilityFriedemann Kleint2017-07-071-10/+73
| | | | | | | | | | | | | | | | | | | | Subtract the viewport margins from the contentsRect in QCommonListViewBase::updateHorizontal/VerticalScrollBar(). This affects list views in icon mode and list mode / ScrollPerPixel. Task-number: QTBUG-61383 Change-Id: I6f2f7951ac9344ac21cef1eba061780d130e2467 Reviewed-by: David Faure <david.faure@kdab.com>
| * QLocale: fix handling of milliseconds in string format and documentThiago Macieira2017-07-072-14/+20
| | | | | | | | | | | | | | | | | | | | | | | | | | [ChangeLog][QtCore][QLocale] Fixed the conversion of QTime to string form and parsing from string form to always treat the value as the decimal fraction of the seconds component. That is, the string format ".z" produces/parses ".2" for 200 milliseconds and ".002" for 2 milliseconds. Use of "z" or "zzz" is discouraged outside decimal fractions to avoid surprises. Task-number: QTBUG-53565 Change-Id: Ia19de85ad35e4eb7bb95fffd14792caf9b4a5156 Reviewed-by: Edward Welbourne <edward.welbourne@qt.io>