Commit Graph

51029 Commits

Author SHA1 Message Date
Volker Hilsheimer
fa3b672f99 Mark variables that might be unused under some configurations
Silence compiler warnings.

Pick-to: 6.1
Change-Id: I857cf2ee177eecf305e4fa14f6b69b019ce85468
Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
2021-04-11 19:53:43 +02:00
Volker Hilsheimer
65e3dc5eac Fix warnings about lossy double/float conversion in tests
QVectorND, QQuaternion, and QColor all operate on floats rather than
qreal or double, so explicit use float literals in the tests.

Pick-to: 6.1
Change-Id: If12cc12ddd9cd8219f3d78bf24e1400921e26c2b
Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
2021-04-11 19:53:32 +02:00
Niclas Rosenvik
7266bd459e Fix GLX on non-linux X11 systems
Some parts of the GLX code is only enabled for Linux. This makes
builds on other X11 supported platforms break when GLX is found.
To fix this enable these parts of the code when Qt feature
xcb-glx-plugin is enabled. xcb-glx-plugin has to be made public
in order for QT_CONFIG(xcb_glx_plugin) to work correctly in
these parts of the code.

Change-Id: I6bf78b6a64787ed88c8e2fae40675244c9198c37
Reviewed-by: Laszlo Agocs <laszlo.agocs@qt.io>
Reviewed-by: Liang Qi <liang.qi@qt.io>
2021-04-11 12:49:04 +00:00
Mike Achtelik
67c3f3f4ff Android: Bump gradle (plugin) versions
Android Gradle plugin 4.1.3 is compatible with the new <queries>
declaration for package visibility on Android 11. If someone adds the
<queries> element or starts relying on a library or SDK that supports
targeting Android 11, they might encounter manifest merging errors when
building the app.

This is important since starting August 2021 the PlayStore requires new
apps from targeting Android 11. So lets update to the newest
Android Gradle plugin version.

This also reverts 1e4dec12d5 as AGP 4.1
requires at least buildToolsVersion 29.0.2.

Change-Id: Id8ce5dadeb8a325dc9f901503946f325f3fd18a0
Reviewed-by: Lars Schmertmann <lars.schmertmann@governikus.de>
Reviewed-by: BogDan Vatra <bogdan@kdab.com>
2021-04-10 14:08:07 +02:00
Qt CI Bot
922fbfd2ba Merge integration refs/builds/qtci/dev/1617996746 2021-04-09 21:23:22 +00:00
Niclas Rosenvik
1b7f1aad40 Fix generating mimedatabase with generate.pl using make
When building using make and having set QT_AVOID_CMAKE_ARCHIVING_API
to ON the build breaks with the message "sh: cannot create
.rcc/qmimeprovider_database.cpp: directory nonexistent" .
ninja creates this directory automatically, make does not.
Add a file MAKE_DIRECTORY cmake command to make sure the .rcc directory
is created.

Change-Id: I140279a794753436d427d647ab2231636827d07f
Reviewed-by: Alexandru Croitor <alexandru.croitor@qt.io>
2021-04-09 19:30:57 +00:00
Thiago Macieira
183df80b9c QCoreApplication: improve docs on exit() and quit() thread-safety
Reporter of QTBUG-91771 was confused.

Pick-to: 6.1
Change-Id: I26b8286f61534f88b649fffd166c4368167a5638
Reviewed-by: Lars Knoll <lars.knoll@qt.io>
2021-04-09 18:10:00 +00:00
Thiago Macieira
2e6c37fe51 QCoreApplication::exit: make it a slot
The documentation even refers to it as such. Instead of refactoring the
documentation to explain that it isn't, just make it a slot.

[ChangeLog][QtCore][QCoreApplication] exit() is now a slot, like quit().

