Commit Graph

51278 Commits

Author SHA1 Message Date
Tasuku Suzuki
f87a541e26 Fix build without features.highdpi
Add four template functions missing in stub.

Change-Id: I7ca126f866a76efc26167340ff2e35a60775078b
Reviewed-by: Volker Hilsheimer <volker.hilsheimer@qt.io>
2021-04-14 02:20:07 +09:00
Qt CI Bot
e8c1cd5d88 Merge integration refs/builds/qtci/dev/1618321030 2021-04-13 17:09:35 +00:00
Qt CI Bot
7ce274d95d Merge integration refs/builds/qtci/dev/1618317407 2021-04-13 16:09:24 +00:00
Allan Sandfeld Jensen
a7fabe2328 Light cleanup in QSemaphore Futex implementation
Gets rid of a goto, fixes overflow detection with wakeAll set,
and fixes 64-bit futex mode with futexHasWaiterCount = false.

Change-Id: I8bb98118013fc1dc2a8a405845bec0cb3350494f
Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
2021-04-13 17:41:39 +02:00
Marianne Yrjänä
9c6721c106 Add QNX qpa to builds
Task-number: QTBUG-91234
Pick-to: 6.1 6.1.0
Change-Id: I978aff101ce29d2df74ced801911426ccd56e997
Reviewed-by: Rami Potinkara <rami.potinkara@qt.io>
Reviewed-by: James McDonnell <jmcdonnell@blackberry.com>
2021-04-13 16:18:53 +03:00
Tasuku Suzuki
d84bf703b5 Fix build without features.menu
Change-Id: If7947839b8da5abc8ee84aace60cc7de7a053e04
Pick-to: 6.0 6.1
Reviewed-by: Volker Hilsheimer <volker.hilsheimer@qt.io>
2021-04-13 12:51:02 +00:00
Qt CI Bot
385e242ba9 Merge integration refs/builds/qtci/dev/1618310175 2021-04-13 12:50:59 +00:00
Sona Kurazyan
726330c9c0 QAbstractAnimation: initialize the private members while declaring them
Change-Id: I5de0510d06b7d8e10c3cb0d4f23fb7991b8d6c51
Reviewed-by: Ivan Solovev <ivan.solovev@qt.io>
Reviewed-by: Andreas Buhr <andreas.buhr@qt.io>
Reviewed-by: Edward Welbourne <edward.welbourne@qt.io>
2021-04-13 13:47:46 +02:00
Qt CI Bot
2c5a35f6ed Merge integration refs/builds/qtci/dev/1618306545 2021-04-13 11:46:39 +00:00
Eskil Abrahamsen Blomfeldt
cd9bbcd97a Adapt to Harfbuzz 2.8.0 update
The Unicode 13 language tags are available since Harfbuzz
2.6.7.

For compilation with earlier versions, also update the
hardcoded tags to match the ones in Harfbuzz (and in
iso-15924):

https://unicode.org/iso15924/iso15924-codes.html

Task-number: QTBUG-90217
Change-Id: I4e2cfdf61a5c4189b8aac51644c9d80c816aeebc
Reviewed-by: Lars Knoll <lars.knoll@qt.io>
(cherry picked from commit 910ac477f013f2af690b66f1ac41d65ab7527843)
Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
2021-04-13 10:02:02 +00:00
Qt CI Bot
7fe1114dc7 Merge integration refs/builds/qtci/dev/1618299310 2021-04-13 09:45:54 +00:00
Volker Hilsheimer
742ecf83e5 Silence qdoc warnings
These are internal APIs, so silence qdoc which seems to get confused
by the missing CALLBACK annotation in the implementation.

