diff options
| author | Robin Burchell <robin+qt@viroteck.net> | 2013-01-09 13:30:26 +1100 |
|---|---|---|
| committer | The Qt Project <gerrit-noreply@qt-project.org> | 2013-01-09 20:32:16 +0100 |
| commit | d733f6a942e40e58ebc09f1d4414e2f8fa3f6a28 (patch) | |
| tree | 1e0688d18f628fc0e7c5b8455d737e194074b334 /tests/auto/declarative/declarative.pro | |
| parent | 722725cf24e45e86a2844810b90787a29df8a4a9 (diff) | |
Remove QPerformanceTimer now that QElapsedTimer contains the necessary bits
QPerformanceTimer was a copy of QElapsedTimer with some additional functionality
which has since been subsumed into QElapsedTimer, so remove the forked code.
(backport of cd6ebb4912a5d96c788ea0c838d8a1a06ff4029e from qtdeclarative)
Change-Id: Ife1dac4d6c46404b43253680819da21350c65569
Reviewed-by: Christopher Adams <chris.adams@jollamobile.com>
Reviewed-by: Alan Alpert <aalpert@rim.com>
Diffstat (limited to 'tests/auto/declarative/declarative.pro')
| -rw-r--r-- | tests/auto/declarative/declarative.pro | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/tests/auto/declarative/declarative.pro b/tests/auto/declarative/declarative.pro index dbadbad5..1f442f30 100644 --- a/tests/auto/declarative/declarative.pro +++ b/tests/auto/declarative/declarative.pro @@ -72,8 +72,7 @@ contains(QT_CONFIG, private_tests) { qdeclarativevisualdatamodel \ qdeclarativeworkerscript \ qdeclarativexmllistmodel \ - qpacketprotocol \ - qperformancetimer + qpacketprotocol # This test requires the xmlpatterns module !contains(QT_CONFIG,xmlpatterns): SUBDIRS -= qdeclarativexmllistmodel |