Pick-to: 6.1
Change-Id: I26b8286f61534f88b649fffd166c43afbb80927f
Reviewed-by: Lars Knoll <lars.knoll@qt.io>
2021-04-09 11:10:00 -07:00
Allan Sandfeld Jensen
c2348e2c7a Fix futexNeedsWake() on 64-bit systems
It was mistaking semaphore values over 0 as waiters, regardless of
actual waiters.

Pick-to: 6.1
Change-Id: Icebd01592ca8bdc1687a29dc569e3b630a262606
Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
2021-04-09 17:58:15 +02:00
Eirik Aavitsland
f3a042c5ab Fix read-only pseudo-state in QPlainTextEdit stylesheet
Was implemented for the other text edit widgets, but not for
QPlainTextEdit.

Pick-to: 6.1 6.0 5.15
Fixes: QTBUG-92490
Change-Id: Idd2a1b5c743fc030d3f2d4dd24e98f806b58f4d9
Reviewed-by: Volker Hilsheimer <volker.hilsheimer@qt.io>
2021-04-09 09:44:21 +02:00
Qt CI Bot
d74261b594 Merge integration refs/builds/qtci/dev/1617904724 2021-04-08 21:14:09 +00:00
Qt CI Bot
f35bf993ce Merge integration refs/builds/qtci/dev/1617895155 2021-04-08 20:33:13 +00:00
Qt CI Bot
4e9f6abd62 Merge integration refs/builds/qtci/dev/1617891528 2021-04-08 19:49:42 +00:00
Qt CI Bot
7d37ce8832 Merge integration refs/builds/qtci/dev/1617887904 2021-04-08 18:53:33 +00:00
Alexander Volkov
9667ac1c2d Call statx() with AT_NO_AUTOMOUNT
Otherwise it can be very slow in some cases (e.g. 0.5 sec).
Besides, AT_NO_AUTOMOUNT is used by {l,f}stat() internally.

Pick-to: 6.1 6.0 5.15
Change-Id: Iae9c8b46dcdc96d21ac6b114a51c382b4949d3dd
Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
2021-04-08 17:57:36 +00:00
Qt CI Bot
33edff40e4 Merge integration refs/builds/qtci/dev/1617884275 2021-04-08 17:03:20 +00:00
Qt CI Bot
9690e7bdd3 Merge integration refs/builds/qtci/dev/1617880670 2021-04-08 16:21:16 +00:00
Niclas Rosenvik
7d3434f970 Fix environ build break on FreeBSD
QMAKE_LFLAGS_NOUNDEF = <EMPTY> for FreeBSD did not get converted
to CMakeLists.txt. This breaks the build on FreeBSD since environ
is missing from libc, it is available at runtime.
Turn -Wl,-no-undefined into warnings on FreeBSD to fix the build.
Also add a comment based on the one from corelib.pro .

Change-Id: I3835884a2682af0f68a4d65dede3e4e5d4104ac8
Reviewed-by: Alexandru Croitor <alexandru.croitor@qt.io>
2021-04-08 15:17:28 +00:00
Alexey Edelev
bbe26a7667 Skip adding externally added plugins to the plugin meta-sets
Plugin meta-sets are not visible outside of the module build tree, so
there is no point in adding dependencies for externally added plugins.

Change-Id: Ica5b29b57c032f4fc9b128172aaa806392e9e581
Reviewed-by: Alexandru Croitor <alexandru.croitor@qt.io>
2021-04-08 16:15:54 +02:00
Qt CI Bot
5c969aeab1 Merge integration refs/builds/qtci/dev/1617874569 2021-04-08 14:15:53 +00:00
Andy Shaw
f64201c493 Set QGuiApplicationPrivate variables after platform window is destroyed
By setting these variables after the platform window has been destroyed,
it will enable any platform specific code to handle changes in terms of
focus and so on before the destruction of the window changes these
directly. For example, this will prevent a problem with iOS where it
keeps track of the current focus object as the signal indicating that
the change to focus will still be emitted. This is before the variable
is set to nullptr if there is no parent window.

