| Commit message (Collapse) | Author | Age | Files | Lines |
|---|
| |
|
|
|
|
|
| |
Change-Id: Ibdadef34b1b7d4ea98140feed171c409eb8bafde
Reviewed-by: Qt CMake Build Bot
Reviewed-by: Leander Beernaert <leander.beernaert@qt.io>
Reviewed-by: Simon Hausmann <simon.hausmann@qt.io>
|
| |
|
|
|
|
|
| |
Fixes: QTBUG-78190
Change-Id: Ibdfbcb479ce1af6370b9148516cef6f64e7c1abb
Reviewed-by: Qt CMake Build Bot
Reviewed-by: Alexandru Croitor <alexandru.croitor@qt.io>
|
| |
|
|
|
|
|
|
|
|
|
| |
Modify all the qmlRegisterModule calls to use minor version 15
because minor version zero from 6.0.0 would make tests fail.
This is similar to what was done in qtdeclarative in
c147b20a2c1299b2d659fe7c9472ae3866b6a425.
Change-Id: I1a59d179d4b547bd8050f31a3edfef660db442be
Reviewed-by: Simon Hausmann <simon.hausmann@qt.io>
|
| |
|
|
|
|
|
| |
Also fix usage of text stream operators.
Change-Id: I5cca2a07a8f95d4449a528aa0e8ca98c94dda40c
Reviewed-by: Simon Hausmann <simon.hausmann@qt.io>
|
| |\ |
|
| | |\
|/ /
| |
| | |
Change-Id: Ia830dee20e2674c73551319be153ec3e638b5b0e
|
| | |\ |
|
| | | |\
| |/ /
| | |
| | | |
Change-Id: Iccf3a27173aa33ac44e5f2f776d118cd59e5a5a2
|
| | | |
| | |
| | |
| | |
| | | |
Change-Id: Ie919225d42d70933693a79d8d6a21e7f46b915f3
Reviewed-by: Milian Wolff <milian.wolff@kdab.com>
|
| | | |
| | |
| | |
| | |
| | | |
Change-Id: I788cca691fd3a0b4542bad9ef05ef40404a42840
Reviewed-by: Paul Wicking <paul.wicking@qt.io>
|
| |\ \ \ |
|
| | |\ \ \
|/ / / /
| | _ /
| | /
| | |
| | |
| | | |
Conflicts:
src/webchannel/qmetaobjectpublisher.cpp
Change-Id: I853b8fc7270847c1a9cdd862dff278ddb2533e92
|
| | |\ \
| | |/
| |/|
| | | |
Change-Id: I182d51367aed4518f5bbc247e4e517af09028f7a
|
| | | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | | |
Previously, QVariant::toList() was used to convert a QVariant to a
QVariantList. This only works for actual QVariantLists and QStringList,
however. This patch uses QVariant::value<QVariantList>() which works in all
cases.
A better approach would be to extract a QSequentialIterable, but QTBUG-42016
currently prevents this.
Change-Id: I732cc88a6db2ec5d990760364a9db98a52521f6b
Reviewed-by: Milian Wolff <milian.wolff@kdab.com>
|
| |\ \ \
| |/ /
| | |
| | | |
Change-Id: Ied4f48229353749c4573d5c1b4817f0d00db1715
|
| | |\ \
| | |/
| | |
| | | |
Change-Id: I5e513b5e3adb6fc5d352663c9f6fd00219b302e3
|
| | | |\
| | | |
| | | |
| | | | |
Change-Id: I1be343e2b85d2e66675c97eccccb3b9923446aef
|
| | | |/
| | |
| | |
| | |
| | |
| | |
| | | |
+ 05327921fd125a6e33cb32344ac54a7b023f8c62 Bump version
Change-Id: I76187606b86ac0d726998a27ac30a35cda8e4a31
Reviewed-by: Jani Heikkinen <jani.heikkinen@qt.io>
|
| |\ \ \
| |/ /
| | |
| | | |
Change-Id: I8b70f062015311e0e3827fe001155d6ce1e146d2
|
| | | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | | |
This follows what was done in d28c9f6a for Qt Quick Controls 2.
The latest import version (e.g. 1.14 in Qt 5.14) will automatically be
registered whenever the Qt version is bumped.
This avoids needing to wait until a new type is added (or a new
revision is added to an existing type) before being able to use the
newest Qt Quick version.
Change-Id: I2570c2bc50c629101adb763e5e5f90bc3ded8bac
Reviewed-by: Milian Wolff <milian.wolff@kdab.com>
|
| | | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | | |
This returns a Promise if Promise is supported and no callback
is provided. The Promise resolves when the function call succeeds,
or rejects when it fails.
Change-Id: I529f5c2c0ff8997820f3d1b4d4b364cd8521e9b5
Reviewed-by: Milian Wolff <milian.wolff@kdab.com>
|
| | | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | | |
When an object is initialized, QObject properties are properly
unwrapped. However, before this patch, updates made to QObject
properties were not unwrapped and thus could not be used from
ECMAScript.
For example, given a property defined as such:
Q_PROPERTY(QObject* theProp READ theProp NOTIFY thePropChanged)
The property "theProp" is correctly unwrapped when the parent
object is created. However, it would not have been unwrapped
when "thePropChanged" is emitted. This patch corrects that.
Change-Id: If8f67560d9fb2a4bd909d2ab30305ceab30f8d31
Reviewed-by: Simon Hausmann <simon.hausmann@qt.io>
Reviewed-by: Milian Wolff <milian.wolff@kdab.com>
|
| |\ \ \
| |/ /
| | |
| | | |
Change-Id: Icd2d943af2304b3df3b1bc43bd8b55d9fd772964
|
| | |\ \
| | |/
| | |
| | |
| | |
| | |
| | | |
Conflicts:
.qmake.conf
Change-Id: I1983581b7f4d6eb10a223a94234b388e38226a07
|
| | | |
| | |
| | |
| | | |
Change-Id: I711c7bd9ad459aacace55fc0228808d884fc9286
|
| | | |\
| | | |
| | | |
| | | | |
Change-Id: I89ee14855ca6e6ebb3182124584a0b00d792206f
|
| | | |/
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | | |
+ 45bc3ab0bbc292be26b2bf0596487d9c7f2059d3 Bump version
+ c80cbce7ac3b38a45a38b57795c7eb19e5177a17 Remove warning when the notify signal has more than one argument
+ 38f097ba76fe5b26ccc15a5599e312336200e564 Correctly convert enums and QFlags from and to JSON
+ 38b5128c63ba38303f0587e03536ed546c1f2eca Correctly unwrap registered objects
+ d14c6aa5855ebfb8bb624efd7817bb3cdd4c96e4 Also add already wrapped objects to the transport-to-objects map
Change-Id: I8f186bc47f8df9608c340a02183fbc06429f4c14
Reviewed-by: Jani Heikkinen <jani.heikkinen@qt.io>
|
| |\ \ \
| |/ /
| | |
| | | |
Change-Id: Ida698daaae6d184137358ee49fa2d27b6654d8b3
|
| | | |
| | |
| | |
| | |
| | |
| | |
| | |
| | | |
Task-number: QTBUG-73739
Change-Id: I475d01064a76d73641ac8717cc51133863d22507
Reviewed-by: Kai Koehne <kai.koehne@qt.io>
Reviewed-by: Milian Wolff <milian.wolff@kdab.com>
Reviewed-by: Ulf Hermann <ulf.hermann@qt.io>
|
| | | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | | |
- add documentation to parameter \a objects
- correct link to example code
Change-Id: Idedfd749dad01315ee0073ca5a87399b9fa30d70
Reviewed-by: Venugopal Shivashankar <Venugopal.Shivashankar@qt.io>
Reviewed-by: Milian Wolff <milian.wolff@kdab.com>
|
| | | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | | |
This implements host-side overload resolution. If a client invokes a method
by its name instead of its id, the overload resolution tries to find the best
match for the given arguments.
The JavaScript client implementation now defaults to invocation-by-name, except
when a method is invoked by its full signature. In that case, the invocation
is still performed by method id.
Change-Id: I09f12bdbfee2e84ff66a1454608468113f96e3ed
Reviewed-by: Milian Wolff <milian.wolff@kdab.com>
|
| | | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | | |
When a new transport is accessing a previously wrapped object, we used
to send potentially outdated property values.
[ChangeLog][QWebChannel][General] Send current property values when
another transport is accessing a previously wrapped object.
Fixes: QTBUG-62388
Change-Id: I5cd5772b42c3cb9860e945bb85f77f0e3b6d6ea0
Reviewed-by: Frederik Gladhorn <frederik.gladhorn@qt.io>
|
| | | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | | |
Previously, we only published the first method or signal of any given
name. We keep this behavior for the nice JavaScript notation that looks
like a normal JavaScript method call `foo.bar(...)`. When you need to
call a different overloaded method, this patch offers you to specify
the explicit signature on the JavaScript side. I.e. when we have an
object with `foo(int i)` and `foo(const QString &str, int i)`, then
on the JavaScript a call to `obj.foo(...)` will always call the first
method like before. But now you can specify the full QMetaMethod
signature and call matching methods explicitly via `obj["foo(int)"]`
or `obj["foo(QString,int)"]`.
Automatic overload resolution on the C++ side for the nice notation
cannot easily be implemented: We need to know the return value of
the called function, otherwise we cannot construct a valid
QGenericReturnArgument. Furthermore, we wouldn't be able to
differentiate between e.g. any numeric types on the C++ side, since
JavaScript only has a single `double` type internally.
[ChangeLog][QWebChannel][General] It is now possible to explicitly
call overloaded methods or connect to overloaded signals by specifying
the full method or signal signature in string form on the JavaScript
side.
Fixes: QTBUG-73010
Change-Id: I4645edee97af56fd8d126e77d70dc33ed3513deb
Reviewed-by: Arno Rehn <a.rehn@menlosystems.com>
Reviewed-by: Frederik Gladhorn <frederik.gladhorn@qt.io>
Reviewed-by: Milian Wolff <milian.wolff@kdab.com>
|
| | | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | | |
We only disconnect once when all signals are disconnected, so we
should also only connect at most once per signal.
Change-Id: Ib3a866c3942bec5e06e3b301315bc83cdb972fab
Reviewed-by: Arno Rehn <a.rehn@menlosystems.com>
Reviewed-by: Frederik Gladhorn <frederik.gladhorn@qt.io>
|
| |\ \ \
| |/ /
| | |
| | | |
Change-Id: Ife028425ea8c14d972c2df59071a9333352af7d1
|
| | |\ \
| | |/
| | |
| | |
| | |
| | |
| | |
| | | |
Conflicts:
src/webchannel/qmetaobjectpublisher.cpp
Done-With: Arno Rehn <a.rehn@menlosystems.com>
Change-Id: I763a76cf055547c5c5e59511ded51c467d6c7526
|
| | | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | | |
Fixes a crash: Previously, when a connection was closed, the transport
was not removed from the list of transports of a wrapped objects. This
was because the transport was not added to the transport-to-object map
in the first place. When a property update was pushed, the now dangling
pointer to the "old" transport caused a crash.
Change-Id: Ib980f0b874851f8f85f7a3d76d51a2c884504b96
Reviewed-by: Frederik Gladhorn <frederik.gladhorn@qt.io>
|
| | | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | | |
Previously, only implicitly wrapped objects have been successfully
unwrapped. "Officially" registered objects were not, and thus could not
be passed to properties or as method arguments.
Change-Id: I6b8644ed3be8db3a66c2c1d5bc167fc33a0b4165
Reviewed-by: Frederik Gladhorn <frederik.gladhorn@qt.io>
|
| | | |
| | |
| | |
| | | |
Change-Id: I9c07b1adc8b6afea8c81db167d9705bf27bbd2af
|
| | | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | | |
QObjects that are present in an array are already converted to
an object identifier. This does the same for variant maps, which
end up as ECMAScript objects.
This allows QObjects put into a QVariantMap to be properly
deserialized. For example, if a property is declared as such:
Q_PROPERTY(QVariantMap propName READ propName CONSTANT)
And propName is:
QVariantMap propName() const {
QVariantMap map;
map.insert("theProperty", QVariant::fromValue(someQObject));
return map;
}
The "theProperty" property will now properly refer to the object.
Change-Id: I3c6e71b860f6825a31eb337aeffa55302287c8ff
Reviewed-by: Milian Wolff <milian.wolff@kdab.com>
|
| |\ \ \
| |/ /
| | |
| | | |
Change-Id: I07c095f8aa52f4aac1b91d645d65ba5143ed56ef
|
| | |\ \
|/ / /
| | _
| | |
Change-Id: I6b83cc26dddfafe3bebe1bfb3640e2daf2d9a8fb
|
| | |\
| | |
| | |
| | | |
Change-Id: I49e55df5f1c518ec62800572601e493f483faada
|
| | | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | | |
+ faab35b4f88c634510e56adcfa6f12f0fef548bb Bump version
+ 94fee0eaa3a5ce98bae8e5d68c91c0366fa94cdc Add changes file for Qt 5.11.3
+ 7aba0a480990090fd4412a262c93ec684b7ab908 Add binary compatibility file for QtWebChannel for Qt 5.12
+ 68ab691b04d14c8a5582c14842246b1041436094 Bump version
Change-Id: I6aed56c63e3ff8dba742e354d6f8ff5c7cbdb69a
Reviewed-by: Jani Heikkinen <jani.heikkinen@qt.io>
|
| | | |\
| | | |
| | | |
| | | | |
Change-Id: If92a74443a5747c3307b2683461ad677659de135
|
| | | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | | |
Binary compatibility file added.
Change-Id: I3faf447d11526f599fe826ac02d7f4c0815a7e8f
Reviewed-by: Milian Wolff <milian.wolff@kdab.com>
|
| | | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | | |
Previously, enums declared with Q_ENUM were stringified in the
conversion to JSON and QFlags did not work at all. The conversion of
QJsonValue(int) to enum worked fine, however. This patch implements
some extra logic for detecting enums and QFlags, thus correctly
converting to and from integers.
[ChangeLog] Enum values and QFlags are now correctly converted to and
from integers in the JS interface
Fixes: QTBUG-72924
Change-Id: I23d4a1120b805201c8d450edbd990aad5ad258a2
Reviewed-by: Frederik Gladhorn <frederik.gladhorn@qt.io>
|
| | | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | | |
The warning was not meaningful, since nothing depends on the notify
signal having only zero or one argument(s).
Removing this decreases warning noise in some applications.
Change-Id: Ieb716ad9ac51296a1e17899018d4e6190043b8d5
Reviewed-by: Frederik Gladhorn <frederik.gladhorn@qt.io>
|
| |\ \ \ \
| |/ / /
| | | |
| | | |
| | | |
| | | |
| | | | |
Conflicts:
.qmake.conf
Change-Id: I5e399965c268c2cd7c5dd0828729a6fbd6d97795
|
| | | |/
| |/|
| | |
| | | |
Change-Id: I892ab0f1a27edf60c9d5272b47e32a2e4639197f
|
