summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* 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)
* | OpenSSL: force the "1.0.0" soname when loading OpenSSL 1.0Giuseppe D'Angelo2018-10-223-5/+25
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Some Linux distributions patch OpenSSL's soname, making builds on such distributions not deployable elsewhere. The problem is that the code loading OpenSSL symbols would attempt to use the soname of the build machine, and therefore not finding the OpenSSL libraries on the deploy system. The binary builds of Qt for Linux are affected by this problem, as they build under RHEL7.4 which changes to soname of OpenSSL to a non-standard string. This makes the binary builds not pick up OpenSSL 1.0 from the machine where the build gets installed on. Given that in the pre-1.1 versions only the 1.0 series is supported, bump the minimum requirement of Qt to that. The 1.0.x releases (up to 1.0.2, at the time of this writing) have kept binary compatibility, and advertise a soname of "1.0.0", which is used by most distributions. So, if loading of OpenSSL with the build-time soname fails, try to load them with the "1.0.0" hardcoded soname. [ChangeLog][QtNetwork][SSL] OpenSSL >= 1.0 is now required to build Qt with OpenSSL support. Task-number: QTBUG-68156 Change-Id: Ieff1561a3c1d278b511f09fef06580f034f188c6 Reviewed-by: Timur Pocheptsov <timur.pocheptsov@qt.io> (cherry picked from commit 2708c6c11d685ab25c12d558961d924c9a4533d2)
* | Bump versionOswald Buddenhagen2018-10-111-1/+1
| | | | | | | | Change-Id: I7014c39015e64ec993b67eb9beb7de0d9bfbcdba
* | Fix font weights on macOS 10.14Eskil Abrahamsen Blomfeldt2018-10-021-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> (cherry picked from commit 9601ad4e27d0e0a846ff13a1e7dbadd7afd260f5) Reviewed-by: Eskil Abrahamsen Blomfeldt <eskil.abrahamsen-blomfeldt@qt.io>
* QMenuBar: Account for displays that are above 0x0Andy Shaw2018-09-263-1/+130
| | | | | | | | | | | | | | If a display is placed above a primary screen which has the top left set to be 0x0, then menus that are defaulting to go up can still be displayed on that screen when the menubar is placed on the bottom of it. This ensures that this is the case and also adds a manual test to aid verification of it in the future. Change-Id: Ib657ccdc1aabfe1586c72585c087ac80a6c632c2 Reviewed-by: Friedemann Kleint <Friedemann.Kleint@qt.io> (cherry picked from commit 34d212cb02f168e59c2a5c8e95a12377a57bfb7e) Reviewed-by: Richard Moe Gustavsen <richard.gustavsen@qt.io>
* QWin32PrintEngine: Fix crash in drawPixmap(), drawImage()Friedemann Kleint2018-09-241-8/+2
| | | | | | | | | | | | | Use the printer's HDC instead of the screen HDC for StretchBlt(). Patch as contributed via bug report. Task-number: QTBUG-59689 Task-number: QTBUG-66325 Change-Id: I9b5d6ddd3f0e9e68f2a003ca9ed20ece20dccef8 Reviewed-by: Andy Shaw <andy.shaw@qt.io> (cherry picked from commit 7aaa7debc455516cbb1b1f536e990b9154272f64) Reviewed-by: Friedemann Kleint <Friedemann.Kleint@qt.io>
* bmp image handler: check for out of range image sizeEirik Aavitsland2018-09-241-0/+2
| | | | | | | | | | Make the decoder fail early to avoid spending time and memory on attempting to decode a corrupt image file. Change-Id: I874e04f3b43122d73f8e58c7a5bcc4a741b68264 Reviewed-by: Lars Knoll <lars.knoll@qt.io> (cherry picked from commit 621ab8ab59901cc3f9bd98be709929c9eac997a8) Reviewed-by: Liang Qi <liang.qi@qt.io>
* Fix integer overflow in very long sections in ELF objectsThiago Macieira2018-09-241-1/+1
| | | | | | | | | | | | | | The source is an ElfXX_Off, which is an unsigned 32- or 64-bit. That means any section bigger than 2 GB would cause an overflow when we assigned in m_stringTableFileOffset = strtab.offset; Change-Id: Ib47c56818178458a88b4fffd15546bd47a89894e Fixes: QTBUG-70560 Reviewed-by: Olivier Goffart (Woboq GmbH) <ogoffart@woboq.com> (cherry picked from commit cb5c24fa26142edaff8fd2c9787dbe45c222b4ff) Reviewed-by: Jędrzej Nowacki <jedrzej.nowacki@qt.io>
* Compare versions in qmake files with versionAtLeastAlexander Volkov2018-09-247-33/+13
| | | | | | | Change-Id: Iba5686131d9f3e22e9a4d6da473a61a845b0418e Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@qt.io> (cherry picked from commit bf6ae8406bc714828c7746f6abd611b66bbeb363) Reviewed-by: Tor Arne Vestbø <tor.arne.vestbo@qt.io>
* qmake: Add test functions for comparing version numbersAlexander Volkov2018-09-246-1/+77
| | | | | | | | | | | | | | | | | qmake really lacks version comparing functions: users either use ugly constructions to compare versions by components, such as greaterThan(QT_CLANG_MAJOR_VERSION, 3)|greaterThan(QT_CLANG_MINOR_VERSION, 4): or even incorrectly compare versions as strings: !lessThan(apple_clang_ver, "5.1")|!lessThan(reg_clang_ver, "3.4"): Add test functions versionAtLeast and versionAtMost which use QVersionNumber to compare version numbers by components. Change-Id: I65e6b3c296d0301d544b7e38bf3d44f8d555c7fc Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@qt.io> (cherry picked from commit 8a3e8856e5606ec616d4420ff8c4f77969432390) Reviewed-by: Tor Arne Vestbø <tor.arne.vestbo@qt.io>
* Windows: Fix MDI child window titles in High-DPI displaysAndre de la Rocha2018-08-302-20/+24
| | | | | | | | | | | | | | This change improves the appearance of MDI child windows in a High-DPI display for applications using the WindowsVista style, with the Qt::AA_EnableHighDpiScaling attribute set. Task-number: QTBUG-64708 Change-Id: I5e9fbd23809b440ffd33e4948c83d115cc6e1910 Reviewed-by: Friedemann Kleint <Friedemann.Kleint@qt.io> Reviewed-by: Alessandro Portale <alessandro.portale@qt.io> (cherry picked from commit 0b9a301e89c6473091a9b80552d6e4058d35bbe6) Reviewed-by: Alex Blasche <alexander.blasche@qt.io> Reviewed-by: Richard Moe Gustavsen <richard.gustavsen@qt.io>
* Update CLDR to v31.0.1, test Costa Rican currency's fractional partEdward Welbourne2018-08-283-4541/+4590
| | | | | | | | | | | | | | | CLDR up to somewhere between v29 (used by 5.9) and v31.0.1 (used by 5.10 and later) claimed Costa Ricans don't include fractions in their currency; now it claims they expec two digits. Apparently one of them does expect those two digits, so this adds a regression test (the cherry-pick) and updates CLDR to 31.0.1 (to make the test pass), along with needed fixes (as in 82deb0ad160) to some other tests. Task-number: QTBUG-70093 Change-Id: I138772cc6013fa74de4f7c54b836cac83421eab2 Reviewed-by: Thiago Macieira <thiago.macieira@intel.com> (cherry picked from commit dc7e775c9c6ecc66f76af8139b8dfc3ee101c7ff) Reviewed-by: Lars Knoll <lars.knoll@qt.io>
* Fix potential crash when showing line/paragraph separatorsEskil Abrahamsen Blomfeldt2018-08-212-1/+19
| | | | | | | | | | | | | | | | | | | | | | | When showing line and paragraph separators at an offset from the start of the string, the end of string pointer would be incorrectly set, and we would read past the end of the string. If any part of this memory happened to match the line or paragraph separator, then we would overwrite it and have a crash. I couldn't find any reliable way to test this, since the crash depends on the contents of the memory after the string allocated by the algorithm. But with an overflow of 100 000 characters, I found that it crashed every time I ran the test. [ChangeLog][QtGui][Text] Fixed potential crash when using QTextOption::ShowLineAndParagraphSeparators. Task-number: QTBUG-69661 Change-Id: I17d1996b883560bacdc7ce114c8aeb2b0108faea Reviewed-by: JiDe Zhang <zccrs@live.com> Reviewed-by: Michal Lazo <xlazom00@gmail.com> Reviewed-by: Konstantin Ritt <ritt.ks@gmail.com> (cherry picked from commit 65a1d41a092e78f7ab142c4c62689e1ca40ba10c)
* QObject: do allow setProperty() to change the type of the propertyThiago Macieira2018-08-212-2/+15
| | | | | | | | | | | | [ChangeLog][QtCore][QObject] Fixed a bug in setProperty() that caused a property change not to take effect if the old value compared equal using QVariant's equality operator, but the values were not strictly equal. Task-number: QTBUG-69744 Change-Id: I00e04a465fcf4fc1a462fffd1547885861a07a64 Reviewed-by: Simon Hausmann <simon.hausmann@qt.io> Reviewed-by: Olivier Goffart (Woboq GmbH) <ogoffart@woboq.com> (cherry picked from commit 64a560d977a0a511ef541d6116d82e7b5c911a92)
* QStyleHelper: Use palette cache key in pixmap keyGabriel de Dietrich2018-08-211-20/+1
| | | | | | | | | | | | | | | | | This reverts commit d7bcdc3a442b99c2caebd4cfd38de67e14090e05. Now that QPalette::setBrush() is a bit smarter (see c564779c071b35fddb76f4e50afda4305b634651), we can be confident the palette's cache key won't change so often. Therefore, we can use it again as part of every pixmap's cache key. Change-Id: I5cab2296a937f9149c7745291e0442eea24f4e9d Task-number: QTBUG-65475 Reviewed-by: Friedemann Kleint <Friedemann.Kleint@qt.io> Reviewed-by: Richard Moe Gustavsen <richard.gustavsen@qt.io> (cherry picked from commit 1e75dcf2518e37a7b83d006a4e002f972615b43b) Reviewed-by: Gabriel de Dietrich <gabriel.dedietrich@qt.io>
* Fix possible heap corruption in QXmlStreamAllan Sandfeld Jensen2018-08-181-1/+1
| | | | | | | | | | The value of 'tos' at the check might already be on the last element, so triggering stack expansion on the second last element is too late. Change-Id: Ib3ab2662d4d27a71effe9e988b9e172923af2908 Reviewed-by: Richard J. Moore <rich@kde.org> Reviewed-by: Thiago Macieira <thiago.macieira@intel.com> (cherry picked from commit 6256729a6da532079505edfe4c56a6ef29cd8ab8)
* Doc: Increase precision in description of convenience typedefsPaul Wicking2018-08-161-1/+1
| | | | | | | Task-number: QTBUG-53856 Change-Id: I57917bb311d1d93e0903f2b3e021cc4db0f0d05e Reviewed-by: Nico Vertriest <nico.vertriest@qt.io> (cherry picked from commit d2d59e77d5e16bc79ddfed37f4f29d1dcd9b92a7)
* Fix MSVC2017 compilation with enabled relaxed constexpr on 32-bit targetOlivier Goffart2018-08-151-4/+6
| | | | | | | | | | | | | | | | | | | | | | The problem is that qCountLeadingZeroBits is calling qPopulationCount which is only conditionally constexpr, so qCountLeadingZeroBits can only be marked constexpr if qPopulationCount is also. On MSVC2017 64bit this is not a problem because it uses builtins function in this case. (which is not constexpr, but it works because the compiler is not forced to diagnose the problem because of the "?:" operator. The error being fixed is: qalgorithms.h(847): error C3615: constexpr function 'qCountLeadingZeroBits' cannot result in a constant expression qalgorithms.h(858): note: failure was caused by call of undefined function or one not declared 'constexpr' qalgorithms.h(858): note: see usage of 'qPopulationCount' Task-number: QTBUG-67259 Change-Id: I65a3dfae12ca49394bec14ffefdd41a07fee1c32 Reviewed-by: Thiago Macieira <thiago.macieira@intel.com> (cherry picked from commit c59cb9809559f0aae6be8544cb2049e41f8040e9) Reviewed-by: Ville Voutilainen <ville.voutilainen@qt.io>
* Make QPalette::setBrush() check before detachingGabriel de Dietrich2018-08-142-15/+48
| | | | | | | | | | | | | Setting the same brush on the same group and role should not detach nor alter the result of QPalette::isCopyOf(). Task-number: QTBUG-56743 Change-Id: Ic2d0dd757d703b01e8c5d835a8c124b3317653f4 Reviewed-by: Friedemann Kleint <Friedemann.Kleint@qt.io> Reviewed-by: Andy Shaw <andy.shaw@qt.io> Reviewed-by: Richard Moe Gustavsen <richard.gustavsen@qt.io> (cherry picked from commit c564779c071b35fddb76f4e50afda4305b634651) Reviewed-by: Tor Arne Vestbø <tor.arne.vestbo@qt.io>
* Revert "Fix restoring geometry of dockwidget"R.J.V. Bertin2018-08-132-19/+2
| | | | | | | | | | | | | This reverts commit cbfb6bda1d1ce3e169db6a0deb9bd901076653e4. That fix for QTBUG-16252 should not have been applied to the 5.9 branch. It also introduced a regression (QTBUG-68939). Task-number: QTBUG-68939 Task-number: QTBUG-16252 Change-Id: I71732de739788337fcd46ed8ac4ecfef1ef6e239 Reviewed-by: André Hartmann <aha_1980@gmx.de> Reviewed-by: Olivier Goffart (Woboq GmbH) <ogoffart@woboq.com> Reviewed-by: Bastiaan Veelo <Bastiaan@SARC.nl>
* cocoa: Don’t trigger security dialog on dragMorten Johan Sørvig2018-08-081-1/+5
| | | | | | | | | | macOS 10.14+ will display an “Accessibility Access” security dialog if we generate mouse events, so don’t. Task-number: QTBUG-68830 Change-Id: If832ca3cd49ec6bdad1a8188feab884b6562e9d2 Reviewed-by: Tor Arne Vestbø <tor.arne.vestbo@qt.io> (cherry picked from commit cd08753d3e2ac02663ba0ab588d7d926f7438475)