diff options
author | Oswald Buddenhagen <oswald.buddenhagen@digia.com> | 2014-01-15 22:01:15 +0100 |
---|---|---|
committer | The Qt Project <gerrit-noreply@qt-project.org> | 2014-01-22 21:01:53 +0100 |
commit | e2ea0a83cc876fb54a2a8bf6f1350dbfa52f596b (patch) | |
tree | 36ec4b74aa50b9355e74e5d186039c3cdbd38acd /tests/benchmarks | |
parent | 2ce7959eb9e69cd68013fc6a0f77a9556a84365b (diff) |
fix whitespace
remove trailing spaces and expand tabs
Change-Id: Ieacb9d096b612c45d1a64700044c114d1f7522bc
Reviewed-by: Simon Hausmann <simon.hausmann@digia.com>
Diffstat (limited to 'tests/benchmarks')
-rw-r--r-- | tests/benchmarks/qml/binding/data/localproperty.txt | 2 | ||||
-rw-r--r-- | tests/benchmarks/qml/javascript/testtypes.h | 4 | ||||
-rw-r--r-- | tests/benchmarks/qml/painting/paintbenchmark.cpp | 4 | ||||
-rw-r--r-- | tests/benchmarks/qml/qmltime/qmltime.cpp | 6 | ||||
-rw-r--r-- | tests/benchmarks/qml/qmltime/qmltime.pro | 2 | ||||
-rw-r--r-- | tests/benchmarks/qml/qqmlmetaproperty/qqmlmetaproperty.pro | 2 | ||||
-rw-r--r-- | tests/benchmarks/qml/script/data/slot_complex.qml | 2 |
7 files changed, 11 insertions, 11 deletions
diff --git a/tests/benchmarks/qml/binding/data/localproperty.txt b/tests/benchmarks/qml/binding/data/localproperty.txt index c7ca0efdb4..d1b1f4386a 100644 --- a/tests/benchmarks/qml/binding/data/localproperty.txt +++ b/tests/benchmarks/qml/binding/data/localproperty.txt @@ -1,5 +1,5 @@ import Test 1.0 -MyQmlObject { +MyQmlObject { result: ### } diff --git a/tests/benchmarks/qml/javascript/testtypes.h b/tests/benchmarks/qml/javascript/testtypes.h index 99781fc797..05b1c7ef9c 100644 --- a/tests/benchmarks/qml/javascript/testtypes.h +++ b/tests/benchmarks/qml/javascript/testtypes.h @@ -44,7 +44,7 @@ #include <QtCore/qobject.h> -class TestObject : public QObject +class TestObject : public QObject { Q_OBJECT Q_PROPERTY(int intValue READ intValue); @@ -58,7 +58,7 @@ public: private: QString m_string; -}; +}; void registerTypes(); diff --git a/tests/benchmarks/qml/painting/paintbenchmark.cpp b/tests/benchmarks/qml/painting/paintbenchmark.cpp index 1fc7813c04..672bed4c10 100644 --- a/tests/benchmarks/qml/painting/paintbenchmark.cpp +++ b/tests/benchmarks/qml/painting/paintbenchmark.cpp @@ -351,8 +351,8 @@ public: last = elapsed; } QPainter p(this); - p.fillRect(rect(), Qt::white); - p.setPen(Qt::black); + p.fillRect(rect(), Qt::white); + p.setPen(Qt::black); QTime drawTimer; drawTimer.start(); testFunc(p); diff --git a/tests/benchmarks/qml/qmltime/qmltime.cpp b/tests/benchmarks/qml/qmltime/qmltime.cpp index bae0b51824..d6b73ed5f4 100644 --- a/tests/benchmarks/qml/qmltime/qmltime.cpp +++ b/tests/benchmarks/qml/qmltime/qmltime.cpp @@ -111,10 +111,10 @@ void Timer::run(uint iterations) QObject *o = m_component->create(&context); QGraphicsObject *go = qobject_cast<QGraphicsObject *>(o); - if (m_willparent && go) + if (m_willparent && go) go->setParentItem(&m_item); delete o; - + runTest(&context, iterations); } @@ -135,7 +135,7 @@ void Timer::runTest(QQmlContext *context, uint iterations) for (uint ii = 0; ii < iterations; ++ii) { QObject *o = m_component->create(context); QGraphicsObject *go = qobject_cast<QGraphicsObject *>(o); - if (m_willparent && go) + if (m_willparent && go) go->setParentItem(&m_item); delete o; } diff --git a/tests/benchmarks/qml/qmltime/qmltime.pro b/tests/benchmarks/qml/qmltime/qmltime.pro index c151b8d10f..4e3e9471a4 100644 --- a/tests/benchmarks/qml/qmltime/qmltime.pro +++ b/tests/benchmarks/qml/qmltime/qmltime.pro @@ -4,6 +4,6 @@ TARGET = qmltime QT += qml widgets testlib macx:CONFIG -= app_bundle -SOURCES += qmltime.cpp +SOURCES += qmltime.cpp DEFINES += QT_DISABLE_DEPRECATED_BEFORE=0 diff --git a/tests/benchmarks/qml/qqmlmetaproperty/qqmlmetaproperty.pro b/tests/benchmarks/qml/qqmlmetaproperty/qqmlmetaproperty.pro index e71f16aecb..ce66e1e51f 100644 --- a/tests/benchmarks/qml/qqmlmetaproperty/qqmlmetaproperty.pro +++ b/tests/benchmarks/qml/qqmlmetaproperty/qqmlmetaproperty.pro @@ -4,7 +4,7 @@ TARGET = tst_qqmlmetaproperty QT += qml testlib macx:CONFIG -= app_bundle -SOURCES += tst_qqmlmetaproperty.cpp +SOURCES += tst_qqmlmetaproperty.cpp # Define SRCDIR equal to test's source directory DEFINES += SRCDIR=\\\"$$PWD\\\" diff --git a/tests/benchmarks/qml/script/data/slot_complex.qml b/tests/benchmarks/qml/script/data/slot_complex.qml index 4e467da901..ffc9e2f98f 100644 --- a/tests/benchmarks/qml/script/data/slot_complex.qml +++ b/tests/benchmarks/qml/script/data/slot_complex.qml @@ -47,7 +47,7 @@ TestObject { var a = 1; while (n > 0) { a = a * n; - n--; + n--; } return a; } |