summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
...
| * | | | | Blacklisting a flaky tst_QGL::clipTest test on OpenSUSE 13.1Milla Pohjanheimo2016-06-011-0/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Based on discussion with Laszlo, we are blacklisting this test. Task-number: QTBUG-53133 Change-Id: I08a5192ebcefd7b093c79872e0dfaddb794cab57 Reviewed-by: Laszlo Agocs <laszlo.agocs@theqtcompany.com>
| * | | | | QObject::connect: reduce generated code size for statics and functorsThiago Macieira2016-05-311-9/+7
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Instead of placing the assignment of false in the impl() function, move it to the inline QSlotObjectBase::compare() function. That means it's assigned in one place (two, actually, inside qobject.cpp), instead of for every static member, non-member or functor we connect or disconnect. Change-Id: I87e17314d8b24ae983b1fffd1453623ad4c4dcb2 Reviewed-by: Olivier Goffart (Woboq GmbH) <ogoffart@woboq.com>
| * | | | | Add manual test for shortcut using implicit AltGrRobert Loehning2016-05-301-6/+11
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | In German layout, "Ctrl+]" is "Ctrl+AltGr+9". Task-number: QTBUG-51848 Change-Id: I8c05c13a4d46c0818ce4f56ce476c5310a677af2 Reviewed-by: Frederik Gladhorn <frederik.gladhorn@qt.io>
| * | | | | QDateTimeParser: adapt to make good use of QStringRef.Anton Kudryavtsev2016-05-302-13/+24
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Avoid unnecessary allocations. Create QString from QStringRef only where necessary. Change-Id: I8f2a7dce51430162c84328e23ab3cc071227d6ae Reviewed-by: Edward Welbourne <edward.welbourne@qt.io> Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
| * | | | | tst_Moc: restore signals/slots/emit to the Q_UPPERCASE valuesThiago Macieira2016-05-301-3/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The previous definition of signals does not need to be "public". It may have been something else. Change-Id: Id69569111e7d4e619e22ffff144b4855e6acdbef Reviewed-by: Olivier Goffart (Woboq GmbH) <ogoffart@woboq.com>
| * | | | | install the qtpng libraryOswald Buddenhagen2016-05-301-1/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | it's used outside qtbase (by qtimageformats), so this is needed for modular builds to work. Change-Id: I3dffa76178502894bd063af366bd9a74be3b316a Reviewed-by: Joerg Bornemann <joerg.bornemann@qt.io>
| * | | | | Andriod: API-16 is the minimum API that we supportBogDan Vatra2016-05-271-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: I0aa79a584b1a4aef92d9ee1a2930a23dc6a8d236 Reviewed-by: Eskil Abrahamsen Blomfeldt <eskil.abrahamsen-blomfeldt@qt.io>
| * | | | | QVector: silence clang warning about memmoveShawn Rutledge2016-05-271-2/+6
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Also made a small comment fix Task-number: QTBUG-53605 Change-Id: Ica9a06fe7a70f92f2a19a6df3ffdeaf1985e2eb6 Reviewed-by: Jędrzej Nowacki <jedrzej.nowacki@theqtcompany.com>
| * | | | | Fix use of QMutex on Linux before FUTEX_PRIVATE_FLAG was addedThiago Macieira2016-05-261-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | It was added in 2.6.22. If we pass it to 2.6.21, we'll get -ENOSYS, which is bad for QMutex. This fix simply defines it to 0 if the header doesn't define it. But as a consequence: if Qt is built with newer kernel headers, it won't run on older versions. It's not likely that someone is still using Qt 5.7 on a 2.6.21 kernel (v2.6.21.7 was released on 2007-08-04). Change-Id: Icb178bb113bb437c9b67fffd1451dd7bb964f0c8 Reviewed-by: Olivier Goffart (Woboq GmbH) <ogoffart@woboq.com>
| * | | | | tst_qsslsocket::protocolServerSide - blacklist on RHEL 7.2Timur Pocheptsov2016-05-261-0/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | protocolServerSide test fails with 'ssl3-any' and 'tls1.0-any' combo on RHEL 7.2 with OpenSSL v1.0.1e-fips, it would work as OPENSSL_NO_SSL2 code-path, but OPENSSL_NO_SSL2 is not defined, so socket is in state connected while it's expected to be unconnected. Task-number: QTBUG-53608 Change-Id: Ib321b95129a6ab5b0691b40cb4acc612125633b2 Reviewed-by: Tony Sarajärvi <tony.sarajarvi@qt.io>
| * | | | | tst_qsslsocket - re-structure the codeTimur Pocheptsov2016-05-261-2/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | setEmptyDefaultConfiguration - this test (and this was stated explicitly in comments!) must be the last test to run, otherwise, it can make subsequent tests fail. -exitLoop must be in 'protected slots' section not to be executed as a test, since ... it's aux function, not a test. Task-number: QTBUG-53608 Task-number: QTBUG-53603 Change-Id: I49d6d57ba927ecc4f20ae2d9325ad02fa46b0922 Reviewed-by: Tony Sarajärvi <tony.sarajarvi@qt.io>
| * | | | | QNetworkReply: remove double bufferingAlex Trotsenko2016-05-254-67/+29
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Since 5.7 we can write downloaded byte arrays directly to the QIODevice's internal read buffer without any memcpy/alloc overhead. This makes various other buffers redundant, so remove them. Task-number: QTBUG-45926 Change-Id: I577af70f856c9b852b7569a0070ae2bcbb4faaae Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@theqtcompany.com> Reviewed-by: Edward Welbourne <edward.welbourne@qt.io> Reviewed-by: Markus Goetz (Woboq GmbH) <markus@woboq.com>
| * | | | | QIOSTextInputOverlay: fade-out handles upon focus transferRichard Moe Gustavsen2016-05-251-4/+34
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Small adjustment to a76d709. Instead of removing the selection handles immediately when an object loses focus, we choose to animate them out the same way we do when we lose selection. We do this by setting the handle visibility to false, which will trigger the fade-out animation. Then we wait a for the animation to finish before we remove and delete them fully. Change-Id: Iaa93969af086000d9e1cf8a39bd12c6a8b70c89e Reviewed-by: Tor Arne Vestbø <tor.arne.vestbo@theqtcompany.com>
| * | | | | Do an actual toString conversion for QVariant test failuresAllan Sandfeld Jensen2016-05-241-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | A cast is not a conversion. If the value is not already a string type we are just getting an empty string for all metatypes that can be converted to string. Change-Id: I4643cc9fd509c21568fdc2133403c3ed8cb38a10 Reviewed-by: Simon Hausmann <simon.hausmann@qt.io>
| * | | | | build qt-png as a proper helper libraryOswald Buddenhagen2016-05-245-29/+43
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | it ends up in QtGui via two different routes (freetype and the png handler), and we really don't want to have two copies of it in there. Change-Id: I40760bcb6c615b90ed9f402450bb657c77884613 Reviewed-by: Simon Hausmann <simon.hausmann@qt.io>
| * | | | | Optimize QImage checkForAlphaPixelsAllan Sandfeld Jensen2016-05-231-21/+28
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This routine is often called to down-convert pixmaps and backing stores to RGB32. This patch replaces a comparison in each pixel, with a single AND in each pixel and a comparison at each line. The new form is also auto- vectorized by at least GCC. Change-Id: I3e07585a3ec12f888321d35da57ac99b561dbec4 Reviewed-by: Gunnar Sletta <gunnar@sletta.org>
| * | | | | Windows QPA: Format window title correctly when creating a window.Friedemann Kleint2016-05-233-2/+11
| | |_|_|/ | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Add convenience QWindowsWindow::formatWindowTitle() and use that in QWindowsIntegration::createPlatformWindow(). Task-number: QTBUG-53394 Change-Id: I76ebade97c5af71ffa3d11075511b94a54a3dbf8 Reviewed-by: J-P Nurmi <jpnurmi@qt.io>
| * | | | Fix compilation without process supportMaurice Kalinowski2016-05-201-0/+2
| | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: I88ef96bf15f40e459bacc4b2abe4dfe84e257495 Reviewed-by: Friedemann Kleint <Friedemann.Kleint@qt.io>
* | | | | Added bsdfb platform plugin for FreeBSDOleksandr Tymoshenko2016-06-128-0/+655
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | [ChangeLog][QtGui][Platform Specific Changes] Added bsdfb platform plugin for FreeBSD. Plugin renders directly to framebuffer, no hardware acceleration supported. bsdfb accepts "fb", "size", "offset", and "mmsize" arguments with the same format as linuxfb. Change-Id: I5f5cea0b5ed70d5c6f8d01dc547f54c731bcae5f Reviewed-by: Laszlo Agocs <laszlo.agocs@theqtcompany.com>
* | | | | darwin: Add Foundation conversion functions for QRect/QRectFTor Arne Vestbø2016-06-1015-47/+80
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The fromCGRect function was left out for QRect, as the foundation type is using CGFloats internally. Clients should use an explicit QRectF::toRect() when potentially throwing away precision. Change-Id: I0d4c5c5a4e6a45ea3287e3f37a00b69b0bfdefcf Reviewed-by: Jake Petroules <jake.petroules@qt.io> Reviewed-by: Tor Arne Vestbø <tor.arne.vestbo@theqtcompany.com>
* | | | | Add move constructor to QDateTimeThiago Macieira2016-06-102-2/+26
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The move constructor is slightly more interesting than the copy constructor because we can reset other to a short data state on 64-bit systems. The assembly of that function is simply: mov (%rsi),%rax mov %rax,(%rdi) movq $0x1,(%rsi) retq The move-assignment operator for QDateTime was already there. There's no need for one for QDateTime::Data since it's never called. Change-Id: I06bae9392f534e45b3f1ffff144dffdd7f23b170 Reviewed-by: Lars Knoll <lars.knoll@qt.io>
* | | | | Allow QDateTime to shrink back to short data mode on copyThiago Macieira2016-06-101-5/+30
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | We won't shrink on manipulation when we have memory allocated, but it's a good idea to create a non-shared copy if we can. It's an unlikely scenario, though, because it requires the QDateTime object to have been set to a large state then manipulated back into a small state. Change-Id: I06bae9392f534e45b3f1ffff144dfee755bafa01 Reviewed-by: Edward Welbourne <edward.welbourne@qt.io>
* | | | | Move the QDateTime file static functions to their right placeThiago Macieira2016-06-101-178/+170
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The file has an organization, so let's follow it. This commit has no other changes besides moving code around. Change-Id: I06bae9392f534e45b3f1ffff144e0b1f6dd72622 Reviewed-by: Edward Welbourne <edward.welbourne@qt.io> Reviewed-by: Lars Knoll <lars.knoll@qt.io>
* | | | | Long live the short QDateTime optimizationThiago Macieira2016-06-103-75/+280
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Well, maybe not for so long: we may want to revisit it for Qt 6. At the very least, we should enlarge the size of QDateTime on 32-bit system so that they too can benefit from the optimization. With this optimization, on 64-bit systems, the most common uses of QDateTime now no longer allocate memory at all. The range is slightly reduced from 584,554,049 years to 2,283,414 years around 1970. The other drawback is that calling QDateTime::offsetFromUtc() on a localtime now needs to recalculate the offset, instead of using the cached offset. (QDateTime::toMSecsSinceEpoch() didn't use the cache). Change-Id: Id5480807d25e49e78b79ffff144a8b2c9af91814 Reviewed-by: Edward Welbourne <edward.welbourne@qt.io>
* | | | | QDateTimePrivate refactor: static'fy the date/time manipulatorsThiago Macieira2016-06-102-86/+91
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This commit moves QDateTimePrivate functions setTimeSpec, setDateTime, getDateTime, checkValidDateTime and refreshDateTime outside the class. Like the previous commit, this is done in preparation for the "Short QDateTime Optimization" as the "msecs" field will be placed in the short data, if possible. By making them file-level static, this also improves code generation, as the compiler doesn't know whether it has to emit the class members for out-of-line use or not. Change-Id: I06bae9392f534e45b3f1ffff144df4d73cbc9184 Reviewed-by: Edward Welbourne <edward.welbourne@qt.io>
* | | | | QDateTimePrivate refactor: static'fy access to d->m_statusThiago Macieira2016-06-102-89/+109
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This commit changes most accesses to the d->m_status (including d->spec() and d->setSpec() uses) to use new static functions. This is done in preparation to the "Short QDateTime Optimization" as the status byte will be kept in the short data. Change-Id: I06bae9392f534e45b3f1ffff144dbd795d03227a Reviewed-by: Edward Welbourne <edward.welbourne@qt.io> Reviewed-by: Lars Knoll <lars.knoll@qt.io>
* | | | | Refactor & simplify QDateTime::setMSecsSinceEpochThiago Macieira2016-06-101-13/+20
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: I06bae9392f534e45b3f1ffff144df5ce1aa52636 Reviewed-by: Lars Knoll <lars.knoll@qt.io> Reviewed-by: Edward Welbourne <edward.welbourne@qt.io>
* | | | | Refactor & simplify QDateTimePrivate::refreshDateTime()Thiago Macieira2016-06-101-31/+25
| | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: I06bae9392f534e45b3f1ffff144df51ae6159a97 Reviewed-by: Lars Knoll <lars.knoll@qt.io>
* | | | | Simplify the QDateTimePrivate::setTimeSpec() functionThiago Macieira2016-06-101-16/+11
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: I06bae9392f534e45b3f1ffff144df36cc98b5f3f Reviewed-by: Lars Knoll <lars.knoll@qt.io> Reviewed-by: Edward Welbourne <edward.welbourne@qt.io>
* | | | | QDateTime: fix the massageAdjustedDateTime differentlyThiago Macieira2016-06-101-16/+6
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Instead of using a macro for maybe passing an extra parameter, pass the d pointer and let the function decide what to use and what not to use. Change-Id: I06bae9392f534e45b3f1ffff144dbeb68a30cb48 Reviewed-by: Lars Knoll <lars.knoll@qt.io> Reviewed-by: Edward Welbourne <edward.welbourne@qt.io>
* | | | | Move QDateTimePrivate::toMSecsSinceEpoch() code into QDateTimeThiago Macieira2016-06-102-35/+27
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: I06bae9392f534e45b3f1ffff144dbad485814779 Reviewed-by: Lars Knoll <lars.knoll@qt.io> Reviewed-by: Edward Welbourne <edward.welbourne@qt.io>
* | | | | Remove QDateTimePrivate::isNull{Date,Time}()Thiago Macieira2016-06-102-7/+5
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | They're superfluous, since b491fab02a6a67fcd18d8076ac802d2f8c4f6972 removed the distinction between null and invalid. Just use the isValidXxx equivalents. Change-Id: I06bae9392f534e45b3f1ffff144db9badad010fd Reviewed-by: Lars Knoll <lars.knoll@qt.io> Reviewed-by: Edward Welbourne <edward.welbourne@qt.io>
* | | | | Stop QDateTimePrivate from inheriting QSharedDataThiago Macieira2016-06-102-6/+7
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | We're going to have to stop using QSharedDataPointer because of the upcoming short-datetime-optimization. By dropping the inheritance, I am also able to rearrange the members and remove the padding hole that existed. The second padding hole was removed in the previous commit, which merged two 32-bit fields into one. On 64-bit systems, there's no way around a remaining 4-byte hole somewhere due to the odd number of 32-bit members. I chose to leave it in the middle of the struct, before the m_timeZone member, instead of tail padding, so that the layout of the first members structure are the same in bootstrapped and non-bootstrapped builds. That should help debugging the bootstrapped tools in Qt Creator. It's also now the same in 32- and in 64-bit systems. Change-Id: Id69569111e7d4e619e22ffff144b1fba708885f7 Reviewed-by: Lars Knoll <lars.knoll@qt.io> Reviewed-by: Edward Welbourne <edward.welbourne@qt.io>
* | | | | QDateTimePrivate: merge the time spec, DST status and validity flagsThiago Macieira2016-06-104-71/+66
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Storing them in a single byte is the first step towards the Short QDateTime Optimization. The bump in the "private version" by 10 is to accommodate possible changes in the Qt 5.7 branch. Change-Id: Id5480807d25e49e78b79ffff144a59420457bcf0 Reviewed-by: Edward Welbourne <edward.welbourne@qt.io> Reviewed-by: Lars Knoll <lars.knoll@qt.io>
* | | | | Disable QSslDiffieHellmanParameters tests for QT_NO_SSL buildsAndré Klitzing2016-06-102-2/+8
| | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: Ie0b7e9c819ddd1627709f64c30c8d2374bf50c9b Reviewed-by: Timur Pocheptsov <timur.pocheptsov@theqtcompany.com>
* | | | | add QTest::createTouchDevice()Shawn Rutledge2016-06-102-0/+12
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This enables creation of autotests which use touch events, without using private API. Task-number: QTBUG-44030 Change-Id: If8fe89f8423aaafd9e6501e231c33580b9365eb8 Reviewed-by: Laszlo Agocs <laszlo.agocs@theqtcompany.com>
* | | | | autotests: use QTest::createTouchDevice()Shawn Rutledge2016-06-1010-108/+57
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Task-number: QTBUG-44030 Change-Id: I514c1294a0ff6587b825982a8bb354104c214120 Reviewed-by: Laszlo Agocs <laszlo.agocs@theqtcompany.com>
* | | | | Blacklist tst_QWindow tests for Ubuntu 16.04Milla Pohjanheimo2016-06-101-0/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Blacklisting tests positioning(default), modalWindowPosition() and modalWindowEnterEventOnHide_QTBUG35109() Task-number: QTBUG-53156 QTBUG-54001 QTBUG-35109 Change-Id: Ib0c50a356a1928afbd12a1ec3650f80f65b81265 Reviewed-by: Heikki Halmet <heikki.halmet@qt.io>
* | | | | QString: use new QL1S::at() in lastIndexOf()Anton Kudryavtsev2016-06-091-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Make overloaded lastIndexOf() functions more homogeneous. Change-Id: If45aac88b43d26baf7f93caec3662a1085e26b97 Reviewed-by: Thiago Macieira <thiago.macieira@intel.com> Reviewed-by: Edward Welbourne <edward.welbourne@qt.io>
* | | | | Remove QWidgetBackingStore::fullUpdatePendingAllan Sandfeld Jensen2016-06-092-21/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This was no longer used and always false. Change-Id: I981055e6cc736cfe3432914c173c8b3edc31b46e Reviewed-by: Laszlo Agocs <laszlo.agocs@theqtcompany.com>
* | | | | Aarch64: vectorize ascii de-/encoding.Erik Verbruggen2016-06-091-1/+72
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This works only on Aarch64, because the vaddv instruction is only available on 64bit ARM. Doing something equivalent on 32bit ARM has the high chance to run into micro-architecture differences: on an Cortex-a8, transferring a single vector element from NEON to the regular CPU registers takes 20 cycles(!). Change-Id: Iccbfe84da82abb9b10f3f3dc35c8b950df69e251 Reviewed-by: Allan Sandfeld Jensen <allan.jensen@qt.io>
* | | | | Fixed a bug where IM reported wrong anchor rectangleJan Arve Saether2016-06-091-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The problem was that in some cases, the cursor position was used to calculate the anchor rectangle instead of the anchor position. This caused selection handles to be shown at the wrong position. Change-Id: I8d866b644fc3c4d530529b7f468d16ae1088cd98 Reviewed-by: Richard Moe Gustavsen <richard.gustavsen@theqtcompany.com>
* | | | | QElapsedTimer: Remove legacy code dealing with Windows pre-Vista and CEThiago Macieira2016-06-081-39/+10
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | GetTickCount64 is available on Windows Vista and WinRT. Since Windows CE is no longer supported on dev, we don't need to dynamically resolve the function anymore. What's more, QueryCounterFrequency is documented to never fail since Windows XP, so we haven't needed GetTickCount64 for years (no clue when we dropped support for Win2k). Change-Id: I115db302eb114bed8cd1fffd14558a81353d2aed Reviewed-by: Friedemann Kleint <Friedemann.Kleint@qt.io> Reviewed-by: Maurice Kalinowski <maurice.kalinowski@qt.io> Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
* | | | | QStringRef: add missing relational operators against QByteArrayMarc Mutz2016-06-083-3/+38
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | QStringRef op QByteArray was ambiguous between bool QStringRef::operator op(const char*) const bool operator op(const QStringRef&, const QString&) QByteArray op QStringRef was ambiguous between bool operator op(const QString&, const QStringRef&) bool operator op(const char*, const QStringRef&) Fix by providing more overloads. [ChangeLog][QtCore] Disambiguated the relational operators comparing QByteArray with QStringRef (and vice versa). Change-Id: I1cfa9ecfdd8b4102e652593faf35f6098289bc34 Reviewed-by: Edward Welbourne <edward.welbourne@qt.io> Reviewed-by: Lars Knoll <lars.knoll@qt.io>
* | | | | QString: fix QChar <> QLatin1String relational operators for non-US-ASCIIMarc Mutz2016-06-082-14/+18
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The implementation used the QString::compare_helper(QChar*, int, char*, int) overload, which, however, interprets the rhs as a UTF-8 sequence, not as Latin-1. Fix by using the (QChar*, int, QLatin1String) overload. Extend the test to cover this case, too. Change-Id: I59b26d63d0caec036b80ef8818c75d0cebe519d2 Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
* | | | | Remove QSysInfo code related to unsupported versions of Windows.Jake Petroules2016-06-081-111/+13
| | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: Ia28f17146d61724dbea73939793dfbd503546e56 Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
* | | | | tst_qstringapisymmetry: cover QByteArray, const char*, tooMarc Mutz2016-06-081-2/+87
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | As in 032efc2cb20e163a2daf8aef9eb8df2b757d17dc, which added the API-symmetry test, define the missing relational operators locally in the test harness until they are fixed in the library. Change-Id: Ic2688e6b6b3e028a9c29f1a5eb01058375ef3fe9 Reviewed-by: Edward Welbourne <edward.welbourne@qt.io>
* | | | | QSharedPointer/QWeakPointer/QScopedPointer: add comparison against nullptrGiuseppe D'Angelo2016-06-087-1/+231
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Some constructors were added, but the comparison operators were missing. The STL has them, so we ought have them too. Change-Id: I030c14a3b355988f509716b4b1b1a835b3ab9481 Reviewed-by: Marc Mutz <marc.mutz@kdab.com>
* | | | | Use built-ins for qPopulationCount on MSVC and recent Clang versions.Erik Verbruggen2016-06-081-23/+52
| | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: Ib7e5f1129dda664d81f8a59bfa851ae70ef04542 Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
* | | | | Set ssl in QT_CONFIG when openssl is enabledLars Knoll2016-06-082-31/+31
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Makes things symmetrical with the windows configure and cleans up the logic in ssl.pri Change-Id: I4a373afe78e904de7d04baea38c250ff0c9d5062 Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@theqtcompany.com>