Change-Id: Ie540c10760d06dc62e163ccf6f6edea200b43bbf
Reviewed-by: Tor Arne Vestbø <tor.arne.vestbo@qt.io>
2021-04-08 14:27:57 +02:00
Qt CI Bot
f27b914e79 Merge integration refs/builds/qtci/dev/1617870959 2021-04-08 12:27:56 +00:00
Mårten Nordheim
d32b93afb3 tst_qsslkey: Clean up #if-ery
It was more complex than needed in a few places.

Change-Id: I0609423f82420f72c65637cf398ccd7694ee85e5
Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org>
Reviewed-by: Timur Pocheptsov <timur.pocheptsov@qt.io>
2021-04-08 12:42:26 +01:00
Alexey Edelev
70464b355e Specify QT_TESTCASE_BUILDDIR for Qt::Test users implicitly
QT_TESTCASE_BUILDDIR was implicitly defined by Qt::Test target for
library users in Qt5. By default, this definition will point to
CMAKE_CURRENT_BINARY_DIR. This logic works similarly to qmake logic.

From user's perspective it might be useful to not rely on standard
search paths, but specify own. This can be done by setting the
QT_TESTCASE_BUILDDIR property for the user's target. CMake will
substute the value of the QT_TESTCASE_BUILDDIR property into the
QT_TESTCASE_BUILDDIR definition.

The implicit QT_TESTCASE_SOURCEDIR also seems to be useful. According
to the current logic, it points to CMAKE_CURRENT_SOURCE_DIR.

Fixes: QTBUG-92079
Change-Id: I8a9065f08e859c713b3c8cc08142a9ced0677770
Reviewed-by: Alexandru Croitor <alexandru.croitor@qt.io>
2021-04-08 13:16:41 +02:00
Qt CI Bot
1999e2adc1 Merge integration refs/builds/qtci/dev/1617867356 2021-04-08 10:10:06 +00:00
Alexey Edelev
4ed9402d7a Fix linking order of the resource objects
The generated object resource library depends on the Qt::Core library
because uses the functions defined in qresource.cpp. Dummy linking of
the Qt::Core to an object library has an effect only when the object
library is linked directly to the executable as a target. If we link
the object library as INTERFACE library we miss out all the objects
that need to be linked to the executable. This behavior is explained
here:

    https://bit.ly/3sFWKvI

Thus, the only option to link the object library objects to the
endpoint executable is to use TARGET_OBJECTS property in genex, as
it's already done. But that means we are losing all profits that
target actually has, especially linking the object library dependencies.

The combination of both of the above methods does the job. The only
thing that looks fragile so far is order. Currently, the order we
use in the target_link_library call applies to the linker command line.
This means the object library objects must always appear before the
object library target.

Change-Id: If1f0e35e0445d5e96a1f2249ab44114cd36630e9
Reviewed-by: Alexandru Croitor <alexandru.croitor@qt.io>
2021-04-08 11:29:29 +02:00
Joerg Bornemann
fd16c65b7e CI: Add WebAssembly to cross-compiling configs
Change-Id: Ic6fd236623c53ec691cf8c84bb1d385e9b1ac9d2
Reviewed-by: Alexandru Croitor <alexandru.croitor@qt.io>
Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org>
2021-04-08 10:12:37 +02:00
Volker Hilsheimer
2c2b349974 Don't judge other people's writing systems
Pick-to: 6.1 6.0 5.15
Change-Id: Ifb8265bad4c8c96c6b20f957c376cec47e28f666
Reviewed-by: Paul Wicking <paul.wicking@qt.io>
2021-04-08 08:48:43 +02:00
Milla Pohjanheimo
9224f8e99f Add binary compatibility files for Qt 6.0.0
Binary compatibility files added.

