summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* QSsl: Remove enum value gapsMårten Nordheim2020-09-291-2/+2
| | | | | | | | These value gaps were there for binary compatibility, but we don't need those in Qt 6. Change-Id: I72a40d601b61f90e14562578e88493b0d54ff398 Reviewed-by: Timur Pocheptsov <timur.pocheptsov@qt.io>
* Docs: Update default redirect policy enumerationMårten Nordheim2020-09-291-3/+4
| | | | | Change-Id: Ia72151cc0fbcb325572e7b623ef9a4b3236d797f Reviewed-by: Timur Pocheptsov <timur.pocheptsov@qt.io>
* QPrinter: fix unit tests for special case when no printer is defaultAndreas Buhr2020-09-291-1/+7
| | | | | | | | | | | | | The unit tests of QPrinter assume that a printer which is default- initialized is the same printer as the default printer. However, when no printer is set to default, this is not the case. When no printer is the default printer, a default-initialized QPrinter will be the first printer found. This patch adapts the unit tests to work also when no printer is the default printer, even though printers are available. Change-Id: I4967e5b1c4fb8a7c33c911184289ec5cd283fc58 Reviewed-by: Volker Hilsheimer <volker.hilsheimer@qt.io>
* tests/xcb: fix tst_QWidget::updateWhileMinimized() - againLiang Qi2020-09-291-1/+2
| | | | | | | | | | | This amends 4403ec3bc1501cde454b0546759d4c27f9b6cb1b. CentOS 8.1 uses GNOME in XDG_CURRENT_DESKTOP. Pick-to: 5.15 Task-number: QTBUG-68862 Change-Id: Ia9a6f7f4c47853fc53d9860dad070109271a438e Reviewed-by: Tony Sarajärvi <tony.sarajarvi@qt.io>
* Blacklist QTcpSocket::connectToHostErrors in Windows 10 buildsTony Sarajärvi2020-09-291-1/+2
| | | | | | Task-number: QTBUG-87009 Change-Id: I63c1bcb77a359cea82f2831b02f1e29b46060a66 Reviewed-by: Timur Pocheptsov <timur.pocheptsov@qt.io>
* Doc: Qt GUI: Depend on qtprintsupport documentation moduleTopi Reinio2020-09-291-0/+1
| | | | | | | | | | This adds 'Inherited by:' links to print support classes deriving from Qt GUI types. Pick-to: 5.15 Task-number: QTBUG-77126 Change-Id: I84ecee5df8cae0635d42653b1483db6b3c6074ee Reviewed-by: Paul Wicking <paul.wicking@qt.io>
* doc: Make QtCore depend on all modulesMartin Smith2020-09-291-1/+3
| | | | | | | | | | | | | | | Class QObject is the most widely used base class in Qt. It is inherited by a great many Qt classes.This update sets the depends variable in qtcore.qdocconf to '*' so that QDoc will load all the index files for all of Qt, when it generates the documentation for QtCore. In particular, this will ensure that the "Inherited By" list for class QObject will show all the Qt classes that inherit QObject. Pick-to: 5.15 Task-number: QTBUG-77126 Change-Id: I5f38400ccc798ec34e2ee80472f1fe9bb7b1877d Reviewed-by: Paul Wicking <paul.wicking@qt.io>
* Add checks for new QBitArray versionAllan Sandfeld Jensen2020-09-291-46/+57
| | | | | | | Add a few checks for the new longer length. Change-Id: I642a64b91361d236457e7a89a02feb812b4e1cf8 Reviewed-by: Lars Knoll <lars.knoll@qt.io>
* Switch QBitArray to qsizetypeAllan Sandfeld Jensen2020-09-294-96/+97
| | | | | | | To make it consistent with other containers in Qt6. Change-Id: I5578845390248baf80daa282237b706857e57661 Reviewed-by: Lars Knoll <lars.knoll@qt.io>
* Switch QCache costs to qsizetypeAllan Sandfeld Jensen2020-09-292-24/+24
| | | | | | | | Since size is already qsizetype and costs is multipla of size, it seems costs should be qsizetype as well. Change-Id: Iae85baaba5842460358e369a666fef6ebb7e52b4 Reviewed-by: Lars Knoll <lars.knoll@qt.io>
* Blacklist tst_QUdpSocket::writeDatagramToNonExistingPeerHeikki Halmet2020-09-291-4/+1
| | | | | | | | | | | tst_QUdpSocket::writeDatagramToNonExistingPeer is also failing with MinGW Task-number: QTBUG-74542 Task-number: QTBUG-80328 Change-Id: I44b886a1fc1eac34deefc34690c6701063a49d8f Reviewed-by: Friedemann Kleint <Friedemann.Kleint@qt.io> Reviewed-by: Mårten Nordheim <marten.nordheim@qt.io>
* make {QString,QByteArray}::squeeze() work without prior reserve()Oswald Buddenhagen2020-09-282-3/+3
| | | | | | | | | | | | | string-shortening operations never throw away capacity (unless detaching), so it may very much make sense to squeeze a string whose capacity was not explicitly reserved. this does in fact restore the behavior prior to commit a3aa2fcf, which changed it presumably only due to not considering the case above. Change-Id: I0d7919a1724dd3ecc6cd4cbd7236eb52067f0a1c Reviewed-by: Andrei Golubev <andrei.golubev@qt.io> Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@gmx.de>
* QCocoaDrag - set image only on the first drag itemTimur Pocheptsov2020-09-281-2/+7
| | | | | | | | This image is already a combined image of all urls that we drag. Pick-to: 5.15 Change-Id: I8fe45f64a6022881320d100f8a6f4a25fcac73b9 Reviewed-by: Tor Arne Vestbø <tor.arne.vestbo@qt.io>
* CMake: make QT_ANDROID_DEPLOYMENT_SETTINGS_FILE consistent with qmakeAssam Boudjelthia2020-09-283-4/+4
| | | | | | | | | Make name format of QT_ANDROID_DEPLOYMENT_SETTINGS_FILE consistent with qmake, that is android-${target}-deployment-settings.json. Task-number: QTCREATORBUG-24678 Change-Id: I2bdb056cf7a82fd83aaf658f3a405a0c9ef05756 Reviewed-by: Alexandru Croitor <alexandru.croitor@qt.io>
* CMake: Generate *AdditionalTargetInfo.cmake for toolsJoerg Bornemann2020-09-283-1/+9
| | | | | | | | | | This ensures that we have the configuration-independent IMPORTED_* properties set on tools. Fixes: QTBUG-86893 Change-Id: I2b772c21341e6e4631379d4a5a99580ec96909ed Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org> Reviewed-by: Alexandru Croitor <alexandru.croitor@qt.io>
* CMake: Write proper *AdditionalTargetInfo file in debug-only buildJoerg Bornemann2020-09-281-25/+29
| | | | | | | | | | To provide the IMPORTED_LOCATION target property we must write the *AdditionalTargetInfo.cmake file for all debug-only builds, not only the ones containing a release configuration. Task-number: QTBUG-86893 Change-Id: I9ecd01483660f434a3f1ea12fa2af756cdcf9932 Reviewed-by: Alexandru Croitor <alexandru.croitor@qt.io>
* Fix compiler warnings from QKeyCombinationLars Knoll2020-09-2813-64/+73
| | | | | | | | Change lots of code to avoid the deprecated operator+() or implicit casts to int. Change-Id: I0c343cd5b28603afdf1214eefb85e928313345e2 Reviewed-by: Volker Hilsheimer <volker.hilsheimer@qt.io>
* QSslConfiguration::setAllowedNextProtocol - remove the old signatureTimur Pocheptsov2020-09-282-8/+0
| | | | | Change-Id: I0b4b18e6ea2b78917220e77865fd92eb7a684179 Reviewed-by: Mårten Nordheim <marten.nordheim@qt.io>
* Fix QtConcurrent algorithms to work with temporary sequencesSona Kurazyan2020-09-285-26/+127
| | | | | | | | | | | | | | | | QtConcurrent algorithms are making an internal copy of the passed sequence, to make sure it won't be destroyed before the execution is finished. However, they were using iterators of the originally passed sequence. So, if the original sequence is deleted, QtConcurrent algorithms would use invalid iterators to a deleted sequence. This might work with Qt containers thanks to implicit-sharing, but with other containers will lead to unexpected results. Fixed them to work on the internal copy of the original sequence. Change-Id: I1d68692ed9746223c85f51bb05977bc1443b681d Reviewed-by: Andreas Buhr <andreas.buhr@qt.io> Reviewed-by: Mårten Nordheim <marten.nordheim@qt.io> Reviewed-by: Karsten Heimrich <karsten.heimrich@qt.io>
* Don't guess UTC when we can't find a system zone nameEdward Welbourne2020-09-283-16/+25
| | | | | | | | | | | | | | | | | | | | | | | | | If we're able to load a system zone without knowing its name, we shouldn't claim that its name is UTC. Instead, use the system zone information's name for the zone. Let the backend return an empty string if it can't determine the system zone ID, provided it has some way to get system zone info despite not knowing its name. This can happen on Windows if the system zone is one of Microsoft's idiosyncratic names that we don't recognize; or on Linux if /etc/timezone is a copy of a zoneinfo file, instead of a symlink. In support of that, handle empty ID as a request for system zone info, so that the backend constructors taking an IANA ID never get passed an empty ID; that gets routed to the default constructor instead. This incidentally restores QTzTimeZonePrivate's behavior, for empty ID, of reading the content of /etc/timezone if we are unable to determine the name of its zone any other way. Fixes: QTBUG-86306 Pick-to: 5.15 5.15.1 Change-Id: Iad57c18199124f651ebc3d32c3deffca6eaab512 Reviewed-by: Mårten Nordheim <marten.nordheim@qt.io>
* CMake: FindGLIB2 to include gthread2 sub-libraryJulien Schueller2020-09-281-2/+10
| | | | | | | | Avoids undefined references to g_thread_init. Fixes: QTBUG-86727 Change-Id: Ic41b0dab9e4e23083faf4e9abcf7acc517172e49 Reviewed-by: Alexandru Croitor <alexandru.croitor@qt.io>
* By default don't try to use pkg-config when targeting AndroidAlexandru Croitor2020-09-283-3/+3
| | | | | | | | | | It causes issues in our Windows CI, because the strawberry perl pkg-config is found. And even that one is unusable, due to a bug in CMake which is tracked at https://gitlab.kitware.com/cmake/cmake/-/issues/21239 Change-Id: I58816195d35459e8a44c923399c35a4956c222a2 Reviewed-by: Simon Hausmann <hausmann@gmail.com>
* CMake: Regenerate configure.cmake filesAlexandru Croitor2020-09-283-1/+5
| | | | | Change-Id: I165c633d7c052fb80419d4b2c57561de40217ade Reviewed-by: Joerg Bornemann <joerg.bornemann@qt.io>
* CMake: Allow finding Qt CMake packages in additional locationsAlexandru Croitor2020-09-283-4/+35
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | By default, when using the Qt6 CMake package to look for components, the find_package() calls for the components use NO_DEFAULT_PATH to ensure that CMake doesn't accidentally find system (distro) packages. Instead we limit the paths to one level up from where the Qt6 package is. Unfortunately that doesn't quite work for finding Qt packages that might have been installed into a different prefix than where the main Qt prefix is. This happens when Qt addons are built by Conan, and installed into a separate prefix. To allow calls like find_package(Qt6 COMPONENTS ConanAddon) to work in a scenario as described above, introduce a new variable called QT_ADDITIONAL_PACKAGES_PREFIX_PATH which can be used to specify additional paths where Qt CMake packages should be found. This is similar to previously introduced QT_EXAMPLES_CMAKE_PREFIX_PATH variable which was meant for a similar case, but only for examples. Additionally, allow disabling the NO_DEFAULT_PATH option by setting the QT_DISABLE_NO_DEFAULT_PATH_IN_QT_PACKAGES cache variable to TRUE. This would allow regular usage of CMAKE_PREFIX_PATH to work, at the risk that system Qt CMake packages might be found. Augments 5cd4001bf2a7f0894c6ac269860e833b02df6cde and ffe088941378e32ea30c142cca7e63c537a41ff1. Fixes: QTBUG-86882 Change-Id: Ia8e060cbba6d2a10c3d63d81892f2c71e4236a9a Reviewed-by: Joerg Bornemann <joerg.bornemann@qt.io> Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org>
* Prevent endless markDirtyAndNotifyObservers <-> notify loopFabian Kosmale2020-09-283-2/+49
| | | | | | | | | | | | Before we had the option of eager evaluation, we were able to use the dirty flag to detect whether we are recursing. However, eager properties will lead to a evaluateIfDirtyAndReturnTrueIfValueChanged call, and that in turn will clear the dirty flag. Introduce a new member to detect that situation, and set the bindings error state to BindingLoop if we detect that kind of loop. Change-Id: If40b93221848bd9e9422502318d992fad95b0b74 Reviewed-by: Lars Knoll <lars.knoll@qt.io>
* Fix documentation for QStringListVolker Hilsheimer2020-09-281-0/+15
| | | | | | | | | | | Explicitly declare members in qdoc runs that are otherwise inherited from QListSpecialMethods. Note: Due to a bug in syncqt, those members need to be added in a separate #ifdef Q_QDOC section. Change-Id: I96850f3665359de4f97be1b8d10f8052ba252fab Reviewed-by: Paul Wicking <paul.wicking@qt.io>
* Read test specific configure arguments from environmentToni Saario2020-09-283-0/+18
| | | | | | | | | | Reading configure arguments for tests from environment allows control of CMake args from outside of the module itself. TEST_CONFIGURE_ARGS is read and appended to host tests build and TARGET_TEST_CONFIGURE_ARGS respectively for target's tests. Change-Id: I8270b0254525aec24f7614cba2b90b291e5eb3d2 Reviewed-by: Alexandru Croitor <alexandru.croitor@qt.io>
* Fix qdoc warnings: supportedCiphers is a member of QSslConfigurationVolker Hilsheimer2020-09-281-7/+7
| | | | | | | ... not of QSslSocket. Change-Id: I9db5debe6a0aaa6a780b0047ae3f551ec3770fb4 Reviewed-by: Timur Pocheptsov <timur.pocheptsov@qt.io>
* Fix qdoc warnings: remove docs for inherited/implicit membersVolker Hilsheimer2020-09-281-23/+0
| | | | | Change-Id: I8654dbc3c0d1b86690f805cc1282e581dbcc5c55 Reviewed-by: Paul Wicking <paul.wicking@qt.io>
* Fix some qdoc warnings from QStaticPluginVolker Hilsheimer2020-09-281-28/+25
| | | | | | | | | | | | | | Move all the documentation for that class into one place, and remove rawMetaData documentation and references; it is a private variable, and shouldn't be documented. The instance member is a function pointer type variable, but should be treated as a member function. Even with a Q_QDOC ifdef'ery we can't fix that warning (we would get a lot of new warnings instead), so leave that as is for now. Change-Id: I951aaafad8dca5ed2533ace69931f002eb97996a Reviewed-by: Paul Wicking <paul.wicking@qt.io>
* Fix qdoc warnings from Q(Latin1)StringVolker Hilsheimer2020-09-281-101/+5
| | | | | | | | | | | | | arg() is now a variadic template, already documented in qstringview.cpp, so document that and remove the documentation for the removed overloads. QString has no member subString, so remove that as well. Fix return type in QLatin1String member function documentation. Change-Id: I32e7bcba770bcee77ae4a07c06ac61228ffa93a6 Reviewed-by: Paul Wicking <paul.wicking@qt.io>
* Fix some qdoc warnings from QHash and QMultiHashVolker Hilsheimer2020-09-281-21/+8
| | | | | | | | | | | | | | It's no longer possible to decrement an iterator, and the class uses qsizetype, not int for sizes. Fix incorrect function prototypes in the documentation, and remove documentation for functions/overloads that don't exist. QMultiHash doesn't have Java style iterators (not a new issue in Qt 6), so remove the references to QMultiHashIterator. Change-Id: I149b4620963f2087f3f66bb70a9c97b292a35378 Reviewed-by: Paul Wicking <paul.wicking@qt.io>
* Fix qdoc warning: button(s) are members of QSinglePointEventVolker Hilsheimer2020-09-271-25/+0
| | | | | | | ... and documented there already. Change-Id: Ie66362d3b668caf93b100befef08bc91ae8add2f Reviewed-by: Shawn Rutledge <shawn.rutledge@qt.io>
* qtabletevent/regular_widget manual test: Add a toggle for WinTabFriedemann Kleint2020-09-273-12/+56
| | | | | | Task-number: QTBUG-83218 Change-Id: I179f53c051c92dbb86fbac710d4a514c4e5d3c49 Reviewed-by: Shawn Rutledge <shawn.rutledge@qt.io>
* Simplify the preamble of QDateTimeEditPrivate::stepBy()Edward Welbourne2020-09-271-11/+3
| | | | | | | | Repetition and needless complexity: eleven lines rewritten in three. Change-Id: I1dadbbc5329b18d3e25f38f73b69abd2d7aac30d Reviewed-by: Mitch Curtis <mitch.curtis@qt.io> Reviewed-by: Andrei Golubev <andrei.golubev@qt.io>
* QCalendar: use LGPL like everything else, not GPLEdward Welbourne2020-09-271-5/+15
| | | | | | | | Pointed out by Lars. Change-Id: Idb8427d77b35c84eb3037703957cf7f93ea5f387 Reviewed-by: Volker Hilsheimer <volker.hilsheimer@qt.io> Reviewed-by: Lars Knoll <lars.knoll@qt.io>
* Use WAYLAND_DISPLAY and DISPLAY instead of XDG_SESSION_TYPEJohan Klokkhammer Helsing2020-09-271-18/+35
| | | | | | | | | | | | | | | | XDG_SESSION_TYPE is a non-standard part of systemd, and not set if you run a compositor from the command line, for instance. [ChangeLog][Wayland] XDG_SESSION_TYPE is no longer used to determine which platform plugin to use. Instead, if WAYLAND_DISPLAY is set in the environment, wayland is used. Similarly, if DISPLAY is set, xcb is used. If both are detected, wayland will be attempted first, then xcb. Gnome-shell is still skipped for automatic wayland detection. Fixes: QTBUG-75732 Change-Id: Ieed123330662dc29eafa31148a9b99ba0810de90 Reviewed-by: Paul Olav Tvete <paul.tvete@qt.io>
* Remove QNX/Blackberry-related qpps* files from corelib/kernel/Edward Welbourne2020-09-269-1788/+0
| | | | | | | | | They appear to be no longer in use. Task-number: QTBUG-85700 Change-Id: Id4c134b99372ccb26eead2a033d99196778c418e Reviewed-by: Alex Blasche <alexander.blasche@qt.io> Reviewed-by: Allan Sandfeld Jensen <allan.jensen@qt.io>
* Windows Vista/XP Styles: Clean up some codeFriedemann Kleint2020-09-265-67/+10
| | | | | | | | | Remove public constructor of QWindowsXPStyle since it cannot be instantiated via style factory since 5.0. Remove overridden functions that merely call the base implementation. Change-Id: I3b2998115c4ab65fabf3744874bc3a69a1f5e5b0 Reviewed-by: Volker Hilsheimer <volker.hilsheimer@qt.io>
* Fix compilation of some manual testsFriedemann Kleint2020-09-2613-28/+29
| | | | | | | | | - qtabletevent/device_information - dialogs - windowflags Change-Id: Id3e4b2aec2a873b00dcda39fb1227b24832181ca Reviewed-by: Shawn Rutledge <shawn.rutledge@qt.io>
* Preserve formats in QImage::scaled()Allan Sandfeld Jensen2020-09-262-12/+78
| | | | | | | | | Do not always use the smoothScaled routine, the normal routines are also optimized, and do not convert to alpha formats when not necessary. Task-number: QTBUG-49719 Change-Id: I6ee9b620cc259472c419e7363357f41ce29b594a Reviewed-by: Eirik Aavitsland <eirik.aavitsland@qt.io>
* CMake: use ANDROID_SDK_ROOT instead of ANDROID_SDK consistentlyAssam Boudjelthia2020-09-261-1/+1
| | | | | | | | Make the use of ANDROID_SDK_ROOT consistent. Task-number: QTCREATORBUG-24678 Change-Id: If967bdc4d252996098fa210cf38429fe075eacb1 Reviewed-by: Alexandru Croitor <alexandru.croitor@qt.io>
* Android: allow Android app building to use java 8 featuresAssam Boudjelthia2020-09-261-0/+5
| | | | | | | | | | Enable Gradle builds to use Java 8 features like lambda expression by default. Task-number: QTBUG-86282 Pick-to: 5.15 Change-Id: Ib497b8a789690fcca6e13ea4995e5966331c6c0d Reviewed-by: Andy Shaw <andy.shaw@qt.io>
* Don't error out when configuring Qt on a headless systemVolker Hilsheimer2020-09-261-3/+5
| | | | | | | | | | | | | | | | | Configuring and building Qt should not require a running dbus session bus. However, when building the html_docs target on a headless system, qmake bails out with error if dbus is linked in, while only showing a warning if it's not. This is unnecessary. We can warn in both cases, build the tests with dbus linked in. Running the tests will fail if there is no session bus, ie. tst_QDBusConnection_Delayed::delayedMessages fails with QVERIFY(session.isConnected); Pick-to: 5.15 Change-Id: Ia6b6e226398e87880449b003d28dfd76553bee2c Reviewed-by: Paul Wicking <paul.wicking@qt.io> Reviewed-by: Topi Reiniö <topi.reinio@qt.io>
* Fix qdoc warnings from references to removed APIsVolker Hilsheimer2020-09-262-2/+1
| | | | | Change-Id: Id41052be0878715eda4879fcd3171a30ddd5a9a7 Reviewed-by: Topi Reiniö <topi.reinio@qt.io>
* Fix qdoc warnings in QStringViewVolker Hilsheimer2020-09-261-3/+3
| | | | | | | Fix prototype of template member function, and fix see-also reference. Change-Id: Ibb39925063dfeb3fd511f47a1606a0b243d4c2ef Reviewed-by: Topi Reiniö <topi.reinio@qt.io>
* Fix qdoc warning from QMetaObjectVolker Hilsheimer2020-09-261-1/+1
| | | | | | | It's QMetaObject::isWritable, not isReadOnly. Change-Id: I47a0b07a1969740f67c081dade3720890077361e Reviewed-by: Topi Reiniö <topi.reinio@qt.io>
* Fix qdoc warning: QTextBoundaryFinderVolker Hilsheimer2020-09-261-1/+1
| | | | | Change-Id: Iec38f33519f05b046d6995d6f7eef1557fd5f209 Reviewed-by: Topi Reiniö <topi.reinio@qt.io>
* Fix qdoc warnings: QTextStream manipulators are in the Qt namespaceVolker Hilsheimer2020-09-261-4/+4
| | | | | Change-Id: I55c0c6454e27e0a002021a73f6c1cf8d8ed4d6af Reviewed-by: Topi Reiniö <topi.reinio@qt.io>
* Fix some qdoc warnings for QString/View/TokenizerVolker Hilsheimer2020-09-264-39/+62
| | | | | | | | | | | | | | | | | Use correct member function prototype, which requires the template declaration. Remove see-alsos that don't exist. Document parameters for qTokenize. Still lots of warnings from QStringTokenizer, due to the inheritance structure of that template class and the declarations of nested types in undocumented base classes. Also, qdoc doesn't seem to recognize training this-lvalue/this-rvalue declarations for overloads, and considers the second toContainer documentations to override the first. Change-Id: Iadf967d3328ddda52b6f66786836853bddeda79b Reviewed-by: Topi Reiniö <topi.reinio@qt.io>
generated by cgit v1.2.3 (git 2.25.1) at 2024-05-08 11:06:05 +0000