Change-Id: Iddd9f87257843cc3d43597fe7e6c103aa5e1a646
Reviewed-by: Paul Wicking <paul.wicking@qt.io>
Reviewed-by: Nico Vertriest <nico.vertriest@qt.io>
2021-04-13 10:49:02 +02:00
Volker Hilsheimer
ae3d4b8f6b Fix qdoc warnings from new QLockFile members
Change-Id: I06210fe37a3d90a958064fff48331a34bced2a8b
Reviewed-by: Paul Wicking <paul.wicking@qt.io>
Reviewed-by: Nico Vertriest <nico.vertriest@qt.io>
2021-04-13 10:48:50 +02:00
Volker Hilsheimer
f6651d54df Fix qdoc warning
QPixmap doesn't have a devicePixelSize() method, but
deviceIndependentSize is a relevant method here.

Change-Id: Ie71e6cc88534792a896ea17ec37b1b9737c2f986
Reviewed-by: Paul Wicking <paul.wicking@qt.io>
Reviewed-by: Nico Vertriest <nico.vertriest@qt.io>
2021-04-13 10:48:45 +02:00
Volker Hilsheimer
3206840b0e Fix qdoc warning, \function is not a command
Document the size parameter while at it, and rephrase a bit.

This introduces a new qdoc warning since QtLiteral is a new
namespace without any documentation, but that's for a separate
commit.

Change-Id: I849d5cdde8b64dbbe7e6a526214d422930091cd4
Reviewed-by: Paul Wicking <paul.wicking@qt.io>
Reviewed-by: Andrei Golubev <andrei.golubev@qt.io>
Reviewed-by: Nico Vertriest <nico.vertriest@qt.io>
2021-04-13 10:48:38 +02:00
Volker Hilsheimer
5b94f88747 Document parameter correctly, fix qdoc warning
Not needed in 6.1, the method is still (incorrectly) marked as \internal
there.

Change-Id: Idf1d924d8d320eca2388dbd28006eeaf9efedc3a
Reviewed-by: Paul Wicking <paul.wicking@qt.io>
Reviewed-by: Nico Vertriest <nico.vertriest@qt.io>
2021-04-13 10:48:08 +02:00
Volker Hilsheimer
2cc458abfb Document QLocalSocket::socketOptions as a property
Change-Id: Ifda55ac7afb3fb30d973a01104b012959ae285ab
Reviewed-by: Paul Wicking <paul.wicking@qt.io>
Reviewed-by: Nico Vertriest <nico.vertriest@qt.io>
2021-04-13 10:48:01 +02:00
Volker Hilsheimer
ace3d4f00e Document new InputMethodQuery enum value
This amends c80f262258.

Change-Id: Iec8a8f5ce50fdf0ba371a287f243186b2435e594
Reviewed-by: Liang Qi <liang.qi@qt.io>
Reviewed-by: Piotr Mikolajczyk <piotr.mikolajczyk@qt.io>
Reviewed-by: Paul Wicking <paul.wicking@qt.io>
2021-04-13 07:33:41 +00:00
Heikki Halmet
409443a376 Extend blacklisting of tst_gestures including all RHEL's
These are also failing in RHEL 8.2

Task-number: QTBUG-52523
Change-Id: I1448124376a2b415351d1a755043431050808e38
Reviewed-by: Jani Heikkinen <jani.heikkinen@qt.io>
2021-04-13 08:20:48 +03:00
Volker Hilsheimer
aab6d336f7 Fix qdoc warning, it's QThread::Priority
Change-Id: If3df55ff95f8bdb510bdc3578ba3c7c03b9029a1
Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
2021-04-12 23:53:01 +02:00
Volker Hilsheimer
2bdaf28034 Don't disable menu items that belong to the active modal window
A popup/context menu created via QQuickPlatformMenu doesn't belong to any
menubar, so by disabling items in a menu that doesn't belong to the currently
active menubar (5b9f6862b1), we disabled all menu items in a QQuickPlatformMenu
when a modal window was active.

For such unrooted menus, use the QCocoaMenuObject data structure to record
which window it is shown for, and only disable items if that window is not
also the current modal window.

Amends 5b9f6862b1.

Fixes: QTBUG-92040
Pick-to: 6.1 6.0 5.15
Change-Id: I56b6d579e5e94689b43ca84d4637e35dc2cbeb4c
Reviewed-by: Tor Arne Vestbø <tor.arne.vestbo@qt.io>
2021-04-12 19:30:12 +00:00
Qt CI Bot
fc0255ddc9 Merge integration refs/builds/qtci/dev/1618248052 2021-04-12 19:28:28 +00:00
Qt CI Bot
a91728b4e8 Merge integration refs/builds/qtci/dev/1618240808 2021-04-12 18:06:39 +00:00
Robert Löhning
c62a193ca3 Fuzzing: Simplify figuring out the failing datetime format
Task-number: QTBUG-92275
Change-Id: I732e72e614163b536c3fa9187011c57fea639b92
Reviewed-by: Edward Welbourne <edward.welbourne@qt.io>
2021-04-12 19:08:07 +02:00
Qt CI Bot
e5d8e2ae6e Merge integration refs/builds/qtci/dev/1618233601 2021-04-12 17:08:06 +00:00
Volker Hilsheimer
3fa778142a Silence qdoc warning from deprecated enum value
The mis-spelled value doesn't need documentation.

Pick-to: 6.1
Change-Id: I709abdca1d515902b3a12d3c5a5b62809d1f9a8b
Reviewed-by: Volker Hilsheimer <volker.hilsheimer@qt.io>
2021-04-12 15:19:41 +00:00
Alexey Edelev
fcb766f588 Add test of the static plugin with resources
The test follows up the discussion about tests related to the static
plugin resources:

https://codereview.qt-project.org/c/qt/qtbase/+/341203/6/tests/auto/other/init_resources_static_plugin/CMakeLists.txt#1

It emulates the static plugin that contains resource files. Since the
test already exposed few issues related to the resource object linking
it makes sense to have it in test set.

Change-Id: I62621c2db1eae6ae5842ba52035774a662d93423
Reviewed-by: Alexandru Croitor <alexandru.croitor@qt.io>
2021-04-12 17:19:41 +02:00
Mårten Nordheim
b1fe3e3d80 QNetworkInformation: Private the destructor
It wasn't meant to be public.

Pick-to: 6.1 6.1.0
Change-Id: Ifa7fff48f82b96bdfa277677d3988dc8881b8c2a
Reviewed-by: Volker Hilsheimer <volker.hilsheimer@qt.io>
2021-04-12 17:19:41 +02:00
Qt CI Bot
6a17a8ba84 Merge integration refs/builds/qtci/dev/1618228407 2021-04-12 15:19:40 +00:00
Qt CI Bot
6d624ab01a Merge integration refs/builds/qtci/dev/1618224780 2021-04-12 13:55:09 +00:00
Mårten Nordheim
b67fe6dc7d QNetworkInformation: Remove the default argument
And the code for loading whatever backend is sorted first.
Though, looking at the code it would've never returned 'true' anyway.

Pick-to: 6.1 6.1.0
Change-Id: I7bc2c740e8cb5343e5843cb1d65715d236b92a25
Reviewed-by: Volker Hilsheimer <volker.hilsheimer@qt.io>
2021-04-12 15:18:45 +02:00
Qt CI Bot
ffd13e19a9 Merge integration refs/builds/qtci/dev/1618221163 2021-04-12 12:44:05 +00:00
Mårten Nordheim
5a60657363 QNetworkInformation: make supports(...) not virtual
Pick-to: 6.1 6.1.0
Change-Id: Ib8d27410e6baa495a7351a57c8c1c1b30a64eb26
Reviewed-by: Giuseppe D'Angelo <giuseppe.dangelo@kdab.com>
Reviewed-by: Volker Hilsheimer <volker.hilsheimer@qt.io>
2021-04-12 13:21:17 +02:00
Qt CI Bot
b690632323 Merge integration refs/builds/qtci/dev/1618217560 2021-04-12 11:21:16 +00:00
Mårten Nordheim
bb85831e4d QtFuture::connect: disconnect signals first
During reportFinished we may call a continuation which might end up
triggering one of the signals.

Pick-to: 6.0 6.1
Change-Id: I19546fcca12be71cd536e4287eb5eddd9d236830
Reviewed-by: Sona Kurazyan <sona.kurazyan@qt.io>
Reviewed-by: Fabian Kosmale <fabian.kosmale@qt.io>
2021-04-12 12:37:40 +02:00
Mårten Nordheim
b86176abf6 QtConcurrentIterateKernel: fix warning
src\concurrent\qtconcurrentiteratekernel.cpp(134): warning C5055: operator '*': deprecated between enumerations and floating-point types

Pick-to: 6.0 6.1
Change-Id: I934e767e77e9393e1da3adc390dc8e252e7f5b6a
Reviewed-by: Jarek Kobus <jaroslaw.kobus@qt.io>
Reviewed-by: Sona Kurazyan <sona.kurazyan@qt.io>
2021-04-12 10:31:54 +00:00
Alexey Edelev
8194f79053 Use bracket-based escaping for all list arguments in a configure string
The 'list(TRANSFORM cmake_args REPLACE "\\[\\[;\\]\\]" "\\\\;")' call
breaks the list arguments added when evaluating the 'INPUT_' values.
Therefore, it's necessary to apply bracket-based escaping to all list
arguments instead of the standard escaping.

Amends 856fadf85c

Fixes: QTBUG-92459
Change-Id: Ifd4e0ca5f549a1c7fab9ceb587ed355250c4e677
Reviewed-by: Alexandru Croitor <alexandru.croitor@qt.io>
2021-04-12 12:05:59 +02:00
Albert Astals Cid
17db162949 doc: Fix typo
Pick-to: 6.1
Change-Id: Ia4219d06e306b2abd2ac0977cac63ce0492c6397
Reviewed-by: Mårten Nordheim <marten.nordheim@qt.io>
2021-04-12 09:57:59 +00:00
Alexandru Croitor
c1ac201f5c CMake: Fix condition evaluation in plugin's DEFAULT_IF option
Expand the condition without an extra negation.

This fixes incorrect condition evaluation for conditions not enclosed
in parenthesis.

Pick-to: 6.1
Change-Id: I4923059b6b199676058091c23d51c9368daaebd0
Reviewed-by: Craig Scott <craig.scott@qt.io>
Reviewed-by: Alexandru Croitor <alexandru.croitor@qt.io>
2021-04-12 11:40:44 +02:00
Alexandru Croitor
b6dd5d7c3b CMake: Fix auto-importing of plugins in static Qt qmake projects
Previously the plugin .pri files that CMake generated for qmake
consumption contained an '-' to exclude the plugin from
auto-importing only if the plugin type was generic or a platform
plugin.

Now that plugin projects that should be excluded have a proper
 DEFAULT_IF FALSE
clause, we can simply query for the defaultness of the plugin
to know whether to exclude it in the generated .pri file.

This fixes an issue with Qt static builds and qtvirtualkeyboard.

The vkb plugin was not excluded and thus any simple QtGui app
linked to the vkb plugin in a static qmake project. This led to linker
issues because the vkb plugin also depends on a vkb quick plugin which
is not listed as a dependency.

Augments 76230d9879
Amends c975c35eae

Pick-to: 6.1 6.1.0
Fixes: QTBUG-92529
Task-number: QTBUG-87861
Change-Id: I9671f6504374cf0799289bbe19110e01c129402e
Reviewed-by: Alexey Edelev <alexey.edelev@qt.io>
Reviewed-by: Alexandru Croitor <alexandru.croitor@qt.io>
2021-04-12 11:40:41 +02:00
Alexandru Croitor
ededf39142 CMake: Fix duplicate symbol errors in Windows static super builds
qt_internal_add_executable has some special logic to link static
plugins in order to avoid issues with link cycles on exported
Qt module targets. This logic does not take into account if a plugin
is a default plugin.

On windows this caused duplicate symbol linking issues in static super
builds, because both qwindows and qdirect2d define a subset of
the same symbols.

Make sure to only link to default static plugins.

This will skip linking to qdirect2d because it's not a default qpa
plugin and thus avoid linker issues.

Amends 5807e1ae81

Pick-to: 6.1 6.1.0
Fixes: QTBUG-92451
Change-Id: I56df2ce0201625088417de53038642518c1d3bbd
Reviewed-by: Alexey Edelev <alexey.edelev@qt.io>
Reviewed-by: Craig Scott <craig.scott@qt.io>
Reviewed-by: Alexandru Croitor <alexandru.croitor@qt.io>
2021-04-12 11:40:39 +02:00
Christoph Keller
8115219407 Explicitly set input files for qtpreprocess
This fixes build errors with Xcode 10.
Xcode 10 build system (a.k.a "New Build System") needs to know the input files
in order to build a correct dependency graph. Especially when a build is not run
for the first time and files changed in-between.

Task-number: QTBUG-71035
Pick-to: 6.0 6.1 5.15 5.12
Change-Id: If8fbad3a1915add9b35c79131b03cdbe6b7ac06d
Reviewed-by: Tor Arne Vestbø <tor.arne.vestbo@qt.io>
2021-04-12 11:36:32 +02:00
Volker Hilsheimer
019f35524d Fix compiler warning on platforms without QRhiNativeHandles
Pick-to: 6.1
Change-Id: I61254290853cadf3b1edf6e7b0f82bba9e8d2efe
Reviewed-by: Laszlo Agocs <laszlo.agocs@qt.io>
2021-04-12 10:41:50 +02:00
Alexandru Croitor
6e378b6efd coin: Simplify build conditions and allow WebAssembly non-qtbase repos
Rather than using multiple layers of negation, we can just specify a
list of allowed configs.

Allow cross-building other repos when targeting WebAssembly.

Be explicit about not building Android tests for repos other than
qtbase (until that is not longer desired).
Currently the qt5 platform configuration only has qtbase marked
with the AndroidTestRun feature.

Amends fd16c65b7e
Amends 13c460d0ff
Superseeds 60a5b7be03f5800caa8a117c3b07b60d8fb208ec

Change-Id: If8de002e0c9f748b43e3d2271ac283462603b2e6
Reviewed-by: Toni Saario <toni.saario@qt.io>
2021-04-12 09:51:27 +02:00
Qt CI Bot
e90dda7314 Merge integration refs/builds/qtci/dev/1618194365 2021-04-12 04:40:02 +00:00
JiDe Zhang
c9bbc025f0 Add "QT_DEPRECATED_VERSION_XXX" macros
Since 6.3 to 6.6, for which version add "QT_DEPRECATED_VERSION_X_6_"
and "QT_DEPRECATED_VERSION_6_" macro.

Change-Id: I10c77b1ed436ce3442960f5594f86a3a3be181f2
Reviewed-by: Giuseppe D'Angelo <giuseppe.dangelo@kdab.com>
Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
2021-04-12 10:03:26 +08:00
Craig Scott
6442116078 Warn if using CMake 3.20.0 due to potential cyclic dependencies
CMake 3.20.0 can create autogen-related cyclic dependencies that are
only detected at build time by Ninja, which then fails with a build error.
Warn and advise to use a different CMake version instead.

Pick-to: 6.1 6.0
Change-Id: I9bef973ad2efdb69f28d6a9e0584b543be59f17f
Reviewed-by: Alexandru Croitor <alexandru.croitor@qt.io>
2021-04-12 12:24:56 +11:00
Volker Hilsheimer
5f31da62bb Disable warnings for tests using QSqlQuery assignment
Copying is deprecated as of 14f9f00fdb.

Pick-to: 6.1
Change-Id: I235d45ff6769a29a4fdfd888c20dd9fe2fe81346
Reviewed-by: Giuseppe D'Angelo <giuseppe.dangelo@kdab.com>
2021-04-11 23:08:32 +02:00
Volker Hilsheimer
ed8429495e Fix gcc warnings from having only one of assignment/copy
For example:
warning: implicitly-declared
‘constexpr Complex& Complex::operator=(const Complex&)’
is deprecated [-Wdeprecated-copy]

Pick-to: 6.1
Change-Id: I7598e821acb7cb7bf17776d693af62778185afc5
Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
2021-04-11 19:53:51 +02:00
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