summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Make qdecompresshelper archive bomb check only trigger for large filesØystein Heskestad2021-03-054-0/+50
| | | | | | | | | | | | This is to avoid false positives. By default files are large if uncompressed size > 10 MB. Only configurable internally. Also add auto tests. Task-number: QTBUG-91392 Pick-to: 6.0 6.1 Change-Id: I32258cb7c957f2a23a05157ba4ed5c0af2ba585e Reviewed-by: Mårten Nordheim <marten.nordheim@qt.io> Reviewed-by: Edward Welbourne <edward.welbourne@qt.io>
* Merge "tst_qdtlscookie: use a proper 'enterLoopMSecs' instead of 'enterLoop'"Timur Pocheptsov2021-03-051-1/+1
|\
| * tst_qdtlscookie: use a proper 'enterLoopMSecs' instead of 'enterLoop'Timur Pocheptsov2021-03-051-1/+1
| | | | | | | | | | | | | | | | | | It's a bit weird to calculate timeout in milliseconds and then pass it as number of seconds ... Pick-to: 6.1 5.15 Change-Id: I1127163ea06e49ac1b53eea6f60ee8590319bfa1 Reviewed-by: Mårten Nordheim <marten.nordheim@qt.io>
* | Merge "Skip globalstatic threadStressTest on QEMU"Toni Saario2021-03-059-14/+101
|\ \ | |/ |/|
| * Skip globalstatic threadStressTest on QEMUToni Saario2021-03-052-0/+6
| | | | | | | | | | | | | | | | | | | | | | | | The test causes frequent failures in the CI. This is the most subtle fix until it is properly fixed. Pick-to: 6.1 Task-number: QTBUG-91423 Change-Id: I6499378dcd3ed1c31275db38d83b572e764366cc Reviewed-by: Friedemann Kleint <Friedemann.Kleint@qt.io> Reviewed-by: Edward Welbourne <edward.welbourne@qt.io> Reviewed-by: Samuli Piippo <samuli.piippo@qt.io>
| * Android: Place cursor correctly on screen when editingPiotr Mikolajczyk2021-03-057-14/+95
| | | | | | | | | | | | | | | | | | | | | | | | When editing text the cursor is not placed correctly. So this has been achieved by tricking Android into thinking that the input area is only the line where the cursor is, so it is forced to keep it on screen. Fixes: QTBUG-91073 Pick-to: 5.15 Change-Id: Icc2e8315deb76ca1a84819d3fdceaa7b027b1174 Reviewed-by: Ville Voutilainen <ville.voutilainen@qt.io>
* | QContiguousCache: Remove redundant conditionWang Yu2021-03-051-3/+1
|/ | | | | | | | The reverse condition was already checked three lines before. Pick-to: 6.1 Change-Id: I2f78262004871ec2f3730e2a25f26fe22636cde7 Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
* Merge "Add QColorSpace::description"Allan Sandfeld Jensen2021-03-056-3/+57
|\
| * Add QColorSpace::descriptionAllan Sandfeld Jensen2021-03-046-3/+57
| | | | | | | | | | | | | | | | | | A way to read the description of the profile from ICC, or set one yourself. Change-Id: I68622e30ee209cac99c41f3df934712c3548c0de Reviewed-by: Friedemann Kleint <Friedemann.Kleint@qt.io> Reviewed-by: Eirik Aavitsland <eirik.aavitsland@qt.io>
* | Merge "QMenu test: turn tooltip animations off"Volker Hilsheimer2021-03-052-0/+3
|\ \
| * | QMenu test: turn tooltip animations offVolker Hilsheimer2021-03-041-0/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | QTBUG_89082_actionTipsHide() is very flaky if tooltips fade in, as the mouse move might happen while the tooltip is still appearing. Fixes: QTBUG-91532 Pick-to: 6.1 6.0 5.15 Change-Id: I55305927fcf143d99dfff28d0bc70b2e831a139a Reviewed-by: Oliver Wolff <oliver.wolff@qt.io>
| * | Fix Android buildJoerg Bornemann2021-03-041-0/+1
| |/ | | | | | | | | | | | | | | The Android build failed, because the namespace QNativeInterface could not be found. Include the header file where it's defined. Change-Id: If53eda4d4d4e6d5e66787d74c714215721ba0b60 Reviewed-by: Assam Boudjelthia <assam.boudjelthia@qt.io>
* | Merge "Protect against self-assignment, plug potential memory leak"Volker Hilsheimer2021-03-041-0/+4
|\ \ | |/ |/|
| * Protect against self-assignment, plug potential memory leakVolker Hilsheimer2021-03-041-0/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | Fixes static analyzer warning f03d95823e9f1395d64501cc111f0f63 As a drive-by, plug the potential memory leak if the assigned-to QDockAreaLayoutItem already holds a QDockAreaLayoutInfo object. The subinfo is deleted in the destructor, QDockAreaLayoutItem has ownership for the subinfo. Pick-to: 6.1 Change-Id: I8546adc6fb0537078eea9dfb45d1bd9967d8d149 Reviewed-by: Allan Sandfeld Jensen <allan.jensen@qt.io>
* | Merge "Doc: Use correct include for QWGLContext"Paul Wicking2021-03-041-1/+1
|\ \
| * | Doc: Use correct include for QWGLContextPaul Wicking2021-03-041-1/+1
| |/ | | | | | | | | | | | | Pick-to: 6.1 6.0 Task-number: QTBUG-91500 Change-Id: If487a2d14dd61d127dc35aa039f9b71915128da1 Reviewed-by: Tor Arne Vestbø <tor.arne.vestbo@qt.io>
* / QProcess/Unix: use a common function to find the target executableThiago Macieira2021-03-041-48/+39
|/ | | | | | | | | | | | | This harmonizes the execution between start() and startDetached(). Both did QStandardDirs::findExecutable(), but duplicated code. However, only start() supported launching .app bundles on Mac. [ChangeLog][QtCore][QProcess] startDetached() now supports launching .app executable bundles on macOS / iOS systems, like start() already did. Change-Id: Ic90d8429a0eb4837971dfffd1664f776b2c0edfd Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@gmx.de>
* Merge "Fix build of Core module without regularexpression feature"Alexey Edelev2021-03-0411-26/+16
|\
| * Fix build of Core module without regularexpression featureAlexey Edelev2021-03-048-22/+8
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | qregularexpression.h requires FEATURE_regularexpression to be enabled. Add a condition to the 'qt_pch.h' header to fix the build when PCH are enabled and FEATURE_regularexpression is disabled. It seems that the filter implementation of QSortFilterProxyModel has QRegularExpression as its base. It's necessary to make sortfilterproxymodel dependent on the regularexpression feature. Fix the precompiler condition for the extractSections function in the QString implementation. Use the same precompiler condition for the QString::section and extractSections functions, since QString::section depends on extractSections. Change-Id: I5b775e0842a0aa1a8d47f8dded376bdfcf63b5bf Reviewed-by: Joerg Bornemann <joerg.bornemann@qt.io>
| * Fix QT_HOST_LIBEXECS for cross-builds on WindowsJoerg Bornemann2021-03-041-0/+4
| | | | | | | | | | | | | | | | | | | | Like for LibraryExecutables, we must default to "bin" on Windows for HostLibraryExecutables in our generated qconfig.cpp. Pick-to: 6.1 Fixes: QTBUG-91496 Change-Id: Ib5a4b3b3fd6192bd953e615058b482e67ad19462 Reviewed-by: Cristian Adam <cristian.adam@qt.io>
| * Complete the renaming of qt_add_tool to qt_internal_add_toolJoerg Bornemann2021-03-041-3/+3
| | | | | | | | | | | | | | | | | | | | Fix the name in the function's doc comment and error messages. Pick-to: 6.1 Change-Id: I918db802a0dbb0508f65d227f7c896d2ad0beeae Reviewed-by: Alexey Edelev <alexey.edelev@qt.io> Reviewed-by: Craig Scott <craig.scott@qt.io> Reviewed-by: Cristian Adam <cristian.adam@qt.io>
| * Fix double inclusion of QtAutoDetect.cmake in top-level buildJoerg Bornemann2021-03-041-1/+1
| | | | | | | | | | | | | | | | | | | | The variable we need to check is called QT_SUPERBUILD, not QT_SUPER_BUILD. Pick-to: 6.1 6.0 Change-Id: I8487f491a0a4cebdf08f579519e99e6afe3db8c2 Reviewed-by: Alexey Edelev <alexey.edelev@qt.io> Reviewed-by: Cristian Adam <cristian.adam@qt.io>
* | Merge "Remove win32_system_libs feature from src/corelib/configure.json"Joerg Bornemann2021-03-0414-275/+78
|\ \
| * | Remove win32_system_libs feature from src/corelib/configure.jsonJoerg Bornemann2021-03-043-72/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This feature only existed to trigger the evaluation of the libs gdi32, kernel32 and friends. Those libs only were relevant for the qmake build of Qt and can be removed now. Task-number: QTBUG-83932 Change-Id: Idfd4d8f70b6dbd1067412fecc1115b504b1ad347 Reviewed-by: Alexey Edelev <alexey.edelev@qt.io> Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org> Reviewed-by: Kai Koehne <kai.koehne@qt.io>
| * | Move syncqt.pl to libexecJoerg Bornemann2021-03-043-6/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | To not disturb the qmake build we kept syncqt.pl in <src>/bin but installed it to libexec. This is not necessary anymore. This also removes the need for having syncqt.pl in both, bin and libexec in the build dir of qtbase. Pick-to: 6.1 Fixes: QTBUG-91076 Change-Id: I44b014ea41e3f00c420e02fd5c76f11169340b8c Reviewed-by: Kai Koehne <kai.koehne@qt.io>
| * | Remove fixqt4headers.plJoerg Bornemann2021-03-041-179/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This script was aiding users to port from Qt 4 to 5 and is considered to be of little value for Qt 6. Pick-to: 6.1 Change-Id: I26fb97d32969463d94e38222e32f241f86ad9193 Reviewed-by: Samuel Gaist <samuel.gaist@idiap.ch> Reviewed-by: Kai Koehne <kai.koehne@qt.io> Reviewed-by: Edward Welbourne <edward.welbourne@qt.io> Reviewed-by: Lars Knoll <lars.knoll@qt.io>
| * | Make toolchain inspection more robustJoerg Bornemann2021-03-042-4/+48
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | QtAutoDetect.cmake did read the (possibly detected) toolchain file and looked for the string "The Android Open Source Project" to deduce that we want to build for Android. This has been done, because we're autodetecting the platform before the first project comment, i.e. before the toolchain file is loaded. This magic string detection is a bit fragile, and we need a similar approach for WebAssembly. A more robust approach would be to fetch the value of CMAKE_SYSTEM_NAME from the toolchain file without actually loading it. Now, we run a CMake script that includes the toolchain file and prints variables were interested in. The calling code reads these variables and stores them in prefixed variables in the current scope. Change-Id: Ide9ea3054e1453d17129523e1ec86ecaed55af2a Reviewed-by: Craig Scott <craig.scott@qt.io> Reviewed-by: Cristian Adam <cristian.adam@qt.io>
| * | Add the 'FEATURE_qmake' featureAlexey Edelev2021-03-043-14/+18
| | | | | | | | | | | | | | | | | | | | | | | | Add a conditional build of the qmake. Task-number: QTBUG-89369 Change-Id: I8d7968ffb20ea31df2f85fff055e0d131ed06a36 Reviewed-by: Joerg Bornemann <joerg.bornemann@qt.io>
| * | Improve docs for Qt Concurrent run with promise modeSona Kurazyan2021-03-041-0/+9
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | For the readers that are new to QtConcurrent, it may be confusing that unlike the normal usage of QPromise, they don't have to call start() or finish() when using Qt Concurrent run with promise mode. Be more explicit about that. Pick-to: 6.1 Change-Id: I08df6c4ca41bec4120e208a6643ee20c7adf265c Reviewed-by: Jarek Kobus <jaroslaw.kobus@qt.io> Reviewed-by: Leena Miettinen <riitta-leena.miettinen@qt.io>
| * | Blacklist test QMenu::QTBUG_89082_actionTipsHide() for WindowsFriedemann Kleint2021-03-041-0/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Apparently, ba139603925453bf79994eca48b566d8f15b2af0 is not sufficient. Amends 3f3d5e6716d9130776b3613ccbd5595de7d4af8d. Pick-to: 6.0 6.1 5.15 Task-number: QTBUG-89082 Change-Id: I80a00abb330bebd3be8667762c279c2eef595c7f Reviewed-by: Oliver Wolff <oliver.wolff@qt.io>
* | | Merge "headersclean: Compile with -std=c++latest, -Zc:__cplusplus on MSVC"Kai Köhne2021-03-0412-279/+750
|\ \ \ | |_|/ |/| |
| * | headersclean: Compile with -std=c++latest, -Zc:__cplusplus on MSVCKai Köhne2021-03-041-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | c++latest does check that our headers also work with upcoming C++20 support in MSVC. It also implicitly sets -permissive-, which checks for stricter standards compliance. Pick-to: 6.1 Task-number: QTBUG-91117 Change-Id: Iaf1547191969213d570a1b2f59888ad04a7977ab Reviewed-by: Joerg Bornemann <joerg.bornemann@qt.io>
| * | Convert QDtls classes to the new plugin-based designTimur Pocheptsov2021-03-0411-278/+749
| |/ | | | | | | | | | | | | | | | | | | | | | | | | Essentially, the same code re-shuffled and placed behind the new interfaces. Fixes: QTBUG-91174 Task-number: QTBUG-65922 Change-Id: I8f14697f10713f9738c5c7805aed0150c084850c Reviewed-by: Edward Welbourne <edward.welbourne@qt.io> Reviewed-by: Mårten Nordheim <marten.nordheim@qt.io> (cherry picked from commit 6c835796c8ea2590008900ffb5f4bf0d902ee73d) Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
* | Merge "Fix signature of canDropMimeData used in code snippet"Albert Astals Cid2021-03-0428-152/+237
|\ \
| * | Fix signature of canDropMimeData used in code snippetAlbert Astals Cid2021-03-042-2/+2
| | | | | | | | | | | | | | | Change-Id: I9026e11630651e740282466551ad78883a0421ec Reviewed-by: Fabian Kosmale <fabian.kosmale@qt.io>
| * | Update bundled libjpeg-turbo to version 2.0.6Eirik Aavitsland2021-03-0426-150/+235
| |/ | | | | | | | | | | | | | | [ChangeLog][Third-Party Code] libjpeg-turbo was updated to version 2.0.6 Pick-to: 6.1 6.0 5.15 5.12 Change-Id: I3e308d241853edf3c1d616955cda203220a258d8 Reviewed-by: Liang Qi <liang.qi@qt.io>
* | Merge "Fix compilation error in QDateTime"Andrei Golubev2021-03-041-1/+3
|\ \ | |/ |/|
| * Fix compilation error in QDateTimeAndrei Golubev2021-03-041-1/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | One of the changes done in 902505a0584959fed9d0784ab5308f9d70fe68a9 results in a compilation error: somehow an expression "int * enum value (with underlying type qint64)" has result type "long int" and thus the compiler cannot find matching add_overflow Return the qint64 cast back to overcome this Compiler: gcc 7.5.0-3ubuntu1~18.04 Change-Id: Iaca882762e812bef69ec325df5f59e02082a0130 Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
* | QScopedPointer: deprecate swapGiuseppe D'Angelo2021-03-042-1/+21
|/ | | | | | | | | | | | | | | | | | | | | | | | | Follow up of 612a01be6513894ab1ec5a36b699a2142ba7f35c (deprecating QSP::take()): for the same reasons, swap() functions do not belong to QScopedPointer, or they would allow the pointer to escape: QScopedPointer a; { QScopedPointer b = ~~~; qSwap(a, b); } // b's pointer escaped its scope Deprecate them as well. [ChangeLog][QtCore][QScopedPointer] QScopedPointer swapping functions have been deprecated, as they would allow the managed pointer to escape the scope. If you need those semantics, use std::unique_ptr instead. Change-Id: I2b0938b62f2ef5a3561f61f595a3fb4c505a8f08 Reviewed-by: Allan Sandfeld Jensen <allan.jensen@qt.io> Reviewed-by: Volker Hilsheimer <volker.hilsheimer@qt.io>
* Redundant condition: tornoffZou Ya2021-03-041-1/+1
| | | | | | | | | | Redundant condition: tornoff. '!tornoff || (tornoff && scroll)' is equivalent to '!tornoff || scroll' Pick-to: 6.1 Change-Id: I8339faa4d53360db280173ee489e48eba4883b70 Reviewed-by: Edward Welbourne <edward.welbourne@qt.io>
* Redundant condition: widgetHuang Jie2021-03-041-1/+1
| | | | | | | | | Redundant condition: widget. '!widget || (widget && widget->isEnabled())' is equivalent to '!widget || widget->isEnabled()' Pick-to: 6.1 Change-Id: Ife915bd5ea66f8ccff48a1612f8c78c263075c89 Reviewed-by: Giuseppe D'Angelo <giuseppe.dangelo@kdab.com>
* Variable is Assigned a never used value in qt_make_filter_list()Huang Jie2021-03-041-11/+4
| | | | | | | | | Variable 'i' is assigned a value that is never used in qt_make_filter_list() Pick-to: 6.1 Change-Id: Id845ecb5231b97a899443bdcb9f49cccb7f20bea Reviewed-by: Volker Hilsheimer <volker.hilsheimer@qt.io> Reviewed-by: Edward Welbourne <edward.welbourne@qt.io>
* QHostInfo: simplify assignment operatorVolker Hilsheimer2021-03-031-4/+5
| | | | | | | | | | | | | | The d_ptr is never nullptr. If it could be, then other's d_ptr could also be nullptr, and we would dereference the null pointer. Guarding against self-assignment is nevertheless a good practice. Fixes static analyzer warning 5fc3780532e30c6350a0aa1ad2188a4c. Pick-to: 6.1 Change-Id: I07ff808e4c4f5bf07b4d6663f1fb4a3301a0fec7 Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
* QMetaType::create: don't leak memory if copy can't be madeVolker Hilsheimer2021-03-031-1/+1
| | | | | | | | | | | | | | | | | | | | QMetaType::construct will return nullptr if a copy is requested but if there is no copy constructor. In that case, the memory allocated in QMetaType::create will be leaked. This case is covered in the unit tests in template<> void testCreateHelper<QMetaType::Void>() so we can't assert in construct that a copy constructor is present if a copy is requested. Fixes static analyzer warning 618b1e6877f737df57c39fd35ad91cd4. Pick-to: 6.1 Change-Id: Ic439b36b1f120b9d0f888efaeab2801d8acc13de Reviewed-by: Fabian Kosmale <fabian.kosmale@qt.io>
* Merge "Port some value classes away from QScopedPointer"Giuseppe D'Angelo2021-03-035-70/+55
|\
| * Port some value classes away from QScopedPointerGiuseppe D'Angelo2021-03-035-70/+55
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | In preparation for deprecation of QScopedPointer::swap, port to other established solutions: * QPainterPath was basically a QExplicitlySharedDataPointer re-engineered around a QScopedPointer. Just use the right class for the job... * QBrush is in a similar situation, although its deleter is more complex; port to unique_ptr for that one to minimize the code impact. Change-Id: I7f7c1dd8702f84f5146043347af64dda3c7e6f09 Reviewed-by: Edward Welbourne <edward.welbourne@qt.io> Reviewed-by: Allan Sandfeld Jensen <allan.jensen@qt.io>
* | Initialize out-variableVolker Hilsheimer2021-03-031-1/+1
|/ | | | | | | | | | | QMetaType::convert does have code paths where nothing is written to the 'to' out-variable. Those code paths shouldn't run in this particular case, but it's good practice to initialize out-variables anyway. Fixes static analyzer warning 1453920f5abe1e30471eca6aa01d22d1. Change-Id: I6f6d1044759866c405e61cb51147ca0490c4f3a4 Reviewed-by: Fabian Kosmale <fabian.kosmale@qt.io>
* Merge "Convert elliptic curves and DH params to work with QTlsBackend"Timur Pocheptsov2021-03-0316-399/+381
|\
| * Convert elliptic curves and DH params to work with QTlsBackendTimur Pocheptsov2021-03-0313-396/+372
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The corresponding API is becoming a part of QTlsBackend interface, since it's too minimalistic and does not require additional interfaces, unlike certificates or keys. Fixes: QTBUG-91177 Fixes: QTBUG-91175 Task-number: QTBUG-65922 Change-Id: I44dd0adbdf2427962451998664efe234d59fae24 Reviewed-by: Edward Welbourne <edward.welbourne@qt.io> Reviewed-by: Mårten Nordheim <marten.nordheim@qt.io> (cherry picked from commit cdf4976b5a01bc5b65aed746acc9cc7f87b0fd97) Reviewed-by: Timur Pocheptsov <timur.pocheptsov@qt.io>
| * Doc: Specify correct include for QWGLContextPaul Wicking2021-03-031-0/+1
| | | | | | | | | | | | | | Pick-to: 6.1 6.0 Fixes: QTBUG-91500 Change-Id: Ie842c9e911fe5492cc13aeba459d28d6553438fd Reviewed-by: Topi Reiniö <topi.reinio@qt.io>
generated by cgit v1.2.3 (git 2.25.1) at 2024-06-09 01:22:04 +0000