summaryrefslogtreecommitdiffstats
path: root/src
Commit message (Collapse)AuthorAgeFilesLines
...
* Fix the QNX buildSona Kurazyan2021-04-153-4/+8
| | | | | | | | | | | | | The check if USE_HAM is defined (to include the 'ham' library) was not ported to CMake correctly. Added a CMake build option for optionally enabling QNX's HAM, and fixed the check accordingly. Fixed other build errors. Fixes: QTBUG-92845 Change-Id: I43b55b02fefbdcc1779d3eecf4c37c87cbc02b9f Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org> Reviewed-by: Alexandru Croitor <alexandru.croitor@qt.io>
* Document the modelviewclient and server examplesMårten Nordheim2021-03-241-2/+2
| | | | | | | | | | | | They're simple, which makes them easy to follow. Adjusted the qtremoteobjects.qdocconf file as it wasn't working with the examples on my Linux machine at least. Task-number: QTBUG-90848 Change-Id: Id674585835717be87344f3f694ab77128ecb5344 Reviewed-by: Sona Kurazyan <sona.kurazyan@qt.io> Reviewed-by: Paul Wicking <paul.wicking@qt.io>
* Fix documentation mishapsMårten Nordheim2021-03-171-4/+4
| | | | | | | | | | I'm somewhat scatterbrained, so when applying the parenthesis to the functions in one of the patchsets I only did it on one function. I also forgot to prepend the classname to the signal name (generating a qdoc warning.) Change-Id: I40b7960376203b831d5aa2d00078ecbac30f713e Reviewed-by: Paul Wicking <paul.wicking@qt.io>
* Reimplement QAIM:multiData for QAbstractItemModelReplicaSona Kurazyan2021-03-163-27/+75
| | | | | | | | | | | Reimplemented the QAbstractItemModelReplica::multiData method. This will allow fetching data for multiple roles in a more efficient way. Also made use of it in the implementation, the users that reimplement QAIM::multiData for their models may benefit from it. Change-Id: Iac8bdb5a3a6b45afb87e7f8187a2f3a6e73c7b7e Reviewed-by: Brett Stottlemyer <bstottle@ford.com>
* Document QAbstractItemModelReplicaMårten Nordheim2021-03-151-0/+107
| | | | | | | | | | This patch adds the missing documentation to QAbstractItemModelReplica. Fixes: QTBUG-90823 Task-number: QTBUG-90848 Change-Id: Iae8784e522da691b5bcceaebae64eed5712fc051 Reviewed-by: Sona Kurazyan <sona.kurazyan@qt.io> Reviewed-by: Paul Wicking <paul.wicking@qt.io>
* Add the Qt 6 porting guideMårten Nordheim2021-03-111-0/+54
| | | | | | | | | With the known differences so far Task-number: QTBUG-90848 Change-Id: I18bfc6e32b7dc6a5ff56b431f5a65ceea6c19a43 Reviewed-by: Paul Wicking <paul.wicking@qt.io> Reviewed-by: Sona Kurazyan <sona.kurazyan@qt.io>
* Switch to using QStringView in a handful of functionsMårten Nordheim2021-03-102-5/+5
| | | | | | | | | | The functions don't take a copy, and does not need a QString for other purposes (e.g. QMap::contains(QString)), so they can be a QStringView. Task-number: QTBUG-90907 Change-Id: I05ad4cc4648ecb970a058dd914be76fe8468a446 Reviewed-by: Sona Kurazyan <sona.kurazyan@qt.io>
* Various documentation fixesMårten Nordheim2021-03-095-24/+59
| | | | | | | | | | Reflowed very long lines. 0 meaning 'nullptr' changed to \nullptr. Typos fixed. Task-number: QTBUG-90848 Change-Id: Ieeae60047203dee829adae84c900692aa94a45e3 Reviewed-by: Sona Kurazyan <sona.kurazyan@qt.io>
* ExternalIODevice fixesBrett Stottlemyer2021-03-092-1/+9
| | | | | | | | | | Make sure the input QIODevice is valid and the disconnect signal (if available) is connected. Task-number: QTBUG-84640 Pick-to: 5.15 5.12 Change-Id: I9e65dc903ce0e92da4f4a1e07fd5d6b66815e2a4 Reviewed-by: Sona Kurazyan <sona.kurazyan@qt.io>
* Fix build with qtdeclarative and remove deprecated CMake APIJoerg Bornemann2021-03-056-12/+12
| | | | | | | | | | | | The qtremoteobjects QML module target needed to be renamed to not clash with the qtremoteobjects target in src/remoteobjects. Usage of deprecated API was fixed. Change-Id: I2980889d844a8cb4f2b83482a374264e255e1958 Reviewed-by: Alexey Edelev <alexey.edelev@qt.io> Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org> Reviewed-by: Brett Stottlemyer <bstottle@ford.com> Reviewed-by: Fabian Kosmale <fabian.kosmale@qt.io>
* Document the QtRemoteObjects namespaceMårten Nordheim2021-03-031-0/+9
| | | | | | | | | | Fixes a new qdoc error now that QtRemoteObjects::InitialAction was documented but the namespace was not. Task-number: QTBUG-90848 Change-Id: I882e052316d3328c8cb88ea5266dee0938dadef3 Reviewed-by: Sona Kurazyan <sona.kurazyan@qt.io> Reviewed-by: Paul Wicking <paul.wicking@qt.io>
* qHash now uses size_tMårten Nordheim2021-03-031-1/+1
| | | | | | Task-number: QTBUG-90907 Change-Id: Ife2132bda00e19f4b03ca9299d3626369a1bf632 Reviewed-by: Brett Stottlemyer <bstottle@ford.com>
* Document the QtRemoteObjects::InitialAction enum and its usageSona Kurazyan2021-03-022-6/+26
| | | | | | | | | Task-number: QTBUG-90848 Pick-to: 5.15 Change-Id: I72226f262bfb90c542974aeb9a326f1f4cd2827b Reviewed-by: Paul Wicking <paul.wicking@qt.io> Reviewed-by: Mårten Nordheim <marten.nordheim@qt.io> Reviewed-by: Brett Stottlemyer <bstottle@ford.com>
* Fix prefetching data for QAIM when no roles hint is providedSona Kurazyan2021-03-021-1/+1
| | | | | | | | | | | In the prefetch mode, if no roles hint is specified, the data for all available roles is prefetched. However, when actually fetching the data, the empty roles list was being passed. Pick-to: 5.15 Change-Id: Ib55cdfa02ebe98ba45799cbd2c86cf23f1c65d9a Reviewed-by: Mårten Nordheim <marten.nordheim@qt.io> Reviewed-by: Brett Stottlemyer <bstottle@ford.com>
* Migrate from old signal/slot connection syntax (part 2)Sona Kurazyan2021-02-261-5/+5
| | | | | | | | | Change the syntax also for the connections that involve types that are defined in the repc-generated files. Pick-to: 5.15 5.12 Change-Id: I222a59c8fae438c5f0026e66a75d0fa905e49ccf Reviewed-by: Michael Brasser <michael.brasser@live.com>
* Clean-up integer conversion warningsSona Kurazyan2021-02-266-23/+25
| | | | | Change-Id: Ib1229eb973066a7500cb759082a1a3a7ce978bfa Reviewed-by: Brett Stottlemyer <bstottle@ford.com>
* Simplify deserializeQVariantListMårten Nordheim2021-02-251-9/+3
| | | | | | | | | | | | The loop continuously removing the last element is the same as resize() (Qt5 QList didn't have a resize) Avoid constructing temporaries Write directly to the item which is in the list or construct an item in-place and then write to that. Change-Id: I89f7dae138ecebe85762b457c7e731ccbf71d6cd Reviewed-by: Sona Kurazyan <sona.kurazyan@qt.io> Reviewed-by: Brett Stottlemyer <bstottle@ford.com>
* Migrate from old signal/slot connection syntaxSona Kurazyan2021-02-254-12/+14
| | | | | | | | | | Exception is made for the cases, when the signals/slots are not known at compile-time (i.e. involve dynamic replicas) or are defined in the repc-generated files. Pick-to: 5.15 5.12 Change-Id: Ice1fc78b59c713480531292a0401795df75523d7 Reviewed-by: Brett Stottlemyer <bstottle@ford.com>
* Add a dependency on the repc executable for the custom commandMårten Nordheim2021-02-231-6/+10
| | | | | | | | To make it rerun the rep compiler for the test .rep-files if it has been updated Change-Id: Ife68ff0def8d53ed2d19cdd950a6da00c7204d7e Reviewed-by: Alexey Edelev <alexey.edelev@qt.io> Reviewed-by: Brett Stottlemyer <bstottle@ford.com>
* Clean-up warningsSona Kurazyan2021-02-2211-61/+61
| | | | | | | | | | | | | Fixed the following warnings: - empty expression statement has no effect; remove unnecessary ';' - use of old-style cast - zero as null pointer constant - other minor things Change-Id: Ia672f48d2aa87c59354fc93fd19862f1875e13db Reviewed-by: Brett Stottlemyer <bstottle@ford.com> Reviewed-by: Mårten Nordheim <marten.nordheim@qt.io>
* Replace discouraged Q_MOVABLE_TYPE by Q_RELOCATABLE_TYPEAndreas Buhr2021-02-222-13/+13
| | | | | | | | | | | | | Q_MOVABLE_TYPE was conceived before C++ had move semantics. Now, with move semantics, its name is misleading. Q_RELOCATABLE_TYPE was introduced as a synonym to Q_MOVABLE_TYPE. Usage of Q_MOVABLE_TYPE is discouraged now. This patch replaces all usages of Q_MOVABLE_TYPE by Q_RELOCATABLE_TYPE in QtRemoteObjects. As the two are synonymous, this patch should have no impact on users. Task-number: QTBUG-86829 Change-Id: Ib7c495c6d4c1d6fdc5e79145bf8a274b7deb0f51 Reviewed-by: Mårten Nordheim <marten.nordheim@qt.io>
* Use QList instead of QVectorJarek Kobus2021-02-1618-163/+160
| | | | | | | | | Task-number: QTBUG-84469 Task-number: QTBUG-90907 Change-Id: Ifc6f05fb5e17e32ec04b383770080e812c854510 Reviewed-by: Sona Kurazyan <sona.kurazyan@qt.io> Reviewed-by: Jarek Kobus <jaroslaw.kobus@qt.io> Reviewed-by: Brett Stottlemyer <bstottle@ford.com>
* Avoid constructing QMetaType from type id when possibleSona Kurazyan2021-02-166-36/+34
| | | | | | Change-Id: I013bd3f3a6e7bb9e2a4ff45a3ca9534048643144 Reviewed-by: Mårten Nordheim <marten.nordheim@qt.io> Reviewed-by: Brett Stottlemyer <bstottle@ford.com>
* Doc: remove extra close parenthesesTasuku Suzuki2021-02-162-2/+2
| | | | | Change-Id: Ide3e33437a7cf3a6378a48b9390fc36dbb669b38 Reviewed-by: Michael Brasser <michael.brasser@live.com>
* Fix loop warningsBrett Stottlemyer2021-02-151-3/+3
| | | | | Change-Id: Id7c197e3bf89c0bbdf727f529dd28ab548a6d063 Reviewed-by: Volker Hilsheimer <volker.hilsheimer@qt.io>
* Fix QMetaType Deprecation warningsBrett Stottlemyer2021-02-156-60/+68
| | | | | Change-Id: If7de5da3e7ad6d345e8b483486bb7177bccbc0df Reviewed-by: Fabian Kosmale <fabian.kosmale@qt.io>
* Whitespace fixesBrett Stottlemyer2021-02-151-95/+95
| | | | | Change-Id: Ica069d9d0fb39043ab44f19aa44d6e080f69b0f8 Reviewed-by: Sona Kurazyan <sona.kurazyan@qt.io>
* Metaobject cleanupBrett Stottlemyer2021-02-151-16/+13
| | | | | | | | | | Remove no longer used GadgetSaveOperator and GadgetLoadOperator methods and add GadgetDebugStreamFn method. Change-Id: I3444c6b67307007330b63e7bf0a2f55a39271312 Reviewed-by: Sona Kurazyan <sona.kurazyan@qt.io> Reviewed-by: Mårten Nordheim <marten.nordheim@qt.io> Reviewed-by: Fabian Kosmale <fabian.kosmale@qt.io>
* Fix compilation with Qt 6Sona Kurazyan2021-02-1511-103/+168
| | | | | | | Task-number: QTBUG-90685 Change-Id: Iba9ee0a28ec0ceeca5ae318204deb14190042533 Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org> Reviewed-by: Brett Stottlemyer <bstottle@ford.com>
* Fix crash with same-named subobjects or modelsMichael Brasser2020-07-282-6/+7
| | | | | | | | Differentiate between subobjects or models coming from different primary objects. Change-Id: Ic4360ae208edbe31a1130f60248a501d63e55773 Reviewed-by: Brett Stottlemyer <bstottle@ford.com>
* Update dependencies.yamlMichael Brasser2020-07-272-1/+24
| | | | | Change-Id: Ic4bfe4ba2173c84c743f4c972db216e6bbd30211 Reviewed-by: Brett Stottlemyer <bstottle@ford.com>
* Don't connect overloaded signalsMichael Brasser2020-07-271-4/+28
| | | | | | | | Otherwise we can end up with superfluous emissions from the replica. Pick-to: 5.15 Change-Id: I50d556d532025f39e692d601d68b414b3c4806fb Reviewed-by: Brett Stottlemyer <bstottle@ford.com>
* Remove QtQml.RemoteObjects compatibility importMichael Brasser2020-07-247-182/+0
| | | | | | | | | | | This import was included in 5.12+ for compatibility with the tech preview only. Remove it for Qt 6. [ChangeLog][QML] Remove the QtQml.RemoteObjects import used in the tech preview. The QtRemoteObjects import should be used instead. Change-Id: I5ac074feff8eeac0ce0e915bb15dd022c7cd3a8f Reviewed-by: Brett Stottlemyer <bstottle@ford.com>
* [Repc] Remove moc_copy in favor of json inputBrett Stottlemyer2020-07-211-1/+30
| | | | | | | | | | The json input needs to be generated by moc with --output-json option. This also copies the qmake required pri/prf files to qtbase, and updates them so qmake works with --output-json as well. Change-Id: I172794f0c7c85f6e8fcd03654eecd3776f49e521 Reviewed-by: Michael Brasser <michael.brasser@live.com>
* Mark a couple of TODO itemsBrett Stottlemyer2020-06-291-1/+1
| | | | | | Change-Id: I4426e6a27ce666a0d0090b2f21a16242aec302b5 Reviewed-by: Alexandru Croitor <alexandru.croitor@qt.io> Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org>
* Update via run_pro2cmake.pyBrett Stottlemyer2020-06-296-4/+8
| | | | | | | ... and address special cases Change-Id: I2ceb88e9505c59fe48dd4612cfed82935eb2dfc4 Reviewed-by: Alexandru Croitor <alexandru.croitor@qt.io>
* Add ; to Q_UNUSEDLars Schmertmann2020-06-291-1/+1
| | | | | | | | This is required to remove the ; from the macro with Qt 6. Task-number: QTBUG-82978 Change-Id: Ib62dc7739fcc494e1c111053f0f5d52663b174a9 Reviewed-by: Brett Stottlemyer <bstottle@ford.com>
* Fix proxy_testBrett Stottlemyer2020-06-291-0/+1
| | | | | | | | | | It had a memory leak that caused the test failure with Qt6 on windows. Fixes a couple of warnings in the test as well. Pick-to: 5.15 5.12 Change-Id: I747357d8514bd2c00648b0db3ea3b4aab3c2982f Reviewed-by: Alexandru Croitor <alexandru.croitor@qt.io>
* Doc: Update docs with cmake package informationNico Vertriest2020-06-251-0/+1
| | | | | | Task-number: QTBUG-85179 Change-Id: I429d89f599c83a11a5f0b6a5c545b83fe9ff5bcf Reviewed-by: Brett Stottlemyer <bstottle@ford.com>
* Also reconnect on QLocalSocket::PeerClosedErrorMister Benjamin2020-06-191-0/+1
| | | | | | | Fixes: QTBUG-85137 Pick-to: 5.15 5.12 Change-Id: I1fb96f5779361613bbe1b9ca272856aa579e7f17 Reviewed-by: Brett Stottlemyer <bstottle@ford.com>
* Merge remote-tracking branch 'origin/wip/cmake' into devAlexandru Croitor2020-06-1610-0/+376
|\ | | | | | | | | | | | | Conflicts: dependencies.yaml Change-Id: I01be97466ce583c1852c00986d1e925dda80038c
| * Regenerate projectswip/cmakeAlexandru Croitor2019-11-157-20/+13
| | | | | | | | | | | | Change-Id: I08414933bad2e94f8f9a12ac7372570e838e31cd Reviewed-by: Qt CMake Build Bot Reviewed-by: Simon Hausmann <simon.hausmann@qt.io>
| * Port QtRemoteObjects to CMakeJoerg Bornemann2019-11-1210-0/+383
| | | | | | | | | | | | | | Fixes: QTBUG-78175 Change-Id: I9e75992ac906778b9d04ccbe132445728ef65789 Reviewed-by: Qt CMake Build Bot Reviewed-by: Alexandru Croitor <alexandru.croitor@qt.io>
* | Qt6: Port QtRemoteObjects from QStringRef to QStringViewKarsten Heimrich2020-06-151-6/+7
| | | | | | | | | | | | Task-number: QTBUG-84319 Change-Id: I550476383f725ddfa8fbec61322cc190b34b3f4c Reviewed-by: Brett Stottlemyer <bstottle@ford.com>
* | Update dependencies.yamlBrett Stottlemyer2020-06-152-36/+27
| | | | | | | | | | | | | | | | This updates the SourceAPI lookups for changes in QMetaMethod and removes an outdated template method to register PendingReply types. Change-Id: I922805461f587d45d8d8d4fc9b386aaafbce9500 Reviewed-by: Fabian Kosmale <fabian.kosmale@qt.io>
* | Fix broken testsBrett Stottlemyer2020-06-122-36/+58
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This addresses the regressions from moving to Qt6's metatype changes. The underlying changes in QtBase allow for better compile time support for type generation and automatically clear dynamically generated types based on reference count. There are three primary fixes. 1) For Gadgets, the constructor needs to copy the original QVariantList instance in to the newly constructed value. This is the only way the types of the variants will be known for the QDataStream `>>` operator to work. 2) Enum registration needs to occur _before_ the metaobjectbuilder's toMetaObject() method is called in order for property metaobject's to be defined. 3) A little surprisingly, it is the id() method on the QMetaType that does the actual registration, and the object this is called on needs to be kept around to keep the reference count and prevent unregistration. Fixes: QTBUG-83333 Task-number: QTBUG-84590 Change-Id: Ie93ff60276177c3c713dd0bd3bfc08a03cf98e07 Reviewed-by: Friedemann Kleint <Friedemann.Kleint@qt.io> Reviewed-by: Fabian Kosmale <fabian.kosmale@qt.io>
* | Add repc MERGED support for cmakeAndreas Bacher2020-06-071-1/+4
| | | | | | | | | | | | | | | | | | Extends the cmake tooling to support "merged" headers with both source and replica classes defined in a single header. Task-number: QTBUG-79536 Pick-to: 5.15 Change-Id: I4f6d077bba77b3cfe052c3f079325c175ab8ade6 Reviewed-by: Brett Stottlemyer <bstottle@ford.com>
* | Update dependenciesBrett Stottlemyer2020-06-013-135/+46
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This required removal of QRegExp and full conversion to QRegularExpression. In 5.x, we needed QRegExp, as the "bootstrap" minimal configuration for building host tools for cross-compilation did not include the QRegularExpression components. One of the tests was also converted from using the Qt::DateFormat enum to using the Qt::DayOfWeek enum, as several of the used DateFormat enums were removed in Qt6. Fixes: QTBUG-72592 Task-number: QTBUG-84590 Change-Id: I3414e6c106407819790de9cd179914ed45ece07e Reviewed-by: Michael Brasser <michael.brasser@live.com>
* | Merge remote-tracking branch 'origin/5.15' into devQt Forward Merge Bot2020-04-0715-12/+390
|\ \ | | | | | | | | | Change-Id: I61c056e5c7d48e20a1ed801c2ca362521af2f190
| * | cmake: Document qt5_generate_repcv5.15.0-beta4Kai Koehne2020-04-026-0/+303
| | | | | | | | | | | | | | | | | | | | | Task-number: QTBUG-82461 Change-Id: I30b30847d5ad8dd893393095c91c51d85390d90c Reviewed-by: Leena Miettinen <riitta-leena.miettinen@qt.io> Reviewed-by: Alexandru Croitor <alexandru.croitor@qt.io>
generated by cgit v1.2.3 (git 2.25.1) at 2025-08-21 20:46:49 +0000