Commit Graph

9 Commits

Author SHA1 Message Date
Eike Ziller
6b1f863363 Revert "Revert "Properly clear input events model""
The revert was only for 3.6 branch.
This reverts commit eec2b2d0ee.

Change-Id: Id338a078ff5265d5517b935a1056a8e1c7d652c7
Reviewed-by: Eike Ziller <eike.ziller@theqtcompany.com>
2015-11-17 08:33:47 +00:00
Eike Ziller
cbaff220e7 Merge remote-tracking branch 'origin/3.6'
Change-Id: Ic042c3dee945b1a0104c492e21ba34842cdea3fa
2015-11-17 09:32:33 +01:00
Ulf Hermann
eec2b2d0ee Revert "Properly clear input events model"
This reverts commit d1d694efb5.

It should have gone to the master branch.

Change-Id: I1c5b86caf5092e1d5d1ac9866e2887a912b1c65e
Reviewed-by: Eike Ziller <eike.ziller@theqtcompany.com>
2015-11-17 08:29:47 +00:00
Eike Ziller
2c43009033 Merge remote-tracking branch 'origin/3.6'
Change-Id: Ia0f2227bf86fb9d52ab2ec4f687554e0540a0117
2015-11-17 09:29:24 +01:00
Ulf Hermann
53957ee2ae Translate strings in input events model
Change-Id: Ia549295adafa42b9236f568c04e52b48e8943337
Reviewed-by: Joerg Bornemann <joerg.bornemann@theqtcompany.com>
2015-11-16 14:50:57 +00:00
Ulf Hermann
d1d694efb5 Properly clear input events model
Change-Id: I17b7e84605f93d421de7dcf0a0b02c6b922b2c4b
Reviewed-by: Joerg Bornemann <joerg.bornemann@theqtcompany.com>
2015-11-16 14:42:07 +00:00
Ulf Hermann
00f0e00fb2 Add some more information to input events, if available
Just "Mouse" or "Key" is not very helpful.

Change-Id: Ia5db293fb957242aa0a7a84440cd1632d2babe8a
Reviewed-by: Joerg Bornemann <joerg.bornemann@theqtcompany.com>
2015-11-05 08:42:38 +00:00
Ulf Hermann
1de247c28a Adapt to removal of QQmlProfilerBaseModel
Change-Id: Ic71b73f4a31d86d04e0c346a45b3506d07895ebc
Reviewed-by: Joerg Bornemann <joerg.bornemann@theqtcompany.com>
2015-09-11 12:14:11 +03:00
Ulf Hermann
dd988bdb5e Rename files to follow common pattern among extension plugins
This way the plugin will successfully build with qbs again.

Change-Id: Iac5fc64753bb225649ba9f62199d6248450e1546
Reviewed-by: Christian Kandeler <christian.kandeler@theqtcompany.com>
2015-08-27 18:48:09 +03:00