diff options
| author | Qt Forward Merge Bot <qt_forward_merge_bot@qt-project.org> | 2019-07-27 03:02:30 +0200 |
|---|---|---|
| committer | Qt Forward Merge Bot <qt_forward_merge_bot@qt-project.org> | 2019-07-27 03:02:30 +0200 |
| commit | d5886b186431eb48ed463122f72db267aba2480b (patch) | |
| tree | 858e9ec2d1c2c95a0084afc7f2530ac67052ff28 | |
| parent | cbef241ded4c7255f163af962293c201b27f341f (diff) | |
| parent | 2bcda9d9f45858ac196d9972162c870ac0a6f217 (diff) | |
Merge remote-tracking branch 'origin/5.12' into 5.13
Change-Id: I99b94598f677ccba5d21069240b8b83bf5f15d18
| -rw-r--r-- | src/remoteobjects/qremoteobjectpendingcall.h | 13 | ||||
| -rw-r--r-- | tests/auto/modelview/tst_modelview.cpp | 2 |
2 files changed, 4 insertions, 11 deletions
diff --git a/src/remoteobjects/qremoteobjectpendingcall.h b/src/remoteobjects/qremoteobjectpendingcall.h index 322b031..e895842 100644 --- a/src/remoteobjects/qremoteobjectpendingcall.h +++ b/src/remoteobjects/qremoteobjectpendingcall.h @@ -111,18 +111,11 @@ class QRemoteObjectPendingReply : public QRemoteObjectPendingCall public: typedef T Type; - inline QRemoteObjectPendingReply() + QRemoteObjectPendingReply() = default; + explicit QRemoteObjectPendingReply(const QRemoteObjectPendingCall &call) + : QRemoteObjectPendingCall(call) { } - inline QRemoteObjectPendingReply(const QRemoteObjectPendingReply &other) - : QRemoteObjectPendingCall(other) - { - } - explicit inline QRemoteObjectPendingReply(const QRemoteObjectPendingCall &call) - { - *this = call; - } - inline ~QRemoteObjectPendingReply() {} QRemoteObjectPendingReply &operator=(const QRemoteObjectPendingCall &other) { diff --git a/tests/auto/modelview/tst_modelview.cpp b/tests/auto/modelview/tst_modelview.cpp index 2a8ddcb..52c2419 100644 --- a/tests/auto/modelview/tst_modelview.cpp +++ b/tests/auto/modelview/tst_modelview.cpp @@ -1014,7 +1014,7 @@ void TestModelView::testServerInsertDataTree() } #ifdef SLOW_MODELTEST -#define MODELTEST_WAIT_TIME 15000 +#define MODELTEST_WAIT_TIME 25000 #else #define MODELTEST_WAIT_TIME #endif |