summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Do not load plugin from the $PWD5.9Olivier Goffart2020-01-151-1/+0
| | | | | | | | | | | | I see no reason why this would make sense to look for plugins in the current directory. And when there are plugins there, it may actually be wrong Change-Id: I5f5aa168021fedddafce90effde0d5762cd0c4c5 Reviewed-by: Thiago Macieira <thiago.macieira@intel.com> (cherry picked from commit bf131e8d2181b3404f5293546ed390999f760404) Reviewed-by: Volker Hilsheimer <volker.hilsheimer@qt.io> (cherry picked from commit 52b739776daecf80a8276b49c9e4337e018d8e8b) Reviewed-by: Olivier Goffart (Woboq GmbH) <ogoffart@woboq.com>
* Add changes file for Qt 5.9.9v5.9.9Antti Kokko2019-12-031-0/+24
| | | | | | | | | | | | | | | | | | | | | | | | | + 32610be57a6caf55ea9a2115ab61cfda3bac83e2 Bump version + 9eac844b2a2eb527a0dd9f854cbb60a9e028b9c2 Temporarily skip tst_QSslSocket::resume + decae3b77a468b5e0342a60bbb71f3d4904110d8 SSL: Update an about-to-expire certificate + 497e0d65800cb41b1b3f50b19388a35695c68748 Blacklist QHostInfo::reverseLookup:google-public-dns-a.google.com + ea16c860bd75a35134ebb1d4f3be5db58f4a4e21 Optimize and fix handling of QtMessageHandlers + 4cc6e1419294a729e53d698bace2254903c1429b QSimpleTextCodec: fix load memory order of atomic pointer + 51bcc7e07e2bb5b42bb200dcd5269e9e9e2fe240 QFreeList: fix memory order on block deletion + da38f0d691d9d7eacfac5fbcbd47b887bd59bd39 QMutexPool: fix memory order of atomic operations + ced53c483da3b1d55850d2087d9a743983c8b944 QNetworkAccessManager: defer call to _q_networkSessionStateChanged + f1f73cc5aa1fa3c89474a0ca3a3aa0c95a66d793 Fix compilation with C++20 + e4df651d031c6e9f5627f7f3be5da0c78db62084 iOS Accessibility: implement accessibilityElements and check indexing + 8c5a6957fd3121ea2aa81949c746d117e97e1e95 Update bundled libpng to version 1.6.37 + f184f8780fef920006cf71e38b1477fe975bc3b1 Avoid hanging on painting dashed lines with non-finite coordinates + 88b1dd29c885aa35255b9ec1c824c5e5d7ba3789 iOS: Disable C++17 + 8f9120d4808ce1fca6ae0dcda66e48d4d09350bb Blacklist tst_QDnsLookup::lookup in ci + 2ed7831ff636f4fbaec27524d416d63c2fd773bf DBus: fix deadlock when destroying QDBusServer + 2bf6a94cf60aa53f8a18f71dd4dce047c52dfc64 Clean up time-zone matching logic in tst_QLocale::macDefaultLocale() Change-Id: Iab7461643f9c49c10ce5a2086656943284de7d02 Reviewed-by: Friedemann Kleint <Friedemann.Kleint@qt.io> Reviewed-by: Eirik Aavitsland <eirik.aavitsland@qt.io> Reviewed-by: Edward Welbourne <edward.welbourne@qt.io>
* Clean up time-zone matching logic in tst_QLocale::macDefaultLocale()Edward Welbourne2019-11-251-17/+17
| | | | | | | | | | | | | | | | | | | | | The test was computing GMT with a suffix added to it for the offset; but when the offset is zero there's no need for it. Cleaned up the logic so that it only checks for a "padded to two digits with zero" if the number is single-digit (and use string arithmetic in preference to wantonly complex .arg()ing; and use simpler names). Since we don't try to check anything unless GMT does appear in the string (because the actual zone ID was used, instead of GMT with an offset), the case of zero offset has nothing more to check than that GMT was present, the precondition for checking anything. Fixes: QTBUG-79965 Task-number: QTBUG-70322 Change-Id: I0b8abe7e63d9d72fa9cf32f188b47a78a849044b Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org> Reviewed-by: Thiago Macieira <thiago.macieira@intel.com> (cherry picked from commit 017ac02ec459378074a44487f171cc909e947f4a) Reviewed-by: Heikki Halmet <heikki.halmet@qt.io> Reviewed-by: Frederik Gladhorn <frederik.gladhorn@qt.io>
* DBus: fix deadlock when destroying QDBusServerMårten Nordheim2019-08-231-2/+6
| | | | | | | | | | | | | | | | | | | | | | | | | Observed infrequently in the QDBus tests, it would deadlock when destroying QDBusServer at the same time as qDBusNewConnection was being executed as they were locking the same locks, but in opposite order. QDBusServer locks d->lock, then QDBusConnectionManager::instance()->mutex. While qDBusNewConnection locks QDBusConnectionManager::instance()->mutex, then serverConnection->lock (and serverConnection here is QDBusServer's d-pointer). QOrderedMutexLocker cannot be used in this situation because it operates on QMutex*, which d->lock (QReadWriteLock) is not. Change the code to lock QDBusConnectionManager's mutex before d->lock and then unlock the QMutexLocker where it would previously destruct. If QDBusConnectionManager has already been destroyed then we pass a nullptr to the QMutexLocker which is fine and will not do anything. Fixes: QTBUG-74635 Change-Id: I7f02d7759da67377996ef042c81b0969ccb8aadb Reviewed-by: Marc Mutz <marc.mutz@kdab.com> Reviewed-by: Edward Welbourne <edward.welbourne@qt.io> (cherry picked from commit 6d3a4546934827955f0eb2b07a9928f82790ba37)
* Blacklist tst_QDnsLookup::lookup in ciMårten Nordheim2019-08-241-0/+2
| | | | | | | | | | | It is incredibly flaky in CI (all/multiple platforms), but stable on local machines. This is not a cherry-pick because it would have to cherry-pick multiple patches. Change-Id: Ic1c3887a3c04bbfaa92421fff347161c9bf2ad96 Reviewed-by: Volker Hilsheimer <volker.hilsheimer@qt.io>
* iOS: Disable C++17Tor Arne Vestbø2019-08-071-1/+1
| | | | | | | | | | | The standard library on some of the deployment targets (iOS 8 to 10) does not have aligned new and delete operators. Allowing C++17 would make us think we could use those, and the build would fail with the aligned-allocation-unavailable diagnostic. Fixes: QTBUG-77197 Change-Id: I86dc1dc97929b0c9359b4d7cc8dbca85672111dc Reviewed-by: Simon Hausmann <simon.hausmann@qt.io>
* Avoid hanging on painting dashed lines with non-finite coordinatesEirik Aavitsland2019-08-022-0/+5
| | | | | | | | | | | The dash stroker did not check for inf/nan coordinates. Fixes: QTBUG-47887 Change-Id: I1e696cd15cc37d8fcb6a464cac3da33c3a8b95c2 Reviewed-by: Allan Sandfeld Jensen <allan.jensen@qt.io> (cherry picked from commit 8f8267f00bfa0d1716e38358ecc0fafff1d9df14)
* Update bundled libpng to version 1.6.37Eirik Aavitsland2019-07-3131-1757/+1790
| | | | | | | | | | | | | | | The remaining diff to clean 1.6.37 is archived in the qtpatches.diff file. [ChangeLog][Third-Party Code] libpng was updated to version 1.6.37 Squashed cherry pick of: 0d7c049e4407bf0db8d1eca1ea248c6d6b739c8c dc2aead842f4cdf74f9259d3606c53c8bdae2c6b 5d8b01468e8bd752dad090aaef4ccf3a83a58a0d 2e8005765d6513c4743a939aea97c68427f6ab2c Change-Id: I589bff09beec1977be8c6ca2a60aadf05f337f38 Reviewed-by: Liang Qi <liang.qi@qt.io>
* iOS Accessibility: implement accessibilityElements and check indexingFrederik Gladhorn2019-07-301-0/+8
| | | | | | | | | | Backported from 5.12 since several users seem to struggle with this issue. Fixes: QTBUG-70683 Change-Id: I122c67a5cee22363de5c8e45dc1c83e7760162fb (cherry picked from commit 8e528d8bd08406e9cc86abcfe153f02d585d3654) Reviewed-by: Tor Arne Vestbø <tor.arne.vestbo@qt.io>
* Fix compilation with C++20Marc Mutz2019-07-092-2/+2
| | | | | | | | | | Implicit capture of 'this' in [=] is deprecated in C++20. Fix by using explicit captures. Change-Id: I1633446f4670202b0d1aca938d8c27dbc0c1411e Reviewed-by: Mårten Nordheim <marten.nordheim@qt.io> (cherry picked from commit f5745609481dd4f660e196b8438e25615d3dfe0a)
* QNetworkAccessManager: defer call to _q_networkSessionStateChangedUlf Hermann2019-07-081-1/+7
| | | | | | | | | | | | | | | Also, call it only if the state really changes. If we stay disconnected the whole time, there is no point in trying to create the session over and over. Change-Id: Ic3a92dd0575bed1a23ae36a944cc51b9741fb64a Fixes: QTBUG-49760 Reviewed-by: Jesus Fernandez <Jesus.Fernandez@qt.io> Reviewed-by: Mårten Nordheim <marten.nordheim@qt.io> Reviewed-by: Timur Pocheptsov <timur.pocheptsov@qt.io> (cherry picked from commit c89d0f9d532a2719118614b9fa9b8efffbe12f2f) Reviewed-by: Rolf Eike Beer <eb@emlix.com> Reviewed-by: Ulf Hermann <ulf.hermann@qt.io>
* QMutexPool: fix memory order of atomic operationsMarc Mutz2019-06-302-4/+7
| | | | | | | | | | | | | | | | | | | | | | | | The array of QAtomicPointer<QMutex> can be initialized using relaxed stores of nullptr, since nullptr is the whole data. But once we store an actual QMutex pointer in the array, we need to publish the indirect data thus created. We did this, with testAndSetRelease(); what was missing was a corresponding acquire fence on load, without which there is no happens-before relationship between the writes performed by the QMutex ctor and the reads performed by a subsequent mutex.lock(), say, on the same data. Fix by adding acquire fences to all loads. That includes the dtor, since mutexes may have been created in different threads, and never been imported into this_thread before the dtor is running. As a drive-by, return a new'ed QMutex that was successfully installed directly to the caller, without again going through a load-acquire. Change-Id: Ia25d205b1127c8c4de0979cef997d1a88123c5c3 Reviewed-by: David Faure <david.faure@kdab.com> Reviewed-by: Giuseppe D'Angelo <giuseppe.dangelo@kdab.com> Reviewed-by: Thiago Macieira <thiago.macieira@intel.com> (cherry picked from commit 65b8f59e045bb41fef99b1a44f462115de65064a)
* QFreeList: fix memory order on block deletionMarc Mutz2019-06-301-1/+1
| | | | | | | | | | | | Blocks are likely to have been created in a differnt thread from the one performing their deletion, so we need an acquire fence. The rest of the atomics use in the class looks ok, but nevertheless warrants a deeper analysis. Change-Id: I1571ded3a06695b0d58b5bf1d80d6283ac21f959 Reviewed-by: Thiago Macieira <thiago.macieira@intel.com> (cherry picked from commit 6fa34930c23c7494a3f2703777f46794ff091e2b)
* QSimpleTextCodec: fix load memory order of atomic pointerMarc Mutz2019-06-241-3/+3
| | | | | | | | | | | | | | | | The pointer value is not the only data we're interested in, but instead points to indirect data, so we need a release fence on store (present) and a corresponding acquire fence on load (was missing). Change-Id: I51f8251c0c7f4056192880430f2be5e0836dbed6 Reviewed-by: Thiago Macieira <thiago.macieira@intel.com> (cherry picked from commit 6f84829031f318bfda1deff5f409b5ea6c6a5c5f)
* Optimize and fix handling of QtMessageHandlersMarc Mutz2019-06-241-15/+20
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | A function may almost always have static storage duration, but that does not necessarily mean that we can store and load pointers to them without memory ordering. Play it safe and use store-release and load-acquire for them (which combines to ordered for the fetchAndSet call in qInstall*Handler(), as we don't know what the caller will do with the returned function pointer). Also change the initial value of the atomic pointer to nullptr. Nullptr already signified the default handler in qInstall*Handler(), so the API doesn't change. But by using nullptr to mean default, we place these variables in the BSS segment instead of TEXT, save dynamic init, or at least a relocation, and we dodge the smelly comparison of function pointers, using comparison against nullptr instead. Also, as a drive-by, put the call to ungrabMessageHandler() in a scope-guard. Both the message handler, as well as the Qt code calling it (toLocal8Bit()!), may throw, and that would stop all further logging. In Qt 5.9, we can't use qScopeGuard(), yet, so use a local struct calling ungrabMessageHandler() in its dtor. The code still has one problem: When a logging action is underway, and another thread exchanges the message handler, we might still execute code in the old handler. This is probably not a problem in practice, since no-one will use a dynamically-compiled function for logging (right? :), but should probably be documented or fixed. This patch does not address this issue, though. Change-Id: I21aa907288b9c8c6646787b4001002d145b114a5 Reviewed-by: Thiago Macieira <thiago.macieira@intel.com> (cherry picked from commit cd401b74a13cd9d9a47d977f195c7985cf725d55)
* Blacklist QHostInfo::reverseLookup:google-public-dns-a.google.comMårten Nordheim2019-06-251-0/+2
| | | | | | | | | | | | Back in April the entry for 8.8.8.8 changed, and this was planned to be blacklisted. Google, however, changed it back and the blacklist patches were dropped. At some point they changed it again and the blacklist will still be needed. The issue was fixed separately in >=5.12. Change-Id: I5dbc234a216ae639d463a48a6278c31120f18612 Reviewed-by: Timur Pocheptsov <timur.pocheptsov@qt.io>
* SSL: Update an about-to-expire certificateMårten Nordheim2019-06-242-30/+30
| | | | | | | | | Change-Id: I9e29baf529b74ae33fa0ee7250e5af6b1873e86f Reviewed-by: Timur Pocheptsov <timur.pocheptsov@qt.io> (cherry picked from commit 42f3b18ec9a101a7b8e5c6433257249bb36ab88c)
* Temporarily skip tst_QSslSocket::resumeMårten Nordheim2019-06-241-0/+1
| | | | | | | | | | | | Will be reverted once ready Change-Id: Id03df7dea1dd65579ec83606fddf2a73a45a0d64 Reviewed-by: Timur Pocheptsov <timur.pocheptsov@qt.io> (cherry picked from commit a489e11b97ca6c0f5893711a363c9896dd8377f8)
* Bump versionFrederik Gladhorn2019-05-231-1/+1
| | | | Change-Id: I9c224d41b735a301a145cf6a53cfbeaa294f2b59
* Merge remote-tracking branch 'origin/5.9.8' into 5.9Qt Forward Merge Bot2019-04-251-0/+51
|\ | | | | | | Change-Id: I9819f2ba81134765947a3fa0557b0dde4c885836
| * Add changes file for Qt 5.9.8v5.9.8Antti Kokko2019-04-091-0/+51
|/ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | + 976b43a7acf72897d506500910b38bd4b96585c1 Fix font weights on macOS 10.14 + fdb3f3a79f2c006a4d76595d10c52549b718b1af Bump version + ec298193baae320410deac41e4884aa3474dcd6d OpenSSL: force the "1.0.0" soname when loading OpenSSL 1.0 + 1288c5b0bbdb51cf4467c84cc9bfd5b03972b5c5 Windows: Disable shader disk cache for Intel HD Graphics 620 + e73bd4a5be059dcef5f8afca567f9aca31866230 [cocoa] Disable offline renderers for dual AMD FirePro GPU + 928e77fa14e18773f994be7cf9dcf0da52f39055 Fix deleting of QSharedPointer internals in case QPointer loses the race + 7547f57e26e01f0b20908d68afd93029fc7f8f1a Silence a GCC 8 warning in qxcbnativeinterface + ec554de6153aaa09ec23ba4894eb2d840fef7b23 Fix cast-function-type gcc 8 warning + b731a275bd124e22ab4f9fe7410a84e50d4f309d Windows: Don't output a warning when sHGetKnownFolderPath fails + 56c92b1e5add9bf07be64b2dd74d878679afde73 qmake: make sure 'move' commands to DESTDIR are valid on mingw + b11c5a6e5492ce25b8844550ff1a0dc233b61721 macOS: restore hidden popup windows + b110a8eda6876261f945d292e888ee8405ababdd Silence a GCC 8 warning in qoutlinemapper + 5f72767f9963ab17ee16b611c8ee9a40ea04b941 Silence a GCC 8 warning in evdevtablet + 8b9a771ec0b70822f4a34d289459d3e60b9510ce ibase: Silence warning about incompatible function types + a49d339fdfb38ef58f2ccb9917f9aad6f63ff1ed Silence a GCC 8 warning in qpainter + 7b42fbebbae35a1037d23b58a41bea35dd448f53 tst_QNetworkReply: Blacklist getFromHttp:success-external + b2cd25965ead27745f662109868adc1b65faebcd macOS: Unbreak build after b11c5a6e5 + b11ae750db4344f54948ea2bdd5dc8c8309d6c67 Active Qt Servers: Fix midl warning about unknown option + 730dea58cfb2881e67e409b9ad0677485e2b3eb1 OpenSSL: also try the "1.0.2" soname + b2aa8dbbde11815080d12837acf0be2bb36471bf Offscreen QPA: use a CoreText font database on macOS + 357bc63639a6ef46f6fe4c626ffbc463ad178ba6 uic: Generate version check macros around newly introduced palette color role + 94aa7dabd234981ebc5893e1b8154ac990ccbe44 Bump copyright year to 2019 + 159f7e9c39c57177d25f524ae3cad4e533b89da8 Upgrade PCRE2 to 10.32 Change-Id: I3f3fcb3992da8fd273be9a3fd18a3e430c196282 Reviewed-by: Frederik Gladhorn <frederik.gladhorn@qt.io> Reviewed-by: Friedemann Kleint <Friedemann.Kleint@qt.io> Reviewed-by: Edward Welbourne <edward.welbourne@qt.io> Reviewed-by: Lars Knoll <lars.knoll@qt.io>
* Upgrade PCRE2 to 10.32Giuseppe D'Angelo2019-01-2257-20764/+25946
| | | | | | | | | | | | | | Squashed cherry pick of: e39a9de3309f84be4101da839a0bacf69090706f a7bcd16c750fb2ed36522719237af8ce3be94fa2 3bac18da8ef9f5750207ddf47192b5db3137c4ac 44eeeb8e816fbdcd77ad734cfe7a7ec28da1c5ed [ChangeLog][Third-Party Code] PCRE2 was updated to version 10.32. Change-Id: Id3bf7df0003f626cd1135d0508a5a489ff02f1e5 Reviewed-by: Thiago Macieira <thiago.macieira@intel.com> Reviewed-by: Lars Knoll <lars.knoll@qt.io>
* Bump copyright year to 2019Kai Koehne2018-12-258-8/+8
| | | | | | | | | Task-number: QTBUG-72635 Change-Id: Idc9bd97fe873b332d7ff72cb44a00334a472404f Reviewed-by: Friedemann Kleint <Friedemann.Kleint@qt.io> Reviewed-by: Alex Blasche <alexander.blasche@qt.io> Reviewed-by: Paul Wicking <paul.wicking@qt.io> (cherry picked from commit 5fd48d78d59128cf57a1c4eae3980c23497a8def)
* uic: Generate version check macros around newly introduced palette color roleFriedemann Kleint2018-12-171-1/+18
| | | | | | | | | | | | | | Change ebd3a13b807c6af2684b42d3912549caf7ef82aa introduced a new QPaletter::PlaceholderText color role which causes the uic-generated code not to compile when using Qt Designer embedded in Qt Creator with older (5.9 LTS) kits. Generate a version check macro to fix this. Change-Id: I6d9f7edb0c6047c2f64ef3357b29f91655c52aac Fixes: QTBUG-72555 Reviewed-by: Lars Knoll <lars.knoll@qt.io> Reviewed-by: Christian Ehrlicher <ch.ehrlicher@gmx.de> Reviewed-by: André Hartmann <aha_1980@gmx.de> (cherry picked from commit 3c3a2eb3cea0bbb0b45e43278421e051c253e434)
* Offscreen QPA: use a CoreText font database on macOSR.J.V. Bertin2018-12-131-1/+4
| | | | | | | | | | | | Without this applications using the Offscreen QPA don't have access to any fonts on macOS and thus cannot render text correctly. Task-number: QTBUG-72335 Change-Id: I8e58c066365d0231d0993ad3b480d957a32f7f7b Reviewed-by: Tor Arne Vestbø <tor.arne.vestbo@qt.io> Reviewed-by: Allan Sandfeld Jensen <allan.jensen@qt.io> Reviewed-by: Friedemann Kleint <Friedemann.Kleint@qt.io> (cherry picked from commit 6b52c1834daec628bab5a384e1dfd039937b375d)
* OpenSSL: also try the "1.0.2" sonameGiuseppe D'Angelo2018-12-101-9/+18
| | | | | | | | | | | | Turns out that also Debian patches OpenSSL 1.0, changing its soname to "1.0.2". Therefore, try also to load that one. Amends ec298193baae320410deac41e4884aa3474dcd6d. Task-number: QTBUG-68156 Change-Id: I37cc060e90422779a6c29a324ab900f0fb99cfa7 (cherry picked from commit 2a494875b8f3d50046d35fb21988c288fcfa1dc7) Reviewed-by: Timur Pocheptsov <timur.pocheptsov@qt.io>
* Active Qt Servers: Fix midl warning about unknown optionFriedemann Kleint2018-12-081-1/+1
| | | | | | | | | | | Remove the option from msvc-desktop.conf, which duplicates the /nologo option in idcidl.prf. Fixes: QTBUG-72046 Change-Id: I906097e0611f4578c307616b3f9ebecdfc4d8812 Reviewed-by: Volker Hilsheimer <volker.hilsheimer@qt.io> (cherry picked from commit 4447db44652420d80886de8de4b02f3bcd9fe86c) Reviewed-by: Akihito Izawa <akihito.izawa@qt.io>
* macOS: Unbreak build after b11c5a6e5Tor Arne Vestbø2018-12-071-0/+1
| | | | | | Fixes: QTBUG-71898 Change-Id: Ia32e05f901838949bf7cbf75d873e954a3da1178 Reviewed-by: Eirik Aavitsland <eirik.aavitsland@qt.io>
* tst_QNetworkReply: Blacklist getFromHttp:success-externalLiang Qi2018-11-271-0/+3
| | | | | | | | Task-number: QTBUG-71953 Change-Id: Ibf45a8184cb0a78b1d36b4110974be4508b299fb Reviewed-by: Timur Pocheptsov <timur.pocheptsov@qt.io> (cherry picked from commit 46076f73337d6b0fea9a006dab2af8864571ae2c) Reviewed-by: Liang Qi <liang.qi@qt.io>
* Silence a GCC 8 warning in qpainterVille Voutilainen2018-11-191-2/+2
| | | | | | | | | | qtbase/src/gui/painting/qpainter.cpp:5625:68: error: ‘void* memset(void*, int, size_t)’ clearing an object of non-trivial type ‘struct QFixed’; use assignment or value-initialization instead [-Werror=class-memaccess] memset(advances.data(), 0, advances.size() * sizeof(QFixed)); Change-Id: I563b1b0c5dfaf381a9521bc9a4dc3197f0f38d11 Reviewed-by: Simon Hausmann <simon.hausmann@qt.io> (cherry picked from commit 71cdc95006871a338ec2c0b869299980cef2776e) Reviewed-by: Ville Voutilainen <ville.voutilainen@qt.io>
* ibase: Silence warning about incompatible function typesAndy Shaw2018-11-191-4/+8
| | | | | | | | | | | | This correctly silents the warning about incompatible function types, it amends the previous fix - 6108d8f515d7911427b764647f1d6ab487ad5203 Task-number: QTBUG-68330 Change-Id: I9eda42817740f491b16ac19c553f35fb1c7aa755 Reviewed-by: Jesus Fernandez <Jesus.Fernandez@qt.io> Reviewed-by: Ville Voutilainen <ville.voutilainen@qt.io> (cherry picked from commit cd02eb5b2090a8e263642ce900de9160e60f7d0f) Reviewed-by: Andy Shaw <andy.shaw@qt.io>
* Silence a GCC 8 warning in evdevtabletVille Voutilainen2018-11-191-1/+1
| | | | | | | | | qtbase/src/platformsupport/input/evdevtablet/qevdevtablethandler.cpp:85:36: error: ‘void* memset(void*, int, size_t)’ clearing an object of non-trivial type ‘struct QEvdevTabletData::<unnamed>’; use assignment or value-initialization instead [-Werror=class-memaccess] memset(&state, 0, sizeof(state)); Change-Id: I3b18ffa7fdf9c7aa1bd4977f12858fd1f176c020 Reviewed-by: Friedemann Kleint <Friedemann.Kleint@qt.io> (cherry picked from commit 7eac2e7350f8831a7d79085897496f9373284d3d)
* Silence a GCC 8 warning in qoutlinemapperVille Voutilainen2018-11-191-1/+1
| | | | | | | | | | | | qtbase/src/gui/painting/qoutlinemapper.cpp: In member function ‘QT_FT_Outline* QOutlineMapper::convertPath(const QVectorPath&)’: qtbase/src/gui/painting/qoutlinemapper.cpp:182:76: error: ‘void* memcpy(void*, const void*, size_t)’ copying an object of non-trivial type ‘class QPointF’ from an array of ‘const qreal’ {aka ‘const double’} [-Werror=class-memaccess] memcpy(m_elements.data(), path.points(), count* sizeof(QPointF)); Change-Id: Ieca99f0262c57e58adbcf48ac923ae11bd428b00 Reviewed-by: Simon Hausmann <simon.hausmann@qt.io> (cherry picked from commit ea1137ff5e5394e1420be27aa56dc92cee841df5) Reviewed-by: Friedemann Kleint <Friedemann.Kleint@qt.io> Reviewed-by: Ville Voutilainen <ville.voutilainen@qt.io>
* macOS: restore hidden popup windowsRafael Roquetto2018-11-152-2/+20
| | | | | | | | | | | | | | | | We need to explicitly unhide popup windows that were previously explicitly hidden by applicationWillHide, so that their visibility will be effectively restored when the application is unhidden (otherwise the windows are gone forever even though their internal visibility is set to true). Change-Id: I4dbd209b07f769cc815851b40c41db0739ca2dc9 Task-number: QTBUG-71014 Reviewed-by: Timur Pocheptsov <timur.pocheptsov@qt.io> Reviewed-by: Edward Welbourne <edward.welbourne@qt.io> Reviewed-by: Tor Arne Vestbø <tor.arne.vestbo@qt.io> (cherry picked from commit d02fed67814a3cb8f28a4f0ec61e075858fce238) Reviewed-by: Shawn Rutledge <shawn.rutledge@qt.io>
* qmake: make sure 'move' commands to DESTDIR are valid on mingwOswald Buddenhagen2018-11-141-7/+7
| | | | | | | | | | | | | | | the code ensures that the path ends with a path separator, which is unhealthy under mingw when the command ends with that path, because it's interpreted as a line continuation. the easiest fix is just duplicating the name of the moved file to the destination side. the cleaner fix would have been cleaning up the path separator mess, but that's a more invasive change and doesn't seem worth it. Task-number: QTBUG-69255 Change-Id: I338f8997b84ed7049b5665872dd25f90b9d4d16a Reviewed-by: Joerg Bornemann <joerg.bornemann@qt.io> (cherry picked from commit da4dcc0893fce3555b35d931801f94f472593742)
* Windows: Don't output a warning when sHGetKnownFolderPath failsAndy Shaw2018-11-121-11/+6
| | | | | | | | | | | | | | | | In the rare case where the known locations for the standard paths are not known (such as when an application is used without a user logged in), it will output a warning to indicate this. In the case of the GenericConfigLocation, this can mean that it will hang due to the fact that QLoggingCategory is looking for that location too before it can output anything. Therefore, the warning output is removed so that if this part fails it doesn't cause it to hang as a result. Change-Id: I4f189361899bd1f868292f30c09fbe50982d2288 Reviewed-by: Kai Koehne <kai.koehne@qt.io> (cherry picked from commit bebae3737624a54f6f8062f1cbf32179fb43df7a)
* Fix cast-function-type gcc 8 warningAllan Sandfeld Jensen2018-11-081-1/+1
| | | | | | | | | | | | | | | Gcc 8 now warns against casting functions taking references to functions taking pointers: warning: cast between incompatible function types from ‘QVariant (*)(const int&, const int&, double)’ to ‘QVariant (*)(const void*, const void*, double)’ [-Werror=cast-function-type] Suppressed by casting over void(*)(). Change-Id: I48bee53253b8e87110e8a49efa761fc2add89c5a Reviewed-by: Thiago Macieira <thiago.macieira@intel.com> (cherry picked from commit 0ffc39806e4669eaebe2d20d197b3a6f356be862) Reviewed-by: Allan Sandfeld Jensen <allan.jensen@qt.io>
* Silence a GCC 8 warning in qxcbnativeinterfaceVille Voutilainen2018-11-071-4/+4
| | | | | | | | | | qtbase/src/plugins/platforms/xcb/qxcbnativeinterface.cpp:309:65: error: cast between incompatible function types from ‘void (*)(const char*)’ to ‘QPlatformNativeInterface::NativeResourceForIntegrationFunction’ {aka ‘void* (*)()’} [-Werror=cast-function-type] return NativeResourceForIntegrationFunction(setStartupId); Change-Id: I83409b3a6cc67ccb4c9e91e592e6a01bb6ce45ea Reviewed-by: Friedemann Kleint <Friedemann.Kleint@qt.io> (cherry picked from commit 1b72d3e645a41c7b7f7731cecbd7119b8e7f7f28) Reviewed-by: Ville Voutilainen <ville.voutilainen@qt.io>
* Fix deleting of QSharedPointer internals in case QPointer loses the raceThiago Macieira2018-11-031-0/+3
| | | | | | | | | | | | | | | | | | | | | | QPointer uses QWeakPointer / QSharedPointer internals in QObject and has the code to make sure two threads won't stomp on each other if both try to create a QPointer for the same QObject at the same time. The threading code was fine, but had a mistake in the clean up code for the loser thread: the QtSharedPointer::ExternalRefCountData destructor has a Q_ASSERT for the state of the reference counts. So we need to set the state correctly before calling the destructor. But we don't want to do it in case the Q_ASSERT compiled to nothing. So we use a hack that violates the Second Rule of Q_ASSERTs: don't do something with side-effects. This way, we can insert code that will only be compiled if Q_ASSERTs do something, without having to duplicate the preprocessor conditions from qglobal.h. Fixes: QTBUG-71412 Change-Id: I1bd327aeaf73421a8ec5fffd1560fdfc8b73b70c Reviewed-by: Romain Pokrzywka <romain.pokrzywka@gmail.com> Reviewed-by: Jędrzej Nowacki <jedrzej.nowacki@qt.io> (cherry picked from commit 3b8075de3b3c842311c157476a85d2cf9ddff403)
* [cocoa] Disable offline renderers for dual AMD FirePro GPUMichael Brüning2018-10-301-1/+6
| | | | | | | | | | | | | | | | | | | | | | | The AMD FirePro dual gpus on the MacPro have a problem with offline renderers in Chromium. Therefore, Chromium and thus Qt WebEngine disable this option via the pixel format attributes. The Qt Cocoa plugin on the other hand enables it in the recent versions, causing context creation in Qt WebEngine to fail when run on a MacPro with dual AMD FirePro gpus due to incompatible context options. This patch uses the environment variable QT_MAC_PRO_WEBENGINE_WORKAROUND which is set by Qt WebEngine upon application startup if the application is running on a late 2013 Mac Pro. [ChangeLog] Offline renderers will be disabled when the application is using Qt WebEngine and running on one of the late 2013 MacPro models. Backport from Qt 5.11 Task-number: QTBUG-70062 Change-Id: I0b0831efb6f4073ebd37672040aaed6370853fc0 Reviewed-by: Andy Shaw <andy.shaw@qt.io>
* Merge remote-tracking branch 'origin/5.9.7' into 5.9Liang Qi2018-10-2310-13319/+13790
|\ | | | | | | | | | | | | | | Conflicts: config.tests/openssl/openssl.cpp src/plugins/platforms/windows/qwindowsintegration.cpp Change-Id: I93ad86751693f4f64981f1c3723bac2061c05379
| * Opt out of new Xcode build system until we can handle its requirementsv5.9.7Tor Arne Vestbø2018-10-161-0/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The new build system in Xcode 10 requires outputs from shell script to be explicitly declared if they are used by subsequent build phases, otherwise the build system may attempt to search for the file before it has been generated, causing the build to fail. The build phase we use for Qt preprocessing (moc, rcc, etc), does not list these output files, so we need to disable the new build system for now. Task-number: QTBUG-71088 Change-Id: I7404c19021f57489e985bd1203ad09ce9b83b090 Reviewed-by: Simon Hausmann <simon.hausmann@qt.io> Reviewed-by: Gabriel de Dietrich <gabriel.dedietrich@qt.io> Reviewed-by: Tor Arne Vestbø <tor.arne.vestbo@qt.io> (cherry picked from commit 21e9c7c24f6430fc694e4ec0d34fba64427587dc) Reviewed-by: Eskil Abrahamsen Blomfeldt <eskil.abrahamsen-blomfeldt@qt.io>
| * Update the DNS public suffix list from publicsuffix.orgEdward Welbourne2018-10-161-13288/+13692
| | | | | | | | | | | | | | | | | | | | It has had some changes and should be kept up to date. Task-number: QTBUG-70852 Change-Id: I868a558811c34cf5a800c3087a0ca96e7fb49b1a Reviewed-by: Mårten Nordheim <marten.nordheim@qt.io> Reviewed-by: Allan Sandfeld Jensen <allan.jensen@qt.io> (cherry picked from commit ba0ff45109a0eb051a42d6d8392d1f1b7a1e9345)
| * Add changes file for Qt 5.9.7Antti Kokko2018-10-121-0/+68
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | + 4524cb8c98b1efe650915788f6f58cf9f35591a1 Configure: Restore default prefix on Windows + 295b2dde7f0b9e28e7d450dc8b028c7b1900e419 VNC plugin: explicitly cast int to uint16_t before calling htons + 9ba30fa98e670c53f66b5487d476664d12ea953c Bump version + 5a8b2e1bb0ee9e02146cbbaa927a3c73ec8c1082 Fix compile with sanitize address & undefined + 6c0766adbd3088958e3885f7a7da00f1b2adcd1c Replace commercial preview license with Qt License Agreement 4.0 + a70f30add391525d9a30e61b3df3f9834e804b17 Flush the initial clear blit with SCREEN_WAIT_IDLE + 7f053dd52aa1ea2168a47ba3a33bf80c358e790c Fix the copyright year of the qgrayraster.c dependency + 965de37b691072ad53dc718ea2e2a6be74af87e7 Update bundled sqlite to 3.24.0 + 27121f35dcf2b40fc1bf2d4d23677c116cee3269 Fix the copyright attribution for the HarfBuzz dependency + 195ccdc6dc59131205c8a56de23a43c06717d3c0 Doc: Make reference to platform styles version agnostic + aadc2cf21eb1e22a8d5814c05a4ed793165d32c2 Doc: Remove reference to QTestEvent + c8d9920dc82ea0256bee5ce82b1fac8d4e870ab8 Doc: Synchronize documentation with code snippet + 1ae3280bef3d811bbe36a930896ea553be9a6b63 Doc: Update out-of-date image in QColorDialog documentation + c712aa1897dc1c84dd3f5bae83120ba4411a6f25 Doc: Update really old screenshot in Sliders Example + e0d0fd38d0e613930dd7185a0d4a2446fb75e091 QJsonDocument: Make emptyObject an object + 3a589e78f94c817b11c0061b385c4c53bd4c195e Doc: Fix wrong link in QFont documentation + 805dce07b9797f5f2770a9d2c58d6d381784ca25 Fix crash in qppmhandler for certain malformed image files + f9324103a0f824de2c5243f07a86e7906b8a8ea6 Check for QImage allocation failure in qgifhandler + fc559c079ec64f3475ca24503b774f9b7a51c14c cocoa: Don’t trigger security dialog on drag + eaa2e164b0559b37dbcd060cd31e110d2775ffd6 Revert "Fix restoring geometry of dockwidget" + 6670948fe312b656769ecdc9679f560ab9585e40 Make QPalette::setBrush() check before detaching + 8dd78e8564d8c4249e85653a8119c1dd1a03d659 Fix MSVC2017 compilation with enabled relaxed constexpr on 32-bit target + 5178a89a6dd8d0bf6e05feb61f51d7a280231c2f Doc: Increase precision in description of convenience typedefs + b810bfc25815525ebae75476aa53e16671f1f2c2 Fix possible heap corruption in QXmlStream + b5221dff520efa3bb923c4faeeeb5712f7724a87 QStyleHelper: Use palette cache key in pixmap key + e0c798742adbc984e71c0f65cc432101da5b9c52 QObject: do allow setProperty() to change the type of the property + 12a7513a5d19d08d61653e7c802d867525eefc50 Fix potential crash when showing line/paragraph separators + 1bf0344b9f41516ef28cd6c047aab801e24ac8df Update CLDR to v31.0.1, test Costa Rican currency's fractional part + 5f2ab16bbc6e6345f3ec2229b712ef309f1ff18b Windows: Fix MDI child window titles in High-DPI displays + a332937cdebf63e7db93e11f3193fc14c4de7e60 qmake: Add test functions for comparing version numbers + 50dd9b10e23df626c35f8d59ae0d0579092eb078 Compare versions in qmake files with versionAtLeast + 9f95f25d2ef3de76d449bc4de5b09e87e9ed537a Fix integer overflow in very long sections in ELF objects + 5104a529ce5aea5e94101770ece188b98f20baaa bmp image handler: check for out of range image size + b76c70173a1639876bd89b24ef59cfb7e07d83e2 QWin32PrintEngine: Fix crash in drawPixmap(), drawImage() + f12d5b1d6108b4d285a6079655c58129451452fd QMenuBar: Account for displays that are above 0x0 + a1bf08dac5da01c097dd983f1b0949d206c73bc0 Windows QPA: Don't test for Desktop GL if Qt::AA_UseDesktopOpenGL is set + [not yet merged] Update the DNS public suffix list from publicsuffix.org Change-Id: I8905321be1f410576c9e8c36a4eb62fd63695935 Reviewed-by: Tor Arne Vestbø <tor.arne.vestbo@qt.io> Reviewed-by: Volker Hilsheimer <volker.hilsheimer@qt.io>
| * Fix font weights on macOS 10.14James Turner2018-10-121-3/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | On later versions of macOS, the font weight trait of fonts is a 64 bit double, not a 32 bit float, and on macOS 10.14, CFNumberGetValue() started returning false for values when the type conversion is lossy, like it is documented to. Therefore, we would end up without weight information in 10.14. The fix is to ask for a double instead, which works regardless of whether the CFNumber represents a 32-bit or 64-bit value. [ChangeLog][macOS][Text] Fixed font weights on macOS 10.14 Task-number: QTBUG-69955 Change-Id: Ia0577236ddc6b96f9231e6de7b1c49f7f8a837a6 Reviewed-by: Tor Arne Vestbø <tor.arne.vestbo@qt.io> Reviewed-by: Jason Haslam <jason@scitools.com> Reviewed-by: Eskil Abrahamsen Blomfeldt <eskil.abrahamsen-blomfeldt@qt.io> (cherry picked from commit 9601ad4e27d0e0a846ff13a1e7dbadd7afd260f5)
| * Fix glext and gles2ext attributionLaszlo Agocs2018-10-102-5/+5
| | | | | | | | | | | | Task-number: QTBUG-70903 Change-Id: I980d9cdd12a0d7565e36a38814b0e85a857bd2b7 Reviewed-by: Alex Blasche <alexander.blasche@qt.io>
| * doc: Document version of bundled Freetype in qt_attributionEskil Abrahamsen Blomfeldt2018-10-051-0/+2
| | | | | | | | | | | | Task-number: QTBUG-70901 Change-Id: Ie7531ceb4d529f45e848d39732bb3402f4a70cbb Reviewed-by: Simon Hausmann <simon.hausmann@qt.io>
| * Fail faster on OpenSSL 1.1Allan Sandfeld Jensen2018-10-031-2/+2
| | | | | | | | | | | | | | | | We don't support OpenSSL 1.1 in 5.9.x, so fail at configure time instead of with weird compile-time errors. Change-Id: I1c1029c5b369bdc1134f6c549bab5692c79a3bc0 Reviewed-by: Giuseppe D'Angelo <giuseppe.dangelo@kdab.com>
| * Windows QPA: Don't test for Desktop GL if Qt::AA_UseDesktopOpenGL is setFriedemann Kleint2018-10-023-24/+19
| | | | | | | | | | | | | | | | | | | | | | Pass the requested render to detectSupportedRenderers(), replacing the bool glesOnly parameters. This allows for simplifying the code. Fixes: QTBUG-70733 Change-Id: Iab65f62d24bf750019180e3b00e2d23c105e5997 Reviewed-by: Laszlo Agocs <laszlo.agocs@qt.io> (cherry picked from commit 05e2690009553d3faaf04ef8927fc072c652dd52) Reviewed-by: Pasi Petäjäjärvi <pasi.petajajarvi@qt.io>
* | Windows: Disable shader disk cache for Intel HD Graphics 620Friedemann Kleint2018-10-234-1/+22
| | | | | | | | | | | | | | | | | | | | | | Set Qt::AA_DisableShaderDiskCache when the feature "disable_program_cache" (modeled after the Chromium driver bug list) is present and set it for the Intel HD Graphics 620 card. Task-number: QTBUG-64697 Change-Id: Ibba588d2ab296b5c959ab8ee9712b47ec7cc906e Reviewed-by: Laszlo Agocs <laszlo.agocs@qt.io> (cherry picked from commit dff9bb2f9b981e263d8d3d5b1ef67054297e731c)