| Commit message (Collapse) | Author | Age | Files | Lines |
|---|
| |
|
|
|
|
|
|
|
|
|
| |
This reverts commit 74089697cf2a4961fb697100555b17ae2342d734.
Revert of commercial license headers is required for the
Qt 6.2.x opensource releases, Qt 6.2.5 onwards.
Task-number: QTBUG-107760
Change-Id: Id49069cb5e5f261da185fd082dfb71deb259d387
Reviewed-by: Ulf Hermann <ulf.hermann@qt.io>
|
| |
|
|
|
|
|
|
|
|
|
|
|
|
|
| |
Updated header.COMM to the files in tqtc-qtdeclarative.
Examples, tests, or documentation files are not updated.
The commercial license header may contain some
additional lines so that its line count equals with
the earlier license header. Reason for this is that
some autotests use hard coded line numbers and a
change in the line count causes failures in tests.
Task-number: QTQAINFRA-4941
Change-Id: I32f554b0a8cb527f74d46f3c02b0e745d9fc5ddf
Reviewed-by: Ulf Hermann <ulf.hermann@qt.io>
|
| |
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
| |
When an application uses a static Qt and manually links to
Qt Quick Controls 2 style plugins (bypassing qmlimportscanner),
there were some dependencies that were not automatically
linked into the app, leading to runtime failures like the following
qrc:/qt-project.org/imports/QtQuick/Controls/macOS/ComboBox.qml:39:1:
module "QtQuick.NativeStyle"
plugin "qtquickcontrols2nativestyleplugin" not found
or
qrc:/.../imports/QtQuick/Controls/Fusion/ApplicationWindow.qml:38:1:
module "QtQuick.Window" plugin "quickwindowplugin" not found
or
qrc:/.../imports/QtQuick/Controls/Fusion/ApplicationWindow.qml:41:1:
module "QtQuick.Controls.Fusion.impl"
plugin "qtquickcontrols2fusionstyleimplplugin" not found
Special case these dependencies like we did previously for the qml and
worker script plugins, by using a new helper called
_qt_internal_add_qml_static_plugin_dependency.
Each of the style plugins (except for the Basic one) import another
style plugin as a fallback, which means the fallback style needs to be
linked as well.
The macOS and Windows style import the native style, so that is added
as an extra link dependency for them.
The non-native styles also have a dependency on QtQuick.Window, which
is not linked by default even if the QtQuick plugin is linked.
Note that at least the fallback style dependencies can be considered
duplicated from the build system perspective, because they are already
mentioned in the respective qt_add_qml_module IMPORTS section.
Ideally, in a separate change, we should implement automatic calls
of _qt_internal_add_qml_static_plugin_dependency for the entries
that appear in IMPORTS, so that it also improves the situation for
public user projects that build their own static qml plugins.
This will likely depend on figuring out how to handle QTBUG-92887
first (a bidrectional mapping between qml plugin targets and URIs).
Until then, we improve the situation for cases mentioned above.
Amends 6fd1216801f078f65be2cbc748cc459cb6912a4f
Fixes: QTBUG-97099
Change-Id: Ied3f0af4a860db3f7309b993fc034a0cae9d84ae
Reviewed-by: Fabian Kosmale <fabian.kosmale@qt.io>
Reviewed-by: Joerg Bornemann <joerg.bornemann@qt.io>
Reviewed-by: Mitch Curtis <mitch.curtis@qt.io>
(cherry picked from commit 2a664028a9cbbd94f87646b609d5aad7b781d792)
Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
|
| |
|
|
|
|
|
|
|
|
|
|
|
|
|
|
| |
Font overriding should be a style-specific behavior. For instance, macos
style cannot use a different font size than the default. Therefore, this
patch moves the font overriding over to the macos style.
This prevented font size to be inherited from the parent control
Fixes autotests Popup::test_font() and ComboBox::test_font() on Windows
style.
Task-number: QTBUG-95679
Change-Id: Ic24de04a517a8a8710f916e70117729c41c1534e
Reviewed-by: Richard Moe Gustavsen <richard.gustavsen@qt.io>
(cherry picked from commit 43eca45b061fe965fe2a6f1876d4a35a58e3a9e4)
Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
|
| |
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
| |
Using the full module versions presents problems if you bump the minor
version of your module. Bumping the minor version then bumps the
versions of all QML files not explicitly versioned. This is certainly
not what you want as the files should still be available to imports of
the old version.
Having it default to minor version 0 is more practical because many QML
files are available from version 0 of their respective modules. Now you
need to add version entries for files you add after .0 in order for them
not to show up in imports of earlier versions. This is less of a
problem, though, even if you forget it.
In addition, use PAST_MAJOR_VERSIONS to derive additional versions to be
added to the QML files. This allows us to drop a lot of boiler plate
code from our own modules.
Change-Id: I8e4cfc16180af30e8bafc0a62137e9018f7eaee8
Reviewed-by: Alexandru Croitor <alexandru.croitor@qt.io>
Reviewed-by: Fabian Kosmale <fabian.kosmale@qt.io>
(cherry picked from commit de27215766f13cb5c870e6a1285836164d6e574c)
Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
|
| |
|
|
|
|
|
|
|
|
|
|
|
| |
Showing selection handles for the desktop styles really
doesn't look correct. So rather than adding something that
looks a bit out of place, just use invisible handles instead.
This allows the user to still drag on the corners of the
selection.
Change-Id: Ic13da3eeb24b293f1c7f87d78fe12e997651e579
Reviewed-by: Mitch Curtis <mitch.curtis@qt.io>
(cherry picked from commit 0d3f0b581c2272c70c14b1811a3d65a52276988c)
Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
|
| |
|
|
|
|
|
|
|
|
|
|
|
|
| |
Add a SelectionRectangle to the macOS style. Since native macOS
apps doesn't use selection handles, we just add some small
subtle triangles on the inside of the selection.
Note: If the developer want the handles to be completely hidden,
he can set the handle delegates to null.
Change-Id: I1d1733ae5b4a3192e3c52b9ddb7d3d0df976670a
Reviewed-by: Mitch Curtis <mitch.curtis@qt.io>
(cherry picked from commit 03ef5d8ab5fab6c4da7489f9965ba40ea0abfc5e)
Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
|
| |
|
|
|
|
|
|
|
|
|
|
| |
GHS linker optimizes away QML type registrations despite volatile.
To prevent this we add #pragma ghs reference(s) to avoid such linker
optimization.
Task-number: QTBUG-94846
Change-Id: I8614b904657d706e93541d84cbe43f4826abbd60
Reviewed-by: Fabian Kosmale <fabian.kosmale@qt.io>
(cherry picked from commit abbcbf22079a9135e9bd19ac4e0e3c71e2f5f792)
Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
|
| |
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
| |
The pro2cmake.py conversion script faithfully reproduced the .pro files
for the plugins, which specified the libraries as public. But in CMake,
the implications of this are that public usage requirements should then
be propagated to consumers. We don't expect any consumers, since a
plugin is created as a MODULE library in CMake, so for Windows we don't
even have an import library to link with. The only exception to this is
for static builds where plugins are created as STATIC libraries
instead, but only in certain controlled situations do we then link to
plugins. Even then, usage requirements are not expected to propagate to
the consumers, so these relationships should always be specified as
private.
As a drive-by fix, remove Qt::Foo dependencies that are already implied
by Qt::FooPrivate.
Task-number: QTBUG-90819
Change-Id: I3f33766612367520e09e599f03ac06d43613aa81
Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org>
Reviewed-by: Alexandru Croitor <alexandru.croitor@qt.io>
(cherry picked from commit 9c30798a439e6a87b574472aca7a4e15107c6221)
Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
|
|
|
The new qml CMake API places a closer relationship between
the backing target and the plugin target. Both are typically
created together and they share a lot of common details.
Instead of creating them in different parts of the source
tree, they are now specified together. The src/imports
area has effectively been absorbed into the other
corresponding subdirectories below src with this change.
Task-number: QTBUG-91621
Change-Id: I9bd32e9eb78c198ccc9db04e2829303cac323502
Reviewed-by: Fabian Kosmale <fabian.kosmale@qt.io>
|
