Commit Graph

47998 Commits

Author SHA1 Message Date
Laszlo Agocs
be2635b8dd rhi: Reuse the data in buffer ops in res.update batches
Because having profilers bombarded with mallocs (due to creating
deep copy QByteArrays) is not nice.

Change-Id: I848f41f3465d6dc2a58a193cc863495aacf13d79
Reviewed-by: Andy Nichols <andy.nichols@qt.io>
2020-09-23 16:59:06 +02:00
Laszlo Agocs
6b52ba4286 rhi: Reuse buffer/texture op entries in res.update batches
More of an enabler for reusing the data in the individual entries since
not clearing the QVLA does not give us much on its own.

Change-Id: Ief9761f75382c3373cc2bc7b866eb59fdd8b3277
Reviewed-by: Andy Nichols <andy.nichols@qt.io>
2020-09-23 16:59:06 +02:00
Laszlo Agocs
230be3c4d1 rhi: Report an "optimal capacity" from res.update batches
Change-Id: If47eddf3fe7d365c80b0a15712ef155a6898d904
Reviewed-by: Andy Nichols <andy.nichols@qt.io>
2020-09-23 16:59:06 +02:00
Laszlo Agocs
5fcd9a3ebf rhi: Do not just pick the first free res.upd. batch all the time
Rather, utilize all the available ones in the pool, picking
the next available batch after the one we picked previously
(with wrapping over as necessary).

Change-Id: I5f26e127a406c2dd07d155712429c72ad4f0f0f1
Reviewed-by: Andy Nichols <andy.nichols@qt.io>
2020-09-23 16:59:06 +02:00
Laszlo Agocs
fe3a1617af rhi: d3d: Fix dynamic offsets with multiple buffers
Fixes: QTBUG-86821
Change-Id: I57f86bf0f7e95b92f5b2c5fee587112ecf0fc8e6
Reviewed-by: Andy Nichols <andy.nichols@qt.io>
2020-09-23 16:59:06 +02:00
Alexandru Croitor
9d55eee8da CMake: Disable usage of CMake API compatibility wrappers
Setting the QT_NO_INTERNAL_COMPATIBILITY_FUNCTIONS variable
in the project ensures we ported away from old API calls.

Task-number: QTBUG-86815
Change-Id: I0d1868a24b0f4e0cc817c11fef160f8b392814af
Reviewed-by: Joerg Bornemann <joerg.bornemann@qt.io>
2020-09-23 16:59:06 +02:00
Alexandru Croitor
403213240c CMake: Regenerate projects to use new qt_internal_ API
Modify special case locations to use the new API as well.
Clean up some stale .prev files that are not needed anymore.
Clean up some project files that are not used anymore.

Task-number: QTBUG-86815
Change-Id: I9947da921f98686023c6bb053dfcc101851276b5
Reviewed-by: Joerg Bornemann <joerg.bornemann@qt.io>
Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org>
2020-09-23 16:59:06 +02:00
Alexandru Croitor
e0c62a48b8 CMake: Rename internal functions to contain qt_internal
Offer compatibility wrapper functions until we update all of the Qt
repos to use the new names.

Task-number: QTBUG-86815
Change-Id: I5826a4116f52a8509db32601ef7c200f9bd331de
Reviewed-by: Joerg Bornemann <joerg.bornemann@qt.io>
Reviewed-by: Kai Koehne <kai.koehne@qt.io>
2020-09-23 16:59:05 +02:00
Fabian Kosmale
6f0a9df8d2 QMetaPropertyBuilder: support bindable flag
Change-Id: I0d6ad00e49fd5df4c3b9c0692839404d53d8f6ed
Reviewed-by: Ulf Hermann <ulf.hermann@qt.io>
2020-09-23 09:24:11 +02:00
Volker Hilsheimer
adb927e5bc Fix documentation of QPointerEvent::points
As drive-by, fix qdoc warning in related internal documentation.

Change-Id: I7716a9b126e38e99dcd11c6af2e91b8ec7bf4346
Reviewed-by: Tor Arne Vestbø <tor.arne.vestbo@qt.io>
2020-09-23 06:06:33 +02:00
Volker Hilsheimer
6db7aceb43 Fix some qdoc warnings: QRegularExpression parameters
Change-Id: Ib4d33327c6c059e11d8615bac0f72d9f028d5860
Reviewed-by: Giuseppe D'Angelo <giuseppe.dangelo@kdab.com>
2020-09-22 22:49:22 +02:00
Joerg Bornemann
25cc901f04 CMake: Fix configure -redo for top-level builds
When re-doing in a top-level build, we did not read the config.opt file
from the top-level directory.

Also, the config.opt file should not contain the -top-level argument.
This is an internal option, and on Windows, it was already missing. The
information whether we're doing a top-level build is now passed in the
CMake variable TOP_LEVEL.

Change-Id: Iaecd7306a4b6d9ad494684c201cf12f8e74d684b
Reviewed-by: Alexandru Croitor <alexandru.croitor@qt.io>
2020-09-22 22:20:43 +02:00
Ulf Hermann
8d4eb292b2 QLibrary: Use QTaggedPointer for the did_load flag
This makes the size nicely aligned and conveniently intializes
everything to the right values.

Change-Id: Ibad2defbbd323fd5cdd4bed8374f40558d80acc0
Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
2020-09-22 21:26:53 +02:00
Ulf Hermann
eda30d1986 Apply some code cosmetics to iterables
Change-Id: I552eca017d5a473ea91ca43d0a0459ef2e8288b2
Reviewed-by: Fabian Kosmale <fabian.kosmale@qt.io>
2020-09-22 21:25:51 +02:00
Volker Hilsheimer
c39878dd30 Doc: link QModelRoleData and QModelRoleDataSpan documentation
Change-Id: I49bb356d5296dc73effd18399b7a205f00c24252
Reviewed-by: Giuseppe D'Angelo <giuseppe.dangelo@kdab.com>
2020-09-22 20:56:16 +02:00
Volker Hilsheimer
a6a2c00ee3 Fix some qdoc warnings: std::filesystem::path getters
Those APIs need to be declared for qdoc runs, even if cxx17_filesystem is not.

Change-Id: Iaa437aa424f35d0414b6b79328bcafb49af872b3
Reviewed-by: Mårten Nordheim <marten.nordheim@qt.io>
2020-09-22 20:56:07 +02:00
Volker Hilsheimer
1d6b7a27cb Fix some qdoc warnings: function names in "see also"
Change-Id: I6b2b444ccc4de6629d800933802ffa8f75682b96
Reviewed-by: Paul Wicking <paul.wicking@qt.io>
2020-09-22 20:56:01 +02:00
Volker Hilsheimer
149a9ef23f Fix some qdoc warnings: printer API cleanup
Puge references from removed QPrinter methods.

QPdfWriter's setter API documentation only added the word "PDF" to the
QPagedPaintDevice documentation. This was not useful - when the latter
talks about "page", it's obvious what is meant in the context of PDF, so
remove the duplication.

Change-Id: I7b16cbc82de8d35b5224288c9e36deff4e01fb44
Reviewed-by: Paul Wicking <paul.wicking@qt.io>
2020-09-22 20:55:55 +02:00
Volker Hilsheimer
5b0a5ac20c Fix some qdoc warnings: function parameter names
In QTextDocument and QTextFormat, standardize language a bit.

Change-Id: I7c81ecc7a32e36ec32214e6b5386a2827cfcbc3f
Reviewed-by: Paul Wicking <paul.wicking@qt.io>
2020-09-22 20:55:49 +02:00
Volker Hilsheimer
89627fd7f9 Fix some qdoc warnings: QtConcurrent functors and exceptions
Change-Id: I32e45c85cedb74a6dcbd99930910b730f1160fae
Reviewed-by: Paul Wicking <paul.wicking@qt.io>
2020-09-22 20:55:41 +02:00
Volker Hilsheimer
2692cb0e61 Doc: Fix QSqlField documentation for deprecated constructor
Also, merge constructor overloads, and remove superfluous explicit from
a non-converting constructor.

Change-Id: I60d0e646d1aaeb8ea66b7598076c3e3ba356c12e
Reviewed-by: Paul Wicking <paul.wicking@qt.io>
2020-09-22 20:55:35 +02:00
Volker Hilsheimer
55f4a4e6f0 Fix various qdoc warnings
Parameter types and names, missing enum values, and \since 6.0.

Change-Id: I1b028fcf2ef0b57accb1ef7cebf17dab9f6d571e
Reviewed-by: Paul Wicking <paul.wicking@qt.io>
2020-09-22 20:55:22 +02:00
David Faure
fc8f5afc87 QMimeDatabase: fix handling of glob-deleteall
Binary provider:
  It was not possible to remove the first glob in a local override,
  because the mainPattern handling would re-add the first glob back.

XML provider:
  It didn't support glob-deleteall.
  Also, the order of the providers was wrong. We want to pick local
  overrides first, the internal DB has to go last in the list.

Fixes: QTBUG-85436
Pick-to: 5.15
Change-Id: I9a4523f37cd962c730df9a6ed992bd01c075bf03
Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
2020-09-22 20:40:45 +02:00
Thiago Macieira
ad9108e2e9 QFile::copy: call syncToDisk on destination
Syncing the source makes no sense.

Fixes: QTBUG-86806
Change-Id: I0d3ff441bec041728945fffd1637205d9cf6ab72
Reviewed-by: Lars Knoll <lars.knoll@qt.io>
2020-09-22 11:34:31 -07:00
Mårten Nordheim
a07f35409b QDecompressHelper: limit decompression ratio
To avoid potential decompression bombs. This is implemented with just
a simple check that the ratio doesn't pass some hardcoded preset.

Change-Id: I17246f0f43e73280cdb35a8f03d65885f5678ad6
Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
2020-09-22 19:08:53 +02:00
Edward Welbourne
16a1ddd733 Use QLatin1Char in place of QChar in a few more places
QDateTimeParser mostly uses QLatin1Char where it can, but missed a few
cases.

Change-Id: I3df37c350047214aeb843c3290014fa45b4656fe
Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
Reviewed-by: Andreas Buhr <andreas.buhr@qt.io>
Reviewed-by: Andrei Golubev <andrei.golubev@qt.io>
2020-09-22 19:08:53 +02:00
Edward Welbourne
92a9a18b5d Count digits in QDateTimeParser::parseSection()'s numeric fields
Assuming everything up to the first space is a digit is not sound.

Change-Id: Iab5bb134c8e3299da726625c53b6a9b23f09dbb4
Reviewed-by: Andreas Buhr <andreas.buhr@qt.io>
Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
2020-09-22 19:08:53 +02:00
Edward Welbourne
df276fb29f Inline various date-time fromString(const QString &...) methods
As requested in code-review.

Task-number: QTBUG-86400
Change-Id: I14e051e4bad3e8e227c6401e699f979663ffd10f
Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
Reviewed-by: Lars Knoll <lars.knoll@qt.io>
2020-09-22 19:08:53 +02:00
Alexandru Croitor
a3bd80c08c CMake: Regenerate projects
Clean up the state of the projects,
before changing the internal CMake API function names.

Task-number: QTBUG-86815
Change-Id: I90f1b21b8ae4439a4a293872c3bb728dab44a50d
Reviewed-by: Joerg Bornemann <joerg.bornemann@qt.io>
2020-09-22 19:08:53 +02:00
Alexandru Croitor
9959090da8 CMake: Fix failing tests on macOS developer builds
tst_qguiapplication was missing an Info.plist file.
We can't directly reference the tst_qcoreapplication Info.plist
file like the qmake project does, because that breaks ninja
(says multiple rules create the same output file), so use a
copy instead.

Blacklist the qpluginloader loadMachO test when doing CMake builds.
The qmake projects use multiple custom rules to build the macho
plugins, which need to be ported to CMake.

Task-number: QTBUG-86053
Task-number: QTBUG-86792
Change-Id: Iaff2b2d5e9e84a457b4f2ffc011a580388498f00
Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org>
Reviewed-by: Joerg Bornemann <joerg.bornemann@qt.io>
2020-09-22 19:08:53 +02:00
Ulf Hermann
4b57246a61 Remove default ctor for QIterable
MSVC has strange problems with it and we don't actually need it.

Change-Id: I2c443946d52d475208800f310b5f910da165c99b
Reviewed-by: Fabian Kosmale <fabian.kosmale@qt.io>
2020-09-22 13:52:19 +02:00
Friedemann Kleint
631eed68d0 Fix some MSVC conversion warnings
Change-Id: Ib2c1fdb7b84f89201136438362ab5962126ec929
Reviewed-by: Joerg Bornemann <joerg.bornemann@qt.io>
2020-09-22 09:51:15 +02:00
Friedemann Kleint
1b0e6b909f Windows QPA: Fix warnings about deprecated operator + for keys
Pick-to: 5.15
Change-Id: I48bd41465e62fef6f5ddcf235716a4be5eff46d4
Reviewed-by: Joerg Bornemann <joerg.bornemann@qt.io>
2020-09-22 09:51:10 +02:00
Volker Hilsheimer
1e2325f0dc Fix some qdoc warnings: typos and qdoc syntax
Change-Id: Idf5c1490330e0f2e5d4bcf920eb03fc9993b3c8a
Reviewed-by: Tor Arne Vestbø <tor.arne.vestbo@qt.io>
2020-09-22 06:01:02 +02:00
Volker Hilsheimer
19da4897af Fix some qdoc warnings: QTableWidgetSelectionRange
The default constructor was no longer documented, and the documentation of
the initializing constructor wasn't tied to the implementation anymore after
33fc622686.

Change-Id: I5354a7e3b249f2128a6421546d4ebb375ae48160
Reviewed-by: Paul Wicking <paul.wicking@qt.io>
2020-09-21 20:09:32 +02:00
Volker Hilsheimer
642ba2c278 Fix some qdoc warnings: typos
It's \reimp, not \reimpl, and this particular textAlignment variable
documentation is for QStyleOptionComboBox.

Change-Id: I90f1519410a4378c54777e29acce70b55975e70e
Reviewed-by: Paul Wicking <paul.wicking@qt.io>
2020-09-21 20:09:28 +02:00
Volker Hilsheimer
75285b7b8c Fix some qdoc warnings: broken links
We can't split a \l{Class::}member over two lines.

Change-Id: Id4806402ab349fd20fbf65eee9502e2d08e21dc5
Reviewed-by: Paul Wicking <paul.wicking@qt.io>
2020-09-21 20:09:24 +02:00
Volker Hilsheimer
5a8e121cfa Fix some qdoc warnings: unnamed parameters
If we reference a parameter in the documentation, then we have to name
it as well in the function declaration. Use Q_UNUSED instead of omitting.

Change-Id: Icb32d3bd965f0361d112f62cb3bbbbb2005d378c
Reviewed-by: Paul Wicking <paul.wicking@qt.io>
2020-09-21 20:09:21 +02:00
Edward Welbourne
0caffd37fb Inline trivial function used only by deprecated functions
QIcon had two methods calling a trivial local static; both were
deprecated. Inlined the local static rather than #if-ing it on the
same deprecation #if-ery.

Shift the #if-ery on the deprecated methods to embrace also their docs.

Change-Id: I5f6755ef99dd6b4abddc343c9bedf4815e50d567
Reviewed-by: Morten Johan Sørvig <morten.sorvig@qt.io>
2020-09-21 16:54:13 +02:00
Edward Welbourne
fc3be403d0 Remove some deprecation comments from qmap.h
Lars says documenting that the methods are slow is sufficient, no need
to deprecate them.

Task-number: QTBUG-85700
Change-Id: I7b1d19e91e30205df7d8198e3704cecc72a853e0
Reviewed-by: Lars Knoll <lars.knoll@qt.io>
2020-09-21 16:54:01 +02:00
Tor Arne Vestbø
ac43986aa5 Pass -arch when running toolchain configure test on Apple platforms
Clang doesn't automatically switch architecture just because we're
passing an iPhoneOS sysroot. In the past this resulted in a warning
about trying to link an x86_64 binary to arm64 libraries, but with
Xcode 12 this is now a hard error.

Fixes: QTBUG-86718
Pick-to: 5.15
Pick-to: 5.12
Change-Id: I7e9d2ca513d276029fc2a6cfe694a35fe41c39b3
Reviewed-by: Tor Arne Vestbø <tor.arne.vestbo@qt.io>
2020-09-21 14:51:33 +00:00
Kai Koehne
3b6ef98d7a headersclean: Fix include paths for dependent modules
Having ${QT_BUILD_DIR}/include as include path is not enough for
modules outside of qtbase. They also need to pick up headers from e.g.
Qt Core, which are available only in "${CMAKE_INSTALL_PREFIX}/include"

This amends db21bad936

Fixes: QTBUG-82615
Change-Id: Ib003a66ce039bf1ab6e21a3b1cd86923207eb3db
Reviewed-by: Alexandru Croitor <alexandru.croitor@qt.io>
2020-09-21 14:51:15 +00:00
Allan Sandfeld Jensen
5f198584e2 Define inverted QRects consistently
Changes the definition of invalid QRects to be more consistent.
This simplifies the logic, and makes it possible for us to fix
normalized() so dimensions don't change.

The actual API is not changed except for inverted rects.

Only one use-case for the old normalized() function existed,
and has been reimplemented as QRect::span().

Fixes: QTBUG-22934
Change-Id: I29dad2952dc6c8e84a6d931898dc7e43d66780f3
Reviewed-by: hjk <hjk@qt.io>
Reviewed-by: Lars Knoll <lars.knoll@qt.io>
2020-09-21 15:04:51 +02:00
Timur Pocheptsov
b8a0341178 QCocoaDrag::maybeDragMultipleItems - fix erroneous size check
Due to somewhat inverted logic introduced by the 8481a9fc97,
testing number of items in a pasteboard happens _before_ we fill it,
which is wrong and useless. As a result, maybeDragMultipleItems will
prevent the single item drag.

Pick-to: 5.15
Task-number: QTCREATORBUG-24665
Task-number: QTBUG-86786
Change-Id: Ia4be9fc56677575bb363cbb8b1adbea59e6c3b0b
Reviewed-by: Tor Arne Vestbø <tor.arne.vestbo@qt.io>
2020-09-21 15:02:40 +02:00
Lars Knoll
f91531a056 Fix a bug when streaming QVariants containing a QRegExp
Fix a logic error. QRegExp is a UserType in Qt 6 and we need to
check for it in the right place.

Fixes an autotest failure in the qregexp autotest in qt5compat.

Change-Id: I454cfcfd12b36f756b24b69a5412455db9dccbe7
Reviewed-by: Karsten Heimrich <karsten.heimrich@qt.io>
2020-09-21 14:57:27 +02:00
Lars Knoll
848927b688 Cleanup API of QMimeData
Do not use QVariant::Type anymore, instead use QMetaType

For some reason, this pushed the qvariant autotest over the limit where
MSVC requires the /bigobj flag, so add that one.

[ChangeLog][QtCore][QMimeData] The signature of the virtual retrieveData()
function has changed and now takes a QMetaType instead of a QVariant::Type.

Change-Id: Ib46773bd731ee2177b1ef74d8162d744be7017ef
Reviewed-by: Mårten Nordheim <marten.nordheim@qt.io>
2020-09-21 14:56:09 +02:00
Volker Hilsheimer
cf015cd08b Silence qdoc warnings from std::filesystem
We change the declaration of the new APIs using std::filesystem::path for
qdoc runs, and need to forward declare it consistently for qdoc builds to
avoid a flood of clang warnings when building documentation.

Change-Id: Iddcf0ce7d6207b6cc5910790315ab21076bd6ce1
Reviewed-by: Mårten Nordheim <marten.nordheim@qt.io>
2020-09-21 14:55:54 +02:00
Andrei Golubev
75d2cdf2ff Update QList's documentation relevant to prepend optimization
Task-number: QTBUG-84320
Change-Id: I550f9dd7810855df0b0cc2bcbc78a97d6abaac7a
Reviewed-by: Mårten Nordheim <marten.nordheim@qt.io>
2020-09-21 14:42:02 +02:00
Volker Hilsheimer
33349e3fce Fix a bunch of qdoc warnings from QList types
For documentation purposes, we treat QList, QByteArrayList, and QStringList as
simple classes, whereas reality is a bit more complicated. We conditionally
change the declaration of the types for qdoc runs, and need to be consistent
to avoid a flood of warnings from clang when building documentation.

Change-Id: I22d529079e10f8fd3d93edc771e5f05729fa925f
Reviewed-by: Paul Wicking <paul.wicking@qt.io>
2020-09-21 13:45:58 +02:00
Kevin Funk
e59e924f52 dbus: Skip AUTOUIC on generated sources
Skip AUTOUIC on sources generated by the qt_add_dbus_interface and
qt_add_dbus_adaptor macros. Otherwise CMake will warn due to policy
CMP0071:

```
  For compatibility, CMake is excluding the GENERATED source file(s):

  (...)

  from processing by AUTOMOC and AUTOUIC. (...)
```

Pick-to: 5.15
Change-Id: I7d14b23c9343940964d5bc0d1d18fc19b41b5cd0
Reviewed-by: Alexandru Croitor <alexandru.croitor@qt.io>
2020-09-21 13:18:24 +02:00