Pick-to: 6.0 6.1
Change-Id: I89fe7daae970af697ec57a414e3c90b24d4f9a86
Reviewed-by: Lars Knoll <lars.knoll@qt.io>
2021-04-08 06:34:13 +00:00
Qt CI Bot
1db8b0de0d Merge integration refs/builds/qtci/dev/1617829777 2021-04-07 23:25:09 +00:00
Qt CI Bot
e1cfbc10de Merge integration refs/builds/qtci/dev/1617826149 2021-04-07 22:23:53 +00:00
Fabio Falsini
ea4868c49d Add legacy external storage access flag
Since latest version of Qt need Android
target sdk 29 the qt direct storage access
doesn't work because a new scoped storage
access way has been introduced. This flag
allow to have current storage access
way to work again (but is limited to
target sdk 29 only)

Pick-to: 5.15 6.1
Fixes: QTBUG-92239
Change-Id: If0d0af7c171de4b3e8bb8dd9a88fd61b65d1c839
Reviewed-by: Assam Boudjelthia <assam.boudjelthia@qt.io>
2021-04-07 23:01:59 +02:00
Qt CI Bot
b187ce87f9 Merge integration refs/builds/qtci/dev/1617813097 2021-04-07 21:01:58 +00:00
Qt CI Bot
8d16237cfa Merge integration refs/builds/qtci/dev/1617809473 2021-04-07 20:33:35 +00:00
Robert Löhning
7473317b52 QTextHtmlParserNode: Limit colspan to avoid segfault
This fixes oss-fuzz issue 29758.

[ChangeLog][QtGui][Text] QTextDocument::setHtml: column spans are
limited to 20480, an arbitrarily high but reasonable value.


Fixes: QTBUG-92463
Pick-to: 5.15 6.0 6.1
Change-Id: Ib759e3e3ac0b0d0d483f8e8ce11002e079db3ace
Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
2021-04-07 20:07:56 +00:00
Qt CI Bot
72ae064886 Merge integration refs/builds/qtci/dev/1617805866 2021-04-07 19:55:22 +00:00
Qt CI Bot
5712853061 Merge integration refs/builds/qtci/dev/1617802255 2021-04-07 18:57:36 +00:00
Qt CI Bot
fecba62d32 Merge integration refs/builds/qtci/dev/1617798649 2021-04-07 16:50:55 +00:00
Andrey Butirsky
62e697fd56 fix Alt+` shortcut on non-US layouts
Make it possible for non-letter-keys with Latin 1 symbols (`, !, @ etc.)
to participate in shortcuts also, when the keys generate national
symbols on non-Latin layout.
For example, in Russian layout, "`" key generates cyrillic "ё" letter of
national alphabet, so shortcuts with the key should still work
regardless of the actual layout.

Fixes: QTBUG-90611
Change-Id: Id9a505210ff33a94b82511b88c30ef79f3d03913
Reviewed-by: Shawn Rutledge <shawn.rutledge@qt.io>
2021-04-07 16:15:19 +00:00
Alexey Edelev
cbdce59cd2 Add the SIMULATE_IN_SOURCE argument to _qt_internal_test_expect_pass
test_QFINDTESTDATA builds the project in the source tree, this is
necessary because the test requires relative paths to the source file
names. This function could be useful for other tests, so it makes sense
to extend the _qt_internal_test_expect_pass/fail macros to support
build in the source tree.
Note that, the SIMULATE_IN_SOURCE argument doesn't build the test in
the existing source tree, but copies source files to the build tree
first to do not litter the source directory.

Change-Id: I16e790d74be2a0c5ca0593e0f88580dbe09882b9
Reviewed-by: Alexandru Croitor <alexandru.croitor@qt.io>
2021-04-07 17:56:57 +02:00
Thiago Macieira
89a0ed1009 Allow qrandom_p.h to be included by more than one .cpp in QtCore
I thought we could use C++17 inline variables, but those can't be used
across DLL boundaries:

 qrandom_p.h:75:48: error: definition of 'QBasicAtomicInteger<unsigned int> qt_randomdevice_control' is marked 'dllimport'

Change-Id: Id2983978ad544ff79911fffd1671f857587ef2fb
Reviewed-by: Giuseppe D'Angelo <giuseppe.dangelo@kdab.com>
2021-04-07 08:36:03 -07:00
Nikolay Avtomonov
3f0858ed10 Explicitly set output files for qtpreprocess
This fixes build error with XCode 10.
XCode 10 build system (a.k.a "New Build System") requires all the files
that are generated by scripts and used later on build to be explicitly
defined as output files.

Task-number: QTBUG-71035
Pick-to: 6.0 6.1 5.15 5.12
Change-Id: Ibec39eee53b0cb3acecf592f1ca53c04b9975cad
Reviewed-by: Tor Arne Vestbø <tor.arne.vestbo@qt.io>
2021-04-07 17:14:37 +02:00
Alexey Edelev
72d1393c1d Fix condition that adds resources for each Android ABI
If we already have the list of Android ABI in BUILDS, it's not
necessary to generate extra resource while Qt build.

Amends: 58556afb69

Pick-to: 6.0
Pick-to: 6.1
Pick-to: 5.15
Fixes: QTBUG-88031
Change-Id: I344efe6c477461659a360281da59c4abeae18fc2
Reviewed-by: Alexandru Croitor <alexandru.croitor@qt.io>
2021-04-07 17:00:17 +02:00
Qt CI Bot
30d5e13768 Merge integration refs/builds/qtci/dev/1617794981 2021-04-07 15:00:15 +00:00
Qt CI Bot
969cb830ca Merge integration refs/builds/qtci/dev/1617791373 2021-04-07 14:46:43 +00:00
Christoph Keller
9c24ad3b94 Only embed launch screen when building an app
Xcode's new build system checks duplicated entries when building. Qmake wants to embed
the launch screen for all types of configurations (static libraries etc.) which makes Xcode bail
out with "Multiple commands produce LaunchScreen.storyboard".

Pick-to: 6.0 6.1 5.15 5.12
Task-number: QTBUG-71035
Change-Id: I5c028e687f16e046b12156c1a8a89540deba4d3b
Reviewed-by: Tor Arne Vestbø <tor.arne.vestbo@qt.io>
2021-04-07 13:32:17 +00:00
Sona Kurazyan
a4d1ed854d Do not notify about property changes if the value hasn't changed
After 2ffb91ac59 we manually call notify()
for QObjectCompatProperties. Currently we always call it when setting
values to compat properties, even if the value hasn't actually changed.
Fixed to call notify() only if the value is being changed.

Task-number: QTBUG-85520
Change-Id: I385db84c4009c45406e204b96e0e37ce5fa8882b
Reviewed-by: Andreas Buhr <andreas.buhr@qt.io>
Reviewed-by: Fabian Kosmale <fabian.kosmale@qt.io>
2021-04-07 14:51:04 +02:00
Edward Welbourne
0c9fc20e7f Avoid attempting to parse insanely long texts as zone names
There are limits on zone name length and the trial-and-error approach
we're more or less forced to take to parsing gets horribly expensive
if applied to every prefix of a very long string. So apply a loosened
version of the zone-name validity rule that limits the length of the
fragments between slashes and limit the number of such fragments.

Fixes: QTBUG-92275
Pick-to: 6.1 6.0 5.15
Change-Id: I83052b1b6888728c81135db22a9c6298ae439375
Reviewed-by: Robert Löhning <robert.loehning@qt.io>
Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
2021-04-07 14:51:04 +02:00
Qt CI Bot
89bdd09670 Merge integration refs/builds/qtci/dev/1617784151 2021-04-07 12:51:02 +00:00
Lars Knoll
df54a5d087 Add QRhiTexture::RG16 format
Those are needed to handle 16bit YUV formats in Qt Multimedia.

Change-Id: I39c67bf4fcf558487b7819ea38e578f99c12a3ed
Reviewed-by: Laszlo Agocs <laszlo.agocs@qt.io>
2021-04-07 14:29:23 +02:00