delta/qt-creator.git, branch qp-v3.4.0 code.qt.io: qt-creator/qt-creator.git Merge remote-tracking branch 'origin/3.3' 2015-02-13T08:38:33+00:00 Eike Ziller eike.ziller@theqtcompany.com 2015-02-13T08:38:27+00:00 5fef8a9d91ba1a1470ddb715119f16391dd56512 Change-Id: I8a5730f8d103f697a9179c9783c1bdfc7d5d312b 
Change-Id: I8a5730f8d103f697a9179c9783c1bdfc7d5d312b
Update License 2015-01-16T07:48:02+00:00 Eike Ziller eike.ziller@theqtcompany.com 2015-01-15T09:33:32+00:00 ce38b0379f60b21e07cd14e11b7a1563b4ea5c14 Change-Id: I2ba997eac9d3ff75542b5861dbbc89d3ccd6017e Reviewed-by: Ulf Hermann <ulf.hermann@theqtcompany.com> 
Change-Id: I2ba997eac9d3ff75542b5861dbbc89d3ccd6017e
Reviewed-by: Ulf Hermann <ulf.hermann@theqtcompany.com>
Fix qbs build. 2014-12-18T11:50:05+00:00 Christian Kandeler christian.kandeler@theqtcompany.com 2014-12-17T16:26:09+00:00 a18c411c37d632b3062797c85bb809bfc64446d3 Change-Id: Ie15b7a5d952b1221153e24c08f5f906076d19bf1 Reviewed-by: Kai Koehne <kai.koehne@theqtcompany.com> 
Change-Id: Ie15b7a5d952b1221153e24c08f5f906076d19bf1
Reviewed-by: Kai Koehne <kai.koehne@theqtcompany.com>
Define separate methods for getting collapsed and expanded rows 2014-12-05T13:16:28+00:00 Ulf Hermann ulf.hermann@theqtcompany.com 2014-11-17T12:30:53+00:00 ff45f1c1560cf169432ed88255fd38a49ee86e1f Change-Id: I3449e163dd00283a04fd5147d81034d2f68a961f Reviewed-by: Kai Koehne <kai.koehne@theqtcompany.com> 
Change-Id: I3449e163dd00283a04fd5147d81034d2f68a961f
Reviewed-by: Kai Koehne <kai.koehne@theqtcompany.com>
Merge remote-tracking branch 'origin/3.3' 2014-11-26T10:18:54+00:00 Eike Ziller eike.ziller@theqtcompany.com 2014-11-26T10:18:54+00:00 848336251a1b51838e6a5e5f3336dc57468f046e Conflicts: plugins/qmlprofilerextension/memoryusagemodel.cpp Change-Id: I444eb11c167cd44b3e68cbe34210d3bcdf039cb4 
Conflicts:
	plugins/qmlprofilerextension/memoryusagemodel.cpp

Change-Id: I444eb11c167cd44b3e68cbe34210d3bcdf039cb4
Add qbs project file. 2014-11-25T09:15:41+00:00 Christian Kandeler christian.kandeler@theqtcompany.com 2014-11-24T10:27:00+00:00 bfc37d69732e1a504f4bb834001885e1407f9552 Change-Id: If583799f3dfd09c6c5c49ee8305c0df8b038881a Reviewed-by: Ulf Hermann <ulf.hermann@theqtcompany.com> 
Change-Id: If583799f3dfd09c6c5c49ee8305c0df8b038881a
Reviewed-by: Ulf Hermann <ulf.hermann@theqtcompany.com>
Properly initialize max size in memory usage model 2014-11-24T17:35:49+00:00 Ulf Hermann ulf.hermann@theqtcompany.com 2014-11-20T10:04:42+00:00 d8210098225155817fc58b3e82d899f7856a8c7a Change-Id: Id77917c92191d3970727be0b360abefc87254c5b Reviewed-by: Kai Koehne <kai.koehne@theqtcompany.com> 
Change-Id: Id77917c92191d3970727be0b360abefc87254c5b
Reviewed-by: Kai Koehne <kai.koehne@theqtcompany.com>
Remove useless checks in labels() methods 2014-11-21T12:50:41+00:00 Ulf Hermann ulf.hermann@digia.com 2014-10-29T09:42:22+00:00 fad69ea99580367744f7ad0200b7198b65c3cb6d The view should do those. Change-Id: I05f1316b8970cdd24958550c958695c5a7ad0d79 Reviewed-by: Kai Koehne <kai.koehne@theqtcompany.com> 
The view should do those.

Change-Id: I05f1316b8970cdd24958550c958695c5a7ad0d79
Reviewed-by: Kai Koehne <kai.koehne@theqtcompany.com>
Adapt to splitting of AbstractTimelineModel 2014-11-21T12:50:35+00:00 Ulf Hermann ulf.hermann@digia.com 2014-10-29T09:31:28+00:00 d93266420b00a226b9286fab09c3eb36d60881dd Change-Id: Ib39831448262c5c4329b0f13f62e20d4c3ea73b6 Reviewed-by: Kai Koehne <kai.koehne@theqtcompany.com> 
Change-Id: Ib39831448262c5c4329b0f13f62e20d4c3ea73b6
Reviewed-by: Kai Koehne <kai.koehne@theqtcompany.com>
Create extension models through a factory 2014-11-21T12:50:30+00:00 Ulf Hermann ulf.hermann@digia.com 2014-10-28T16:39:23+00:00 fd09a6bed2b8b7c574e6a561f8c091de1af87d2b Like that we can drop the deferred setting of model manager and we can announce the features right away on construction. Change-Id: I8b4eb3e94046511b0e637084768e919649115e77 Reviewed-by: Kai Koehne <kai.koehne@theqtcompany.com> 
Like that we can drop the deferred setting of model manager and we can
announce the features right away on construction.

Change-Id: I8b4eb3e94046511b0e637084768e919649115e77
Reviewed-by: Kai Koehne <kai.koehne@theqtcompany.com>