summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* qtlite: Skip building examples when configured with no-feature-itemviewsv5.10.15.10Rainer Keller2018-01-312-0/+2
| | | | | | Task-number: QTBUG-53141 Change-Id: I02d6bfe07c02a9d156b648158116f24552bf1a16 Reviewed-by: Kevin Funk <kevin.funk@kdab.com>
* Merge remote-tracking branch 'origin/5.9' into 5.10Liang Qi2018-01-180-0/+0
|\ | | | | | | | | | | | | Conflicts: .qmake.conf Change-Id: Id9b872ae916efdbbb46c166cf741f73867795bcc
| * Fix license headersv5.9.4Jani Heikkinen2017-12-2010-120/+180
| | | | | | | | | | | | | | | | | | Old header.LGPL21 header was used at some files. Replase those with new header.LGPL one Task-number: QTBUG-57147 Change-Id: I117e72a490af1ae0b2fc5e0a13ad2b883a80921a Reviewed-by: Brett Stottlemyer <bstottle@ford.com>
| * Bump versionOswald Buddenhagen2017-12-121-1/+1
| | | | | | | | Change-Id: I23a21d77835e9e9327d6c19bfed6c67e68ba5c08
* | Fix license headersJani Heikkinen2018-01-1510-127/+187
| | | | | | | | | | | | | | | | old header.LGPL21 was used in some src files. Replace those with correct header.LGPL one Change-Id: I0042bfba57d7f4f0f62531c9257c9ba5acfb64fa Reviewed-by: Liang Qi <liang.qi@qt.io>
* | Fix TestModelView::testModelTest flakinessSami Nurmenniemi2017-12-291-1/+1
| | | | | | | | | | | | | | | | | | It seems fetchAndWait() takes between 7s to 12s on the CI/Qemu, increase timeout from 10s to 15s. Task-number: QTBUG-63152 Change-Id: I3521572cd82156c621f751feec723668485c03c8 Reviewed-by: Brett Stottlemyer <bstottle@ford.com>
* | Bump versionOswald Buddenhagen2017-12-201-1/+1
| | | | | | | | Change-Id: I68d47eecd261f15c883cd75e56ba48b25da6f12b
* | Merge remote-tracking branch 'origin/5.9' into 5.10v5.10.0-rc3v5.10.0-rc2v5.10.0-rc1v5.10.0Liang Qi2017-11-1510-10/+110
|\| | | | | | | Change-Id: I0825d6b95aaed14230b0677531b1d6e79cf55db8
| * Fix outdated BSD license headerv5.9.3Liang Qi2017-11-0810-10/+110
| | | | | | | | | | | | Task-number: QTBUG-64358 Change-Id: I4c1fe67cd48dddb57489f67d597e0f219f2d2ce2 Reviewed-by: Kai Koehne <kai.koehne@qt.io>
* | Update to new QRandomGenerator APIv5.10.0-beta4Thiago Macieira2017-11-031-1/+1
| | | | | | | | | | Change-Id: I69f37f9304f24709a823fffd14e676c097712329 Reviewed-by: Brett Stottlemyer <bstottle@ford.com>
* | Merge remote-tracking branch 'origin/5.9' into 5.10Liang Qi2017-11-035-10/+18
|\| | | | | | | | | | | | | | | Conflicts: .qmake.conf tests/auto/auto.pro Change-Id: I628deb6c3b8c36c24e228274b4e3d3e1c8cf7bce
| * Fix clazy-detaching-temporaryFriedemann Kleint2017-10-193-7/+12
| | | | | | | | | | Change-Id: I9429533aefa4b006e7e1e74e19152dc138ad54ca Reviewed-by: Brett Stottlemyer <bstottle@ford.com>
| * Bump versionOswald Buddenhagen2017-10-061-1/+1
| | | | | | | | Change-Id: I38ef891ce516c401baf374a1391dfd656fa17b20
| * Fix build with -no-feature-processJake Petroules2017-10-052-3/+6
| | | | | | | | | | Change-Id: I7705ad1add6b28ce15fb5f1b0240683e302dd394 Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@qt.io>
* | Send also the methods and then signals parameter namesBogDan Vatra2017-11-0210-5/+121
| | | | | | | | | | | | | | | | [ChangeLog] The methods and then signals parameter names are useful when acquire a dynamic object. Change-Id: I2b2acfc06c66de0bc4684fda0cc43c364a575ccb Reviewed-by: Brett Stottlemyer <bstottle@ford.com>
* | Send enum detailsBogDan Vatra2017-11-0212-23/+151
| | | | | | | | | | | | | | [ChangeLog] enum details are useful when acquire a dynamic object. Change-Id: Ic926b31c3f868a3b1b14b827abef232554f944ce Reviewed-by: Brett Stottlemyer <bstottle@ford.com>
* | fix class nameBogDan Vatra2017-11-021-2/+2
| | | | | | | | | | Change-Id: Ib3054c0f9c7be50c1371db6bf5f3fd332b9c2848 Reviewed-by: Brett Stottlemyer <bstottle@ford.com>
* | Send and check the protocol versionv5.10.0-beta3BogDan Vatra2017-10-249-3/+36
| | | | | | | | | | | | | | | | [ChangeLog] This is a backwards incompatible change, but is required for future changes to the underlying datastream protocol Change-Id: I7399977b99ede6308ecfa81dbdd2387027b2007b Reviewed-by: Brett Stottlemyer <bstottle@ford.com>
* | Generate a protected setter for SimpleSource READONLY propertiesv5.10.0-beta2Michael Brasser2017-10-062-7/+31
| | | | | | | | | | | | | | | | Follow the strategy used for READPUSH/READWRITE property types, only make the setter protected rather than public. Change-Id: Ide52b3c930371a20a4de94635607573bde480250 Reviewed-by: Brett Stottlemyer <bstottle@ford.com>
* | Docs: Fix link to "Using Qt Remote Objects"v5.10.0-beta1Friedemann Kleint2017-09-261-1/+1
| | | | | | | | | | | | | | | | Fix qdoc warning: qtremoteobjects/src/remoteobjects/doc/src/remoteobjects-index.qdoc:40: warning: Can't link to 'Using Qt RemoteObjects' Change-Id: I2a3282ac2a8c809d28416f6b913824563178eee4 Reviewed-by: Brett Stottlemyer <bstottle@ford.com>
* | repc: Fix warnings in generated codeKevin Funk2017-09-251-12/+10
| | | | | | | | | | | | | | | | | | | | | | Fixes: .moc/../rep_model_merged.h:272:11: warning: field 'm_tracks' will be initialized after field 'm_currentTrack' [-Wreorder] , m_tracks(model1) ^ Change-Id: If1dca7a180c27ba02642bdd96fe182d96894d0d7 Reviewed-by: Michael Brasser <michael.brasser@live.com> Reviewed-by: Brett Stottlemyer <bstottle@ford.com>
* | tst_integration: Fix executable lookupKevin Funk2017-09-251-4/+11
| | | | | | | | | | | | | | | | | | | | Make localServerConnectionTest and localServerConnectionTest2 test work even if tst_integration unit test was started from a different working directory Change-Id: Idad757072e43cd82cf8f3178683496db9bf1ee66 Reviewed-by: Michael Brasser <michael.brasser@live.com> Reviewed-by: Brett Stottlemyer <bstottle@ford.com>
* | tests: Introduce TestUtils::findExecutableKevin Funk2017-09-252-16/+55
| | | | | | | | | | | | | | | | So it can be used from different test projects Change-Id: I365070f80c6adb262d7a16c8afb7d753bf5ec43f Reviewed-by: Michael Brasser <michael.brasser@live.com> Reviewed-by: Brett Stottlemyer <bstottle@ford.com>
* | Fix -Wunused-lambda-capture warningKevin Funk2017-09-201-2/+2
| | | | | | | | | | Change-Id: I35bc8c7938340854392bc1042dae751c2062caad Reviewed-by: Brett Stottlemyer <bstottle@ford.com>
* | Win: Set proper description for repc toolKai Koehne2017-09-201-0/+1
| | | | | | | | | | | | | | Task-number: QTBUG-61970 Change-Id: I83d1bf7bc8cdfa56a29f94e81d8d21f88dc7df60 Reviewed-by: Kevin Funk <kevin.funk@kdab.com> Reviewed-by: Michael Brasser <michael.brasser@live.com>
* | Merge remote-tracking branch 'origin/5.9' into devv5.10.0-alpha1Liang Qi2017-08-175-9/+7
|\| | | | | | | | | | | | | Conflicts: .qmake.conf Change-Id: I29392cca54915da0aafa1acf75c18c0176348a8d
| * Doc: correct several link errorsv5.9.2Nico Vertriest2017-08-024-8/+6
| | | | | | | | | | | | | | | | | | - removed reference to Getting Started with Qt Remote Objects: replaced with reference to overview document - fixed links to souce objects and replica objects Change-Id: I1a8d02fd421160ca531491935cf69a31568db165 Reviewed-by: Venugopal Shivashankar <Venugopal.Shivashankar@qt.io>
| * Only the core module is needed for this, so just specify thatAndy Shaw2017-07-211-1/+1
| | | | | | | | | | | | Change-Id: I2677fd2827b0f26fc15ccb0879154282913cd63b Reviewed-by: Kevin Funk <kevin.funk@kdab.com> Reviewed-by: Brett Stottlemyer <bstottle@ford.com>
| * Bump versionOswald Buddenhagen2017-06-301-1/+1
| | | | | | | | Change-Id: I4a2bbcc4edbf9d779bf32b5c46cdbf9c65f43118
* | Enable tests for boot2qtSami Nurmenniemi2017-08-164-4/+11
| | | | | | | | | | | | | | | | | | | | | | | | | | | | The tests for boot2qt were disabled with commit 3ce3573b86414361cdacc9400e2d81249405b8af. The tests can be enabled since qtdeclarative now fallbacks to software renderer if OpenGL is not supported. Also added more wait time for fetching model in testModelTest() when running on Qemu. Task-number: QTBUG-60268 Change-Id: I94bc8434fc72eb1013f73bc5f5f2a3bfc84e4dea Reviewed-by: Brett Stottlemyer <bstottle@ford.com>
* | Use QRandomGenerator instead of q?randThiago Macieira2017-06-301-4/+2
| | | | | | | | | | | | Change-Id: Icd0e0d4b27cb4e5eb892fffd14b5285d43f4afbf Reviewed-by: Brett Stottlemyer <bstottle@ford.com> Reviewed-by: Lars Knoll <lars.knoll@qt.io>
* | Merge remote-tracking branch 'origin/5.9' into devLiang Qi2017-06-2735-790/+1288
|\| | | | | | | Change-Id: I89277ebb0f58208b2cf0fa006cc59b5e1baba345
| * Export classes needed for custom backendsv5.9.1Brett Stottlemyer2017-06-171-3/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Export ServerIoDevice, ClientIoDevice and QConnectionAbstractServer, which are needed to enable custom QIODevice backend implementations. Test code: class TestClient : public ClientIoDevice { public: TestClient(QObject *) {} void connectToServer() override {} bool isOpen() override { return false; } QIODevice *connection() override { return 0; } void doClose() override {} }; class TestServer : public ServerIoDevice { public: QIODevice *connection() const override {return 0;} void doClose() override {} }; class TestServerImpl : public QConnectionAbstractServer { public: TestServerImpl(QObject *) {} bool hasPendingConnections() const override { return true; } ServerIoDevice *configureNewConnection() override { return new TestServer; } QUrl address() const override { return QUrl(); } bool listen(const QUrl &) override { return true; } QAbstractSocket::SocketError serverError() const override { return QAbstractSocket::UnknownSocketError; } void close() override {}; }; int main(int, char**) { auto url = QUrl(QStringLiteral("test:address")); qRegisterRemoteObjectsClient<TestClient>(QStringLiteral("test")); qRegisterRemoteObjectsServer<TestServerImpl>(QStringLiteral("test")); auto server = QtROServerFactory::instance()->create(url); auto connection = QtROClientFactory::instance()->create(url); } Task-number: QTBUG-60624 Change-Id: I08899fe40bf9407dab3783cbaf8c14809d46bbdb Reviewed-by: Friedemann Kleint <Friedemann.Kleint@qt.io> Reviewed-by: Marc Mutz <marc.mutz@kdab.com> Reviewed-by: Michael Brasser <michael.brasser@live.com>
| * Doc: rearrange overview page Qt Remote ObjectsNico Vertriest2017-06-1211-305/+586
| | | | | | | | | | | | | | Distribute contents overview page over several new pages Change-Id: Ia48bf4188157b6960a532df3663d0daef34e50c8 Reviewed-by: Topi Reiniö <topi.reinio@qt.io>
| * QtRO{Client,Server}Factory: Make ctor privateKevin Funk2017-06-092-6/+8
| | | | | | | | | | | | | | | | Reduce exposed public API a little bit more. As suggested in a previous change-request. Change-Id: Ia64e9a2dc515969943deb2bca2c5702b4f26a52e Reviewed-by: Brett Stottlemyer <bstottle@ford.com>
| * Sync moc copy with moc from qtbase 5.9 branchKevin Funk2017-06-0922-476/+691
| | | | | | | | | | | | | | | | | | Adapt repc parts which use the API from moc Note: Files in moc_copy/ are a 1:1 copy of moc from qtbase 5.9 branch Change-Id: I7428474be4e28bcb33176cfd70296ae330279ffb Reviewed-by: Brett Stottlemyer <bstottle@ford.com>
* | Merge remote-tracking branch 'origin/5.9' into devLiang Qi2017-06-06155-2205/+4892
|\| | | | | | | | | | | | | Conflicts: .qmake.conf Change-Id: I2dacf93b383ca1b8d56caefb8ff9c4e5aa5e4fca
| * Silence GCC 7 case fallthrough warningsThiago Macieira2017-06-031-2/+2
| | | | | | | | | | Change-Id: Ia3e896da908f42939148fffd14c47fa5f5bf1897 Reviewed-by: Allan Sandfeld Jensen <allan.jensen@qt.io>
| * Merge remote-tracking branch 'origin/5.9.0' into 5.9Liang Qi2017-05-312-3/+3
| |\ | | | | | | | | | Change-Id: I37193904abebbb8775b7b8f9d4fc48622d7e6b24
| | * Export instance methods of QtROServerFactory and QtROClientFactoryv5.9.0-rc2v5.9.0-rc1v5.9.0Friedemann Kleint2017-05-151-2/+2
| | | | | | | | | | | | | | | | | | | | | Task-number: QTBUG-60624 Change-Id: Icfb14a476572667b9617099dccfdd13a15605034 Reviewed-by: Brett Stottlemyer <bstottle@ford.com> Reviewed-by: Marc Mutz <marc.mutz@kdab.com>
| | * fix build in directory with spacesOswald Buddenhagen2017-05-111-1/+1
| | | | | | | | | | | | | | | | | | Change-Id: I80729616f26568345884543a9acf4bdb4412a83c Reviewed-by: Joerg Bornemann <joerg.bornemann@qt.io> Reviewed-by: Brett Stottlemyer <bstottle@ford.com>
| * | remove obsolete hack for framework buildOswald Buddenhagen2017-05-301-8/+0
| | | | | | | | | | | | | | | | | | Change-Id: Idfb1e773433ef61d4f74ea15e7d25f5f43957132 Reviewed-by: Joerg Bornemann <joerg.bornemann@qt.io> Reviewed-by: Brett Stottlemyer <bstottle@ford.com>
| * | Move: tools/repc/{3rdparty/moc => moc_copy}Kevin Funk2017-05-2223-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | There seems to be an incentive to make '3rdparty' the canonical place for source code contributed under different terms than the Qt CLA. Thus rename '3rdparty' to 'moc_copy' here, b/c repc just contains a copy of moc which actually *got* contributed under the Qt CLA. Change-Id: I0eb48f56503b06265d789427555fd025b3b46fa1 Reviewed-by: Brett Stottlemyer <bstottle@ford.com> Reviewed-by: Kai Koehne <kai.koehne@qt.io>
| * | Add MODEL keyword to repcBrett Stottlemyer2017-05-1910-9/+334
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This change enables QAbstractItemModel types to be included in .rep files as Source/Replica members. QtRO already handles QAIM types, but with an overload of enableRemoting() and acquireModel() methods. If the goal of the .rep file is to decribe the interface, the model should be part of the interface as well. For example, the following will include a QAbstractItemModel in the forwarded data, passing the display role (Qt::DisplayRole). Note, it uses QML roleNames (http://doc.qt.io/qt-5/qabstractitemmodel.html#roleNames) class Media { ENUM state{Stopped, Paused, Playing} PROP(QString currentTrack) PROP(state playState) MODEL tracks(display) } Future TODO - update docs for this feature and include ability to use with a QItemSelectionModel. Potentially add something for default values in the Replica until data is fetched. Change-Id: I53a365fbc2bdb7fc5d3be19c1fb0d12e743050ee Reviewed-by: Michael Brasser <michael.brasser@live.com>
| * | Provide static method for registering metatypesBrett Stottlemyer2017-05-165-26/+44
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This provides an entry point (before a type is instantiated) to register the needed types (for instance, enums used by a type). It also makes it easier to guard against attempting to register a replica's types multiple times. Change-Id: Ic01c70586eab618afeb90c98df042b1ae7a9eed9 Reviewed-by: Michael Brasser <michael.brasser@live.com>
| * | Use ignoreMessage for expected test warningsBrett Stottlemyer2017-05-151-29/+36
| | | | | | | | | | | | | | | Change-Id: I93d332a82d734ab95c6f1ccce906d3659d7c1440 Reviewed-by: Michael Brasser <michael.brasser@live.com>
| * | Bump versionOswald Buddenhagen2017-05-101-1/+1
| | | | | | | | | | | | Change-Id: Ieb7f53f00d2f02711a757a3831bb53fc359e40d7
| * | Disable/blacklist failing tests for boot2qtSami Nurmenniemi2017-05-091-0/+3
| |/ | | | | | | | | | | | | | | | | | | Currently boot2qt is tested with QEMU and some tests fail. Disabling them for now to make it possible to enable qt5 tests for Coin. Task-number: QTBUG-60266 Change-Id: Ib0bc910bb7a46dfaceed3e96d9f44266e40e9fa0 Reviewed-by: Kevin Funk <kevin.funk@kdab.com> Reviewed-by: Simon Hausmann <simon.hausmann@qt.io>
| * Correct QtRO license headers and added missing license filesv5.9.0-beta4Jani Heikkinen2017-05-02139-2025/+4365
| | | | | | | | | | | | | | | | | | | | | | | | | | Unify licensing as it is in other submodules - Src is licensed under Commercial, LGPLv3, GPLv2 and GPLv3 licenses - Examples are licensed under Commercial and BSD licenses - Tools and tests are licensed under commercial and GPLv3 license with some exceptions Task-number: QTBUG-58921 Change-Id: I4494bf8b705568b243340c98316bedd706145db5 Reviewed-by: Lars Knoll <lars.knoll@qt.io> Reviewed-by: Brett Stottlemyer <bstottle@ford.com>
| * Revert "Fixup DLLDESTDIR for modules"Oswald Buddenhagen2017-04-242-6/+0
| | | | | | | | | | | | | | | | | | | | | | | | this "fixup" is not necessary since qtbase/5dbcced3bf, and it's rather fishy to start with. This reverts commit 9ae13b3fbe9f9c0847466796d35a0cf254b097c3. Change-Id: I6c5e7e5fe65f795b421d9f9736b83af8a3bb29b6 Reviewed-by: Joerg Bornemann <joerg.bornemann@qt.io> Reviewed-by: Brett Stottlemyer <bstottle@ford.com> Reviewed-by: Jake Petroules <jake.petroules@qt.io>
generated by cgit v1.2.3 (git 2.25.1) at 2024-06-03 09:10:02 +0000