summaryrefslogtreecommitdiffstats
path: root/config.tests
diff options
context:
space:
mode:
authorJørgen Lind <jorgen.lind@nokia.com>2011-03-17 10:35:59 (GMT)
committerJørgen Lind <jorgen.lind@nokia.com>2011-03-17 10:35:59 (GMT)
commiteceeb831ea81f944210c039abdb8db146675e673 (patch)
tree2469801b461ed7a2f918a502ec2cb5a7ff05f891 /config.tests
parentf3ec9966ab23d1c4e56e17e593b99165364612ab (diff)
parentcbf6c5b810316efba3ccfb27f05576b8dbfe3890 (diff)
downloadQt-eceeb831ea81f944210c039abdb8db146675e673.zip
Qt-eceeb831ea81f944210c039abdb8db146675e673.tar.gz
Qt-eceeb831ea81f944210c039abdb8db146675e673.tar.bz2
Merge remote-tracking branch 'origin/master' into lighthouse-master
Conflicts: mkspecs/qws/macx-nacl-g++/qplatformdefs.h
Diffstat (limited to 'config.tests')
-rw-r--r--config.tests/mac/coreservices/coreservices.mm2
-rw-r--r--config.tests/unix/opengldesktop/opengldesktop.cpp2
2 files changed, 2 insertions, 2 deletions
diff --git a/config.tests/mac/coreservices/coreservices.mm b/config.tests/mac/coreservices/coreservices.mm
index 0091e49..c70802c 100644
--- a/config.tests/mac/coreservices/coreservices.mm
+++ b/config.tests/mac/coreservices/coreservices.mm
@@ -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)
**
diff --git a/config.tests/unix/opengldesktop/opengldesktop.cpp b/config.tests/unix/opengldesktop/opengldesktop.cpp
index 969767c..a3d8548 100644
--- a/config.tests/unix/opengldesktop/opengldesktop.cpp
+++ b/config.tests/unix/opengldesktop/opengldesktop.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)
**