summaryrefslogtreecommitdiffstats
path: root/tests/auto/qtimer
diff options
context:
space:
mode:
authorQt Continuous Integration System <qt-info@nokia.com>2011-01-10 20:14:50 (GMT)
committerQt Continuous Integration System <qt-info@nokia.com>2011-01-10 20:14:50 (GMT)
commit9ab069286660101e2a2a6b49587bc21a69339e77 (patch)
tree672da7b873d94069fd4c8de1fa300957d737809e /tests/auto/qtimer
parentf0b854bf5cfc6ec4715ff5f4aed3f0bd189d24ee (diff)
parent49257f86bdb090d97c387183e8f600bbb8a7eef3 (diff)
downloadQt-9ab069286660101e2a2a6b49587bc21a69339e77.zip
Qt-9ab069286660101e2a2a6b49587bc21a69339e77.tar.gz
Qt-9ab069286660101e2a2a6b49587bc21a69339e77.tar.bz2
Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.7-integration
* '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1: QFont/Windows: restrict the pixel size accuracy Update copyright year to 2011. For non-developer builds, skip test that requires private API tst_qhttpnetworkconnection: Compile fix Change QHostInfoCache to use QElapsedTime instead of QTime. Fix for qtdemo bug
Diffstat (limited to 'tests/auto/qtimer')
-rw-r--r--tests/auto/qtimer/tst_qtimer.cpp2
1 files changed, 1 insertions, 1 deletions
diff --git a/tests/auto/qtimer/tst_qtimer.cpp b/tests/auto/qtimer/tst_qtimer.cpp
index e964728..6cff7c53 100644
--- a/tests/auto/qtimer/tst_qtimer.cpp
+++ b/tests/auto/qtimer/tst_qtimer.cpp
@@ -1,6 +1,6 @@
/****************************************************************************
**
-** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
+** Copyright (C) 2011 Nokia Corporation and/or its subsidiary(-ies).
** All rights reserved.
** Contact: Nokia Corporation (qt-info@nokia.com)
**