| Commit message (Collapse) | Author | Age | Files | Lines |
|
|
|
|
|
|
|
| |
Generate missing CMake projecst for qmltooling. Required for tests to
pass.
Change-Id: I7dbf434a547f4fad13f403f0760406132aef5e9d
Reviewed-by: Alexandru Croitor <alexandru.croitor@qt.io>
|
|
|
|
|
|
|
|
| |
The resource prefix is now calculated.
Change-Id: If6faf9aea193a534d3b02d00de28c59724974d3c
Reviewed-by: Leander Beernaert <leander.beernaert@qt.io>
Reviewed-by: Alexandru Croitor <alexandru.croitor@qt.io>
|
|
|
|
|
|
|
|
| |
This brings the output up-to-date with the latest generator changes
(qml_files among others) and fixes the URI parameter for QtQuick, etc.
Change-Id: Iafe7404ce12bf2132252d88ae38c4cc70c4f0d07
Reviewed-by: Alexandru Croitor <alexandru.croitor@qt.io>
|
|
|
|
|
|
|
|
| |
Updated qml modules to be compatible with the latest changes to
add_qml_modules.
Change-Id: I37965db931d44e02a18fb0d5948e0c4439ff0852
Reviewed-by: Simon Hausmann <simon.hausmann@qt.io>
|
|
|
|
|
|
|
|
| |
Updated qml modules to be compatible with the latest changes to
add_qml_modules.
Change-Id: I3342a1375bfa64a16fb0c54f812c56bad173f73c
Reviewed-by: Simon Hausmann <simon.hausmann@qt.io>
|
|
|
|
|
|
|
| |
Add INSTALL_QML_FILES as the default option for all qml_plugins.
Change-Id: I567aeff7b4b2b40765c83ac08ab7af3917a25981
Reviewed-by: Simon Hausmann <simon.hausmann@qt.io>
|
|
|
|
|
|
|
|
|
|
|
| |
Make the qmlcachegen target visible in src. This will allow the use of
compiling .qml files such as src/imports/testlib/*.qml ahead of time.
We might move the sources over from tools/ in the future, but for cmake
this isn't necessary -- as long as the targets are defined.
Change-Id: I0755c6cb5c78fcb144c067d2b50092e42bb6f65a
Reviewed-by: Alexandru Croitor <alexandru.croitor@qt.io>
|
|
|
|
|
|
|
|
|
|
|
| |
When the parallel build tries to build QmlQmlDevTools early on (can be
triggered directly via ninja /path/to/lib/libQt6QmlDevTools.a), then we
must make sure to build QtQml first, due to the dependency on syncqt
generated header files, which in turn include build time generated
files.
Change-Id: I5a4ac01d48a791e2ee951e8dd5b418d989e4643c
Reviewed-by: Alexandru Croitor <alexandru.croitor@qt.io>
|
|\
| |
| |
| | |
Change-Id: I52b2d17d9334313e4b3d84b52432f2ebc77f7415
|
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| | |
Ahead of compiling declarative with a newer qtbase that bumps the Qt
version to 6, we can already now remove the Qt 5 code paths related to
type registrations as commit 8534634bd204ccdca3edcc244a35be6e81739fce
implements those dependencies differently.
This also required lowering the minimum minor version for the
Instantiator to 1, as it was in the Qt 5 branch.
Change-Id: Idd38c967eeb8423509237116803d292bba422f8b
Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org>
Reviewed-by: Fabian Kosmale <fabian.kosmale@qt.io>
Reviewed-by: Alexandru Croitor <alexandru.croitor@qt.io>
|
| |
| |
| |
| |
| |
| |
| |
| |
| |
| | |
This change amends commit af1c5e013733b660bc5d813d92e55f2e6d009e4a and
synchronizes the minor type version of Package and Instantiator to match
Qt 5.
Change-Id: I2e25a8b7c79edcf483f4f4e072293c0627f8ec94
Reviewed-by: Fabian Kosmale <fabian.kosmale@qt.io>
Reviewed-by: Alexandru Croitor <alexandru.croitor@qt.io>
|
| |
| |
| |
| |
| |
| |
| |
| |
| |
| | |
Importing QtQuick 2.x should make all QtQml types, including models
and worker script available as well. The same goes for QtQml, which
imports QtQml.Models and WorkerScript.
Change-Id: I47acff2dd39495a42095270d1fd07e9c8921fb62
Reviewed-by: Fabian Kosmale <fabian.kosmale@qt.io>
Reviewed-by: Alexandru Croitor <alexandru.croitor@qt.io>
|
| |\
| | |
| | |
| | | |
Change-Id: I849578dc1122c8ea36c3d4219ebcb1ca86a8016f
|
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | | |
The plugin entry in the qmldir file must match the name of the plugin
in the build system.
Change-Id: I3780ee352d27aa5971700d891da116495a04d142
Reviewed-by: Fabian Kosmale <fabian.kosmale@qt.io>
Reviewed-by: Ulf Hermann <ulf.hermann@qt.io>
|
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | | |
This allows a module to make another module import with the same minor
version and in the same qualified namespace. This will be used to make
import QtQuick 2.5 implicitly import QtQml 2.5, to maintain compatibility.
It used to be implemented by means of calling C++ type registration functions
directly.
Change-Id: I64c7bfe25d75b9a45f5d44a10d035fc2f86d30ca
Reviewed-by: Fabian Kosmale <fabian.kosmale@qt.io>
Reviewed-by: Alexandru Croitor <alexandru.croitor@qt.io>
|
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | | |
Instead of storing raw pointers into the compiled data and creating
synthetic CompiledData::Import objects for implicit imports, this patch
introduces a dedicated PendingImport data structure that removes the
need of using raw pointers, reduces the amount of string index to string
resolution and incorporates the priority field thus eliminating the need
for a hash table.
Change-Id: Ia59aad17687bc0935aafd36236bda85d5f4f82a2
Reviewed-by: Fabian Kosmale <fabian.kosmale@qt.io>
Reviewed-by: Ulf Hermann <ulf.hermann@qt.io>
|
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | | |
There were quite a few rules which were essentially the same, only
differing in whether they matched T_SEMICOLON or T_AUTOMATIC_SEMICOLON
By introducing a new rule, we can match both at the same time
Change-Id: I46391e310e44ffa8bea03304a9c0726ffc872211
Reviewed-by: Simon Hausmann <simon.hausmann@qt.io>
|
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | | |
ListElement and ListModel were available in Qt 5 since minor version 0
in QtQml and since minor version 1 in QtQml.Models. So one had to either
write "import QtQml 2.0" or "import QtQml.Models 2.1".
Since the explicit registration in QtQml is gone and to be replaced with
an implicit dependency that loads QtQml.Models when loading QtQml, with
the same minor version, we need to lower the minor version to 0 for both.
This is unlikley to cause any harm as previously import QtQml.Models 2.0
would not produce any types.
Change-Id: Iff7c4a1c1b35e4c9d930aa45dd678d8e2d5c823c
Reviewed-by: Fabian Kosmale <fabian.kosmale@qt.io>
Reviewed-by: Ulf Hermann <ulf.hermann@qt.io>
|
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | | |
For modules such as QtQuick we register 2.$QT_VERSION_MINOR to allow our
users to simply use the latest "Qt version" with their imports. When
switching to version 6.0.0, code that used import QtQuick 5.13 would
stop working because we had some types registered to say minor version 10
but nothing after that, and the qmlRegisterModule() call would use
QT_VERSION_MINOR, which is now zero. Therefore in this Qt 6 branch,
let's stick to the latest Qt 5 release planned, to maintain
compatibility.
Change-Id: I174be32cef8de152cd32010156ae716bd474397c
Reviewed-by: Ulf Hermann <ulf.hermann@qt.io>
Reviewed-by: Fabian Kosmale <fabian.kosmale@qt.io>
|
| |\|
| | |
| | |
| | | |
Change-Id: I4476733af61fcf3a2af1d121a4585c3fae1c240e
|
| | |\
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | | |
Conflicts:
src/qml/qml/qqmltypeloader.cpp
src/quick/scenegraph/qsgopengldistancefieldglyphcache.cpp
Change-Id: I1a226d8738db2ec06e3cef240a0e040e7c144cad
|
| | | |
| | | |
| | | |
| | | |
| | | |
| | | | |
Task-number: QTBUG-74391
Change-Id: I8cd8371e820efbe90d486aef4a68e17c92fd93ea
Reviewed-by: Paul Wicking <paul.wicking@qt.io>
|
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | | |
While Gimp's Registry no longer exists, the SpriteSheet plugin is still there.
Fixes: QTBUG-76844
Change-Id: I3f96ef654f6b64cb2919fe011467f2fa85433eaf
Reviewed-by: Ulf Hermann <ulf.hermann@qt.io>
|
| | | |\
| | | | |
| | | | |
| | | | | |
Change-Id: I47735445e4d31ba47d596d964b3f050e263bd1d9
|
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | | |
Due to the way the area allocator is used, where one area spans
all the textures, it is possible to have the situation where part
of a glyph is allocated to a texture N and the rest to N+1, i.e.
the split happens inside the glyph. In a case like this, the
cache would grow the texture in question to accommodate the glyph,
which would in turn cause the height of the texture to be too
large.
For most systems, this would not happen, since a single texture would
be enough for a font, but when it does the texture creation may fail.
The fix is to reduce the height of the area allocated to each texture
by one row height, so that if the glyph does happen to hit the border
between two and the texture needs to extend, it will still not exceed
the actual maximum height.
[ChangeLog][Text] Fixed a bug when displaying many characters from the
same font on a system with a low maximum texture size.
Task-number: QTBUG-76528
Change-Id: I1e559aaf90552afe8531872264186daa5ee61939
Reviewed-by: Simon Hausmann <simon.hausmann@qt.io>
|
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | | |
The allocated area for each texture has to have its origin at (0,0)
otherwise the actual required height of the cache is too low. When
using the texture upload workaround, this would crash, and when not
it would lead to missing glyphs.
Note that this is because the texture may contain a bit of empty
space at the top, since the area allocator may allocate this area
to a glyph which actually belongs to the previous texture (we use
a single area allocator for the entire cache and some glyphs may
overlap the limit between two textures).
[ChangeLog][Text] Fixed missing glyphs and in some cases crashes
when large character sets were being used on system with a low
maximum texture size.
Task-number: QTBUG-76528
Change-Id: I710ebbdd2feba4567505393fb12f89b5dd8501f1
Reviewed-by: Simon Hausmann <simon.hausmann@qt.io>
|
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | | |
Otherwise the path might get interpreted as some other part of the URL,
for example the host name.
Fixes: QTBUG-76441
Change-Id: I3edde96153403962db4576e5af794419c21b49a8
Reviewed-by: Fabian Kosmale <fabian.kosmale@qt.io>
Reviewed-by: Simon Hausmann <simon.hausmann@qt.io>
|
| | | | |
| | | | |
| | | | |
| | | | |
| | | | | |
Change-Id: I177ea278b5039688923fc23425a1377522412d08
Reviewed-by: Simon Hausmann <simon.hausmann@qt.io>
|
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | | |
Avoid a crash when setData or create are
called after a user mistakenly used the internal constructor of
QQmlComponent which does not take an engine.
Fixes: QTBUG-55407
Change-Id: Ia4295d1b044723efce1a95607349561d4f1640da
Reviewed-by: Ulf Hermann <ulf.hermann@qt.io>
|
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | | |
Provide different export macros and different top level headers for
each, don't include runtime headers from compiler sources.
Change-Id: I7dc3f8c95839a00a871ba045ec65af87123154be
Reviewed-by: Simon Hausmann <simon.hausmann@qt.io>
|
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | | |
It is only used in the runtime.
Change-Id: I93bc91a97f7a6967cdf49f2eb5c32b47217d905f
Reviewed-by: Fabian Kosmale <fabian.kosmale@qt.io>
Reviewed-by: Simon Hausmann <simon.hausmann@qt.io>
|
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | | |
Avoid using namespace in headers and include only the headers we
actually need.
Change-Id: I526a0f874dc09b07693fd87070665be396d3b637
Reviewed-by: Simon Hausmann <simon.hausmann@qt.io>
|
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | | |
No one can read this mess.
Change-Id: Icec4f2afc466435c1ae5e4e80fa2c1b5baf7d087
Reviewed-by: Simon Hausmann <simon.hausmann@qt.io>
|
| | | | |
| | | | |
| | | | |
| | | | |
| | | | | |
Change-Id: I2219cba0dd3782cb2e0b09b8f3c4d5472e6e5d7e
Reviewed-by: Simon Hausmann <simon.hausmann@qt.io>
|
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | | |
Fixes: QTBUG-76932
Change-Id: I05c8dba8c7339fe79c9d7de9158a0eb9e041579d
Reviewed-by: Simon Hausmann <simon.hausmann@qt.io>
|
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | | |
string
This change keeps double precision for value in case if number
of significant digits exceed six
Fixes: QTBUG-76303
Change-Id: Ifc97e845094d06d2f2e2445298305513cb7b56e2
Reviewed-by: Ulf Hermann <ulf.hermann@qt.io>
|
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | | |
And use it more often.
Change-Id: I980663c2b0375d278d8796f2d3bc41cf7241bf16
Reviewed-by: Fabian Kosmale <fabian.kosmale@qt.io>
Reviewed-by: Simon Hausmann <simon.hausmann@qt.io>
|
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | | |
qml_debug is about the runtime debug support. Even if it's not running
in debug mode itself, the compiler should still be able to generate
debug instructions to be interpreted later by a potentially debugging
runtime.
Change-Id: Ided5ff8ef9ce820de204e8a967ddeddad3fea5d5
Reviewed-by: Simon Hausmann <simon.hausmann@qt.io>
|
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | | |
[ChangeLog][QtQml] It is now possible to specify types for method
parameters and their return value in QML (basic and object types), using
TypeScript-like syntax with a colon separator. The syntax for QML
declared signals supports the same style.
This change also adapts the remaining snippets and docs to the "fresher"
qml signal parameter syntax.
Change-Id: I601781f01f696276951b04785584adab39fedfd9
Reviewed-by: Shawn Rutledge <shawn.rutledge@qt.io>
Reviewed-by: Ulf Hermann <ulf.hermann@qt.io>
|
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | | |
Amends 0844d1db03410ac88b4ce6b16f68a073b030b248. The modified examples
show that the rule of multiple parameters was missing (with the colon)
and the single entry colon rule must also come first in order to
identify the use correctly.
Change-Id: Ic625e2d4b7b0282e6f2289c8be347c36fe81e4c5
Reviewed-by: Ulf Hermann <ulf.hermann@qt.io>
Reviewed-by: Fabian Kosmale <fabian.kosmale@qt.io>
|
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | | |
We support
signal(int param)
but we should also support
signal(param: int)
for consistency with the syntax now supported for functions.
Change-Id: Ic064bbaac45024d3663562819f3c1f3f4a918a56
Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org>
Reviewed-by: Ulf Hermann <ulf.hermann@qt.io>
|
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | | |
functions
These can be declared using the new typescript-like syntax and using
type names that are also used for signal parameters and property types.
This merely affects their signature on the C++ side and allows the
corresponding invocation.
Change-Id: Icaed4ee0dc7aa71330f99d96e073a2a63d409bbe
Reviewed-by: Ulf Hermann <ulf.hermann@qt.io>
|
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | | |
In particular this permits the JS reserved keywords such as "int" or
"double".
Change-Id: Ice29e3696d8cba2121ef487cd0b099dd8b082022
Reviewed-by: Ulf Hermann <ulf.hermann@qt.io>
|
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | | |
Change-Id: Ia9ba819ce77eee7e582cf90aacf5baa4813d9fca
Reviewed-by: Ulf Hermann <ulf.hermann@qt.io>
Reviewed-by: Fabian Kosmale <fabian.kosmale@qt.io>
|
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | | |
This allows extracting the type information for variable declarations.
Change-Id: I1241df3b27ae292b83392d5caaa1587caafa46a3
Reviewed-by: Ulf Hermann <ulf.hermann@qt.io>
|
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | | |
Inspired by TypeScript syntax, allow optional type annotations in the
style of ": <name of type>" in for the parameters of functions and their
return type.
These annotations are not used at the moment, so by default we produce
an error message when encountering them in the AST.
In addition their usage is limited to functions declared in the QML
scope. All other uses attempt to produce readable syntax errors. So for
example this is okay:
Item {
function blah(param: string) string { ... }
}
And this is not okay:
// some file.js
function blah(param: string) : string { ... }
Change-Id: I12d20b4e2ce92e01108132975a06cfd13ba4a254
Reviewed-by: Ulf Hermann <ulf.hermann@qt.io>
|
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | | |
We don't need to blank the script pragmas as the parser will ignore them
anyway.
Change-Id: Id93e9ba0a6aacb38692cb294fb140d8ef99a2d23
Reviewed-by: Simon Hausmann <simon.hausmann@qt.io>
Reviewed-by: Fabian Kosmale <fabian.kosmale@qt.io>
|
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | | |
The header file uses std::function and should include the corresponding
header file and not rely on the includee to do that.
Change-Id: Ic7a87aea4fcf49d17b0e5ef6c1aaf35424b66f01
Reviewed-by: Fabian Kosmale <fabian.kosmale@qt.io>
Reviewed-by: Ulf Hermann <ulf.hermann@qt.io>
|
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | | |
Change-Id: Ice015e39d54d0e7c2f77b365195c986d7c9d1d92
Reviewed-by: Paolo Angelelli <paolo.angelelli@qt.io>
Reviewed-by: Ulf Hermann <ulf.hermann@qt.io>
|
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | | |
In QQmlPropertyCacheCreator, move the code to determine the meta-type
for a signal parameter type into a helper function. Makes the code more
readable and available for re-use later.
Change-Id: I2876ed247d0c42f4e6d90872fa4b6a2dc4e1ba7e
Reviewed-by: Ulf Hermann <ulf.hermann@qt.io>
|