summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Regenerate projectswip/cmakeAlexandru Croitor2019-11-1566-97/+82
| | | | | | Change-Id: I08414933bad2e94f8f9a12ac7372570e838e31cd Reviewed-by: Qt CMake Build Bot Reviewed-by: Simon Hausmann <simon.hausmann@qt.io>
* Port QtRemoteObjects to CMakeJoerg Bornemann2019-11-12103-0/+2683
| | | | | | | Fixes: QTBUG-78175 Change-Id: I9e75992ac906778b9d04ccbe132445728ef65789 Reviewed-by: Qt CMake Build Bot Reviewed-by: Alexandru Croitor <alexandru.croitor@qt.io>
* Merge remote-tracking branch 'origin/dev' into wip/cmakeJoerg Bornemann2019-11-109-1806/+23
|\ | | | | | | Change-Id: I9754437ddfba80c2dd5fc1b281d46d1c0eb2e351
| * Merge remote-tracking branch 'origin/5.15' into devQt Forward Merge Bot2019-11-091-1/+1
| |\ | | | | | | | | | Change-Id: Ia7d7d76e8bbefcb66e7e16025593f6ae2a00a1c6
| | * Rename TARGET of tests/auto/qml/integration to tst_qmlintegrationJoerg Bornemann2019-11-081-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | We need unique target names for the CMake build, and there's already tst_integration in tests/auto/integration. This amends commit 24c7efea. Change-Id: Icee2b3756d51579981b17bfa17958e1b7362947f Reviewed-by: Brett Stottlemyer <bstottle@ford.com>
| * | Update dependencies on 'dev' in qt/qtremoteobjectsQt Submodule Update Bot2019-11-091-2/+2
| | | | | | | | | | | | | | | Change-Id: I3a045ccb6df437d1e00102a53988ba60cf757435 Reviewed-by: Simon Hausmann <simon.hausmann@qt.io>
| * | Update dependencies on 'dev' in qt/qtremoteobjectsQt Submodule Update Bot2019-11-051-2/+2
| | | | | | | | | | | | | | | Change-Id: Ia9a5c508d19ec7d1b477d948f527bab404446b53 Reviewed-by: Simon Hausmann <simon.hausmann@qt.io>
| * | Update dependencies on 'dev' in qt/qtremoteobjectsQt Submodule Update Bot2019-11-031-2/+2
| | | | | | | | | | | | | | | Change-Id: I79a463d3d8c0ed542a05e8eae2dfb566d5491f4e Reviewed-by: Simon Hausmann <simon.hausmann@qt.io>
| * | Update dependencies on 'dev' in qt/qtremoteobjectsQt Submodule Update Bot2019-11-021-2/+2
| | | | | | | | | | | | | | | Change-Id: I02dd63033492d9e0b96aae164e0e1a7e3b2fa031 Reviewed-by: Simon Hausmann <simon.hausmann@qt.io>
| * | Update dependencies on 'dev' in qt/qtremoteobjectsQt Submodule Update Bot2019-10-311-2/+2
| | | | | | | | | | | | | | | Change-Id: Ie9383ac66de58492243303bdf20761002560928d Reviewed-by: Simon Hausmann <simon.hausmann@qt.io>
| * | Update dependencies on 'dev' in qt/qtremoteobjectsQt Submodule Update Bot2019-10-291-2/+2
| | | | | | | | | | | | | | | Change-Id: I60d323aba2c35580b446567e77619a393d37d4a7 Reviewed-by: Simon Hausmann <simon.hausmann@qt.io>
| * | Merge remote-tracking branch 'origin/5.15' into devQt Forward Merge Bot2019-10-298-1805/+22
| |\| | | | | | | | | | Change-Id: I128ad940aede3e85d5242236c8f69515d23c7f6d
| | * Prospective build fix after changes in qtbase's bootstrap librarySimon Hausmann2019-10-285-1803/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The binary json conversion code was removed from the bootstrap library, which broke the repc build. However the part of repc that stopped compiling was the moc generator code, which repc doesn't use. Therefore the easiest way to fix the build is to simply remove that code from the build and delete code that's now unused. Change-Id: Iee763adc978f98c9bb5bf33817e4cd0cb5d76bc9 Reviewed-by: Ulf Hermann <ulf.hermann@qt.io>
| | * Merge remote-tracking branch 'origin/5.14' into 5.15Qt Forward Merge Bot2019-10-223-2/+22
| | |\ | | | | | | | | | | | | Change-Id: Ia864e4743e4be48171e9fe4751a60351a5555bce
| | | * QAbstractItemModelSourceAdapter: Fix MSVC warning about integer conversionv5.14.0-beta3Friedemann Kleint2019-10-211-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Use int, fixing: qremoteobjectabstractitemmodeladapter.cpp(258): warning C4267: 'argument': conversion from 'size_t' to 'int', possible loss of data Change-Id: If006f1b29012713a13bec96b566a5a9aa5942f25 Reviewed-by: Brett Stottlemyer <bstottle@ford.com>
| | | * Merge remote-tracking branch 'origin/5.13' into 5.14v5.14.0-beta2Qt Forward Merge Bot2019-10-191-0/+1
| | | |\ | | | | | | | | | | | | | | | Change-Id: I5b734d87ffdb798246e16727d916b489d7c23aa9
| | | | * Ensure default enum registration uses matching sizeMichael Brasser2019-10-181-0/+1
| | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: I241260b53e7faaaf4ea1b6cb7ba6235abe865713 Reviewed-by: Brett Stottlemyer <bstottle@ford.com>
| | | * | Update plugins.qmltypes for 5.14Kai Koehne2019-10-091-1/+20
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Task-number: QTBUG-78690 Change-Id: I145ce478a4356f08752f173878f6e96e6626321c Reviewed-by: Kai Koehne <kai.koehne@qt.io> Reviewed-by: Michael Brasser <michael.brasser@live.com>
| * | | | Update dependencies on 'dev' in qt/qtremoteobjectsQt Submodule Update Bot2019-10-261-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: I0e5ac00a076f9d08a48db88fffc01ffd8e548237 Reviewed-by: Simon Hausmann <simon.hausmann@qt.io>
* | | | | Merge remote-tracking branch 'origin/dev' into wip/cmakeJoerg Bornemann2019-11-062-63/+49
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: dependencies.yaml Change-Id: Ia0c99e1ba09138c8c70527dabd2584f2dbfe1007
| * | | | Make file lists in remoteobjects.pro consistentJoerg Bornemann2019-10-251-56/+49
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fix line continuations of the last list entry, because removing the empty line between the lists will lead to "interesting" effects. Remove the $$PWD/ prefix, because that's implict for .pro files. Remove split into PRIVATE_HEADERS and PUBLIC_HEADERS, because pro2cmake cannot cope with it, and the distinction is obvious from the _p.h suffix. Sort the lists. Change-Id: I59170f40892193795fdc79167f03b2bfe2fbfe25 Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org> Reviewed-by: Alexandru Croitor <alexandru.croitor@qt.io>
| * | | | Update dependencies on 'dev' in qt/qtremoteobjectsQt Submodule Update Bot2019-10-241-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: I0403608d08b09b495a391c93714c883df56e266a Reviewed-by: Simon Hausmann <simon.hausmann@qt.io>
| * | | | Update dependencies on 'dev' in qt/qtremoteobjectsQt Submodule Update Bot2019-10-221-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: I482d1c3a1c8cfd36af05387e12097cf2b9b1109b Reviewed-by: Simon Hausmann <simon.hausmann@qt.io>
| * | | | Update dependencies on 'dev' in qt/qtremoteobjectsQt Submodule Update Bot2019-10-181-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: Ib5271a4ed5e7e5dbf53ff6271101a5fa19a4fdc3 Reviewed-by: Simon Hausmann <simon.hausmann@qt.io>
| * | | | Update dependencies on 'dev' in qt/qtremoteobjectsQt Submodule Update Bot2019-10-171-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: I9ea3bdd3a250ce5c211b908bdb0e0ae1b1ee6366 Reviewed-by: Simon Hausmann <simon.hausmann@qt.io>
| * | | | Update dependencies on 'dev' in qt/qtremoteobjectsQt Submodule Update Bot2019-10-171-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: Ic4f5d6c75d8c369ea4a0802833603af7be325926 Reviewed-by: Simon Hausmann <simon.hausmann@qt.io>
| * | | | Update dependencies on 'dev' in qt/qtremoteobjectsQt Submodule Update Bot2019-10-161-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: Ie81ef23ba1ab46a4ba671a9808e9e417c09922bd Reviewed-by: Simon Hausmann <simon.hausmann@qt.io>
| * | | | Update dependencies on 'dev' in qt/qtremoteobjectsQt Submodule Update Bot2019-10-161-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: I329590eea4f90d3391b319987082534a138237ac Reviewed-by: Simon Hausmann <simon.hausmann@qt.io>
| * | | | Update dependencies on 'dev' in qt/qtremoteobjectsQt Submodule Update Bot2019-10-151-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: I7308ae39a72ec68c33409ec74c983430d0e76d28 Reviewed-by: Simon Hausmann <simon.hausmann@qt.io>
| * | | | Update dependencies on 'dev' in qt/qtremoteobjectsQt Submodule Update Bot2019-10-131-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: Ide5496170603841e750fe3d5b2928bdd5773dbd4 Reviewed-by: Simon Hausmann <simon.hausmann@qt.io>
| * | | | Update dependencies on 'dev' in qt/qtremoteobjectsQt Submodule Update Bot2019-10-101-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: I3c33efa2c11561faae7e0de1fa1ba40390386fbe Reviewed-by: Simon Hausmann <simon.hausmann@qt.io>
* | | | | Merge remote-tracking branch 'origin/dev' into wip/cmakeQt Forward Merge Bot2019-10-0958-717/+7607
|\| | | | | | | | | | | | | | | | | | | Change-Id: I1336fe145947c801a572a842baeb79a70d58c8a5
| * | | | Merge remote-tracking branch 'origin/5.15' into devQt Forward Merge Bot2019-10-0923-26/+158
| |\| | | | | | | | | | | | | | | | | | Change-Id: If440f80c2c71f0fab59f87317202cf0d849e63ca
| | * | | Remove empty qresource entry from clientapp.qrcJoerg Bornemann2019-10-091-1/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This entry is pointless, and pro2cmake trips over it. Change-Id: I474e6d8f130405cfce34690184dc94d063d00fad Reviewed-by: Brett Stottlemyer <bstottle@ford.com>
| | * | | Name tests and test helpers uniquelyJoerg Bornemann2019-10-0813-18/+18
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Several build tools (e.g. MSBuild and CMake) do not support duplicate application names in the project. Change-Id: I28da2c3f25f126bee35cb7a827be80e63689c8f4 Reviewed-by: Brett Stottlemyer <bstottle@ford.com>
| | * | | Remove failed attempts of adding generated header filesJoerg Bornemann2019-10-073-3/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Line continuations were missing which made the lines no-ops, and adding generated header files this way is unnecessary. Change-Id: I2697cbb1e2c19bd7b6d56b45b01070ed0b23db8a Reviewed-by: Brett Stottlemyer <bstottle@ford.com>
| | * | | Add missing include guard to namespace.hJoerg Bornemann2019-10-071-0/+5
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The missing include guard will break the CMake build that uses mocs_compilation.cpp file that indirectly includes namespace.h twice. Change-Id: I403db6d33fca14adf71ca941cd2e0aee6e4d44d1 Reviewed-by: Brett Stottlemyer <bstottle@ford.com>
| | * | | repc: Use declarative approach in moc.priJoerg Bornemann2019-10-071-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The assignment is technically correct but pro2cmake cannot handle it properly. Append to SOURCES and HEADERS instead, as this doesn't make a real difference to the QMake project. Change-Id: I1360c96d25be09b767b54553a9aed8cb0f4768b1 Reviewed-by: Brett Stottlemyer <bstottle@ford.com>
| | * | | Merge remote-tracking branch 'origin/5.14' into 5.15Qt Forward Merge Bot2019-10-053-0/+90
| | |\| | | | | | | | | | | | | | | | | Change-Id: Ifa59b898bcf2dba387e2b19691da3639c377d098
| | | * | Add basic documentation for QRemoteObjectPendingCall and friendsMichael Brasser2019-10-033-0/+90
| | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: I359e890b6b4d2ff587f5445c677f04e47e16cdd0 Reviewed-by: Brett Stottlemyer <bstottle@ford.com>
| | * | | Merge "Merge remote-tracking branch 'origin/5.14' into 5.15"Qt Forward Merge Bot2019-09-282-0/+41
| | |\ \ \
| | | * | | Merge remote-tracking branch 'origin/5.14' into 5.15Qt Forward Merge Bot2019-09-282-0/+41
| | |/| | | | | | |/ / | | | | | | | | | | Change-Id: I2334e8135aea2a90134ba39dd9eb74468298a178
| | | * | Merge "Merge remote-tracking branch 'origin/5.13' into 5.14"v5.14.0-beta1v5.14.0-alpha1Qt Forward Merge Bot2019-09-212-0/+41
| | | |\ \
| | | | * | Merge remote-tracking branch 'origin/5.13' into 5.14Qt Forward Merge Bot2019-09-212-0/+41
| | | |/| | | | | | |/ | | | | | | | | | | Change-Id: I2c31b2ae158e25d9c27c09b70a5e2e04fa75e824
| | | | * Merge "Merge remote-tracking branch 'origin/5.12' into 5.13"Qt Forward Merge Bot2019-09-081-0/+20
| | | | |\
| | | | | * Merge remote-tracking branch 'origin/5.12' into 5.13Qt Forward Merge Bot2019-09-081-0/+20
| | | | |/| | | | | | | | | | | | | | | | | | | Change-Id: I14d339ab63167c776904e281288f9603d8f0de24
| | | | | * Merge "Merge remote-tracking branch 'origin/5.12.5' into 5.12"Qt Forward Merge Bot2019-09-071-0/+20
| | | | | |\
| | | | | | * Merge remote-tracking branch 'origin/5.12.5' into 5.12Qt Forward Merge Bot2019-09-071-0/+20
| | | | | |/| | | | | | | | | | | | | | | | | | | | | | Change-Id: I3180d7bdfbe26fc0a603d89ad6ad67c46c6874c1
| | | | | | * Add changes file for Qt 5.12.5v5.12.5Antti Kokko2019-08-261-0/+20
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | + fafb11943fac1a4a452b3db70ab604ff5aa1e281 Bump version + 1a924ee6bb250aa0a8d64d66491950bc3d86091e Fix yet another -Wdeprecated-copy warning + c973a6eb63b52db6bcb4c15854797228903fc756 Fix reported error for Handshake + 68f6423ac6e0d49bb02ae36bf29765688f271d18 Fix TestModelView::testModelTest flakiness - again + 2bcda9d9f45858ac196d9972162c870ac0a6f217 QRemoteObjectPendingReply: fix GCC -Wdeprecated-copy Change-Id: I3865681f2e21b735a6e061de486c9d93bfef6242 Reviewed-by: Michael Brasser <michael.brasser@live.com>
| | | | * | | Merge "Merge remote-tracking branch 'origin/5.13.1' into 5.13"Qt Forward Merge Bot2019-09-061-0/+21
| | | | |\ \ \
generated by cgit v1.2.3 (git 2.25.1) at 2024-06-24 20:39:24 +0000