summaryrefslogtreecommitdiffstats
path: root/tests/auto/qobject
diff options
context:
space:
mode:
authorJason Barron <jbarron@trolltech.com>2009-08-06 06:23:07 (GMT)
committerJason Barron <jbarron@trolltech.com>2009-08-06 06:23:07 (GMT)
commit57ceb11ecf95032418712a686418116cf2398e7a (patch)
tree378533fcc07983d3a1b461aaaad07d842e50b81c /tests/auto/qobject
parent90d4366f1e9657b3240a872698614c7d9747f9e0 (diff)
parenta4fc85c75f068b73f9c2334c77b0ae2275510e17 (diff)
downloadQt-57ceb11ecf95032418712a686418116cf2398e7a.zip
Qt-57ceb11ecf95032418712a686418116cf2398e7a.tar.gz
Qt-57ceb11ecf95032418712a686418116cf2398e7a.tar.bz2
Merge commit 'origin/master'
Conflicts: tests/auto/qfilesystemmodel/qfilesystemmodel.pro tests/auto/qfontdialog/tst_qfontdialog.cpp tests/auto/qgraphicsitem/tst_qgraphicsitem.cpp tests/auto/qgraphicslayout/tst_qgraphicslayout.cpp tests/auto/qsqldriver/qsqldriver.pro tests/auto/qsqlquery/qsqlquery.pro tests/auto/qsqlrelationaltablemodel/qsqlrelationaltablemodel.pro tests/auto/qsqltablemodel/qsqltablemodel.pro tests/auto/qsqlthread/qsqlthread.pro tests/auto/qstatemachine/tst_qstatemachine.cpp tests/auto/qtcpsocket/tst_qtcpsocket.cpp
Diffstat (limited to 'tests/auto/qobject')
-rw-r--r--tests/auto/qobject/qobject.pro2
-rw-r--r--tests/auto/qobject/tst_qobject.cpp2
-rw-r--r--tests/auto/qobject/tst_qobject.pro1
3 files changed, 1 insertions, 4 deletions
diff --git a/tests/auto/qobject/qobject.pro b/tests/auto/qobject/qobject.pro
index 0cafdc3..b6b3f20 100644
--- a/tests/auto/qobject/qobject.pro
+++ b/tests/auto/qobject/qobject.pro
@@ -1,4 +1,2 @@
TEMPLATE = subdirs
SUBDIRS = tst_qobject.pro signalbug.pro
-
-
diff --git a/tests/auto/qobject/tst_qobject.cpp b/tests/auto/qobject/tst_qobject.cpp
index 2627b8d..b602de1 100644
--- a/tests/auto/qobject/tst_qobject.cpp
+++ b/tests/auto/qobject/tst_qobject.cpp
@@ -1423,7 +1423,7 @@ void tst_QObject::moveToThread()
#if defined(Q_OS_SYMBIAN)
// Child timer will be registered after parent timer in the new
// thread, and 10ms is less than symbian timer resolution, so
- // child->timerEventThread compare after thread.wait() will
+ // child->timerEventThread compare after thread.wait() will
// usually fail unless timers are farther apart.
child->startTimer(100);
object->startTimer(150);
diff --git a/tests/auto/qobject/tst_qobject.pro b/tests/auto/qobject/tst_qobject.pro
index b3bda37..aed181f 100644
--- a/tests/auto/qobject/tst_qobject.pro
+++ b/tests/auto/qobject/tst_qobject.pro
@@ -15,4 +15,3 @@ symbian: {
addFiles.path = \sys\bin
DEPLOYMENT += addFiles